diff --git a/src/pages/[...locale]/about/index.astro b/src/pages/[...locale]/about/index.astro
index 05b8813f..bb47ec63 100644
--- a/src/pages/[...locale]/about/index.astro
+++ b/src/pages/[...locale]/about/index.astro
@@ -29,7 +29,7 @@ const phases = [
 ];
 ---
 
-<Layout title={t("metadata.title")} description={t("metadata.description")}>
+<Layout title={t("pages.about.title")} description={t("metadata.description")}>
     <div class="flex flex-col gap-18 pb-20">
         <!-- Hero section -->
         <section class="py-20">
diff --git a/src/pages/[...locale]/admin/charges.astro b/src/pages/[...locale]/admin/charges.astro
index dc1c0a01..023ba92d 100644
--- a/src/pages/[...locale]/admin/charges.astro
+++ b/src/pages/[...locale]/admin/charges.astro
@@ -5,7 +5,7 @@ const { t, lang, session } = Astro.locals;
 import Contributions from "../../../components/Admin/Contributions.svelte";
 ---
 
-<Layout title={t("metadata.title")} description={t("metadata.description")}>
+<Layout title={t("pages.admin.charges.title")} description={t("metadata.description")}>
     <App client:load locale={lang} session={session}>
         <div class="wrapper">
             <div class="flex w-full flex-col gap-10 py-10">
diff --git a/src/pages/[...locale]/checkout/index.astro b/src/pages/[...locale]/checkout/index.astro
index 977a6f56..4422abb0 100644
--- a/src/pages/[...locale]/checkout/index.astro
+++ b/src/pages/[...locale]/checkout/index.astro
@@ -10,7 +10,7 @@ import BackButton from "../../../components/BackButton.svelte";
 const { t, lang, session } = Astro.locals;
 ---
 
-<Layout title={t("metadata.title")} description={t("metadata.description")}>
+<Layout title={t("pages.checkout.title")} description={t("metadata.description")}>
     <App client:load locale={lang} session={session} class="mb-20">
         <div class="wrapper max-md:px-0">
             <BackButton client:load />
diff --git a/src/pages/[...locale]/checkout/payment.astro b/src/pages/[...locale]/checkout/payment.astro
index d6ef679c..b1975b07 100644
--- a/src/pages/[...locale]/checkout/payment.astro
+++ b/src/pages/[...locale]/checkout/payment.astro
@@ -28,7 +28,7 @@ const { data: accounting } = await apiAccountingsIdGet({
 const { data: paymentGateways } = await apiGatewaysGetCollection();
 ---
 
-<Layout title={t("metadata.title")} description={t("metadata.description")}>
+<Layout title={t("pages.checkout.payment.title")} description={t("metadata.description")}>
     <App client:load locale={lang} session={session} class="mb-20">
         <div class="wrapper max-md:px-0">
             <BackButton client:load />
diff --git a/src/pages/[...locale]/checkout/wallet.astro b/src/pages/[...locale]/checkout/wallet.astro
index f23660b4..41817878 100644
--- a/src/pages/[...locale]/checkout/wallet.astro
+++ b/src/pages/[...locale]/checkout/wallet.astro
@@ -24,7 +24,7 @@ const { data: accounting } = await apiAccountingsIdGet({
 });
 ---
 
-<Layout title={t("metadata.title")} description={t("metadata.description")}>
+<Layout title={t("pages.checkout.wallet.title")} description={t("metadata.description")}>
     <App client:load locale={lang} session={session}>
         <div class="wrapper max-md:px-0">
             <BackButton client:load />
diff --git a/src/pages/[...locale]/profile/[idOrHandle].astro b/src/pages/[...locale]/profile/[idOrHandle].astro
index 12146e67..e6e396b7 100644
--- a/src/pages/[...locale]/profile/[idOrHandle].astro
+++ b/src/pages/[...locale]/profile/[idOrHandle].astro
@@ -162,7 +162,7 @@ const avatarImage = user?.avatar || undefined; // Use user avatar or default pla
 ---
 
 <Layout
-    title={`${displayName} - ${t("metadata.title")}`}
+    title={`${displayName} - ${t("pages.profile.title")}`}
     description={`${t("profile.tabs.about")} ${displayName}`}
 >
     <App client:load locale={lang} session={session} class="mb-20">
diff --git a/src/pages/[...locale]/register.astro b/src/pages/[...locale]/register.astro
index f7c62f50..70a68219 100644
--- a/src/pages/[...locale]/register.astro
+++ b/src/pages/[...locale]/register.astro
@@ -17,7 +17,7 @@ cartCount.subscribe((count) => {
 });
 ---
 
-<Layout title={t("metadata.title")} description={t("metadata.description")}>
+<Layout title={t("pages.register.title")} description={t("metadata.description")}>
     <App client:load locale={lang} session={session}>
         <div class="wrapper">
             <div class="flex flex-col gap-8 py-10 lg:flex-row">
diff --git a/src/pages/[...locale]/static/[fileName].astro b/src/pages/[...locale]/static/[fileName].astro
index 66fa97c8..f7d53032 100644
--- a/src/pages/[...locale]/static/[fileName].astro
+++ b/src/pages/[...locale]/static/[fileName].astro
@@ -20,7 +20,7 @@ const file = await markdownFiles[fileKey]();
 const Content = file.default;
 ---
 
-<Layout title={t("metadata.title")} description={t("metadata.description")}>
+<Layout title={t("pages.static.title")} description={t("metadata.description")}>
     <App client:load locale={lang} session={session} class="mb-20 gap-18">
         <ReturnHeader client:load />