diff --git a/app/(auth)/sign-in/page.tsx b/app/(auth)/sign-in/page.tsx
index b00d5c5..9a0377e 100644
--- a/app/(auth)/sign-in/page.tsx
+++ b/app/(auth)/sign-in/page.tsx
@@ -1,5 +1,9 @@
 import UserAuthForm from '@/ui/UserAuthForm';
 
+export const metadata = {
+  title: 'Connexion - Peer-at Code'
+};
+
 export default function Page() {
   return (
     <>
diff --git a/app/(auth)/sign-up/page.tsx b/app/(auth)/sign-up/page.tsx
index cf2ee5e..d385d60 100644
--- a/app/(auth)/sign-up/page.tsx
+++ b/app/(auth)/sign-up/page.tsx
@@ -1,5 +1,9 @@
 import UserAuthForm from '@/ui/UserAuthForm';
 
+export const metadata = {
+  title: 'Inscription - Peer-at Code'
+};
+
 export default function Page() {
   return (
     <>
diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
index a903e62..29bd481 100644
--- a/app/dashboard/page.tsx
+++ b/app/dashboard/page.tsx
@@ -1,5 +1,8 @@
 import Card from '@/ui/Card';
-import CardTable from '@/ui/CardTable';
+
+export const metadata = {
+  title: 'Dashboard - Peer-at Code'
+};
 
 export default function Page() {
   return (
diff --git a/app/dashboard/puzzles/[id]/page.tsx b/app/dashboard/puzzles/[id]/page.tsx
index 476003d..58687ad 100644
--- a/app/dashboard/puzzles/[id]/page.tsx
+++ b/app/dashboard/puzzles/[id]/page.tsx
@@ -2,6 +2,19 @@ import { getPuzzle, getPuzzles } from '@/lib/puzzles';
 import Puzzle from '@/ui/Puzzle';
 import { notFound } from 'next/navigation';
 
+export async function generateMetadata({
+  params
+}: {
+  params: { id: number };
+  searchParams: URLSearchParams;
+}) {
+  const { id } = params;
+
+  const puzzle = await getPuzzle(id);
+
+  return { title: `${puzzle.name} - Peer-at Code` };
+}
+
 export default async function Page({ params }: { params: { id: number } }) {
   const { id } = params;
 
diff --git a/app/dashboard/puzzles/page.tsx b/app/dashboard/puzzles/page.tsx
index 8fcf3b0..1e1db4f 100644
--- a/app/dashboard/puzzles/page.tsx
+++ b/app/dashboard/puzzles/page.tsx
@@ -1,9 +1,12 @@
 import { getPuzzles } from '@/lib/puzzles';
 import Puzzles from '@/ui/Puzzles';
 
+export const metadata = {
+  title: 'Puzzles - Peer-at Code'
+};
+
 export default async function Page() {
   const data = await getPuzzles();
-
   return (
     <div className="flex flex-col space-y-6">
       <Puzzles data={data} />
diff --git a/app/head.tsx b/app/head.tsx
deleted file mode 100644
index cd6e9a6..0000000
--- a/app/head.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import DefaultTags from '@/ui/DefaultTags';
-
-export default function Head() {
-  return (
-    <>
-      <DefaultTags />
-
-      <title>Peer-at Code</title>
-
-      <meta name="title" content="Peer-at Code" />
-
-      <meta
-        name="description"
-        content="Peer-at Code a pour but de donner l’envie de coder et d’apprendre par le jeu!"
-      />
-
-      <meta property="og:type" content="website" />
-      {/* <meta property="og:url" content="https://peer-at-code.be/" /> */}
-      <meta property="og:title" content="Peer-at Code" />
-      <meta
-        property="og:description"
-        content="Peer-at Code a pour but de donner l’envie de coder et d’apprendre par le jeu!"
-      />
-
-      {/* <meta property="og:image" content="/assets/social.jpg" /> */}
-
-      <meta property="twitter:card" content="summary_large_image" />
-      <meta property="twitter:url" content="https://peet-at-code.be/" />
-      <meta property="twitter:title" content="Peer-at Code" />
-      <meta
-        property="twitter:description"
-        content="Peer-at Code a pour but de donner l’envie de coder et d’apprendre par le jeu!"
-      />
-      {/* <meta property="twitter:image" content="/assets/social.jpg" /> */}
-    </>
-  );
-}