diff --git a/.github/workflows/deploy-dailyscrum-website.yml b/.github/workflows/deploy-dailyscrum-website.yml
index ffe7221..5f69588 100644
--- a/.github/workflows/deploy-dailyscrum-website.yml
+++ b/.github/workflows/deploy-dailyscrum-website.yml
@@ -12,6 +12,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - run: flyctl deploy --config apps/website/fly.toml --build-secret PROXY_URL=${{ secrets.PROXY_URL }} --remote-only
+      - run: flyctl deploy --config apps/website/fly.toml --build-secret NEXT_PUBLIC_METADATA_BASE_URL=${{ secrets.NEXT_PUBLIC_METADATA_BASE_URL }} --build-secret PROXY_URL=${{ secrets.PROXY_URL }} --remote-only
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
diff --git a/apps/website/.env.example b/apps/website/.env.example
index b3ec094..b9cbdf8 100644
--- a/apps/website/.env.example
+++ b/apps/website/.env.example
@@ -1 +1,3 @@
-PROXY_URL
\ No newline at end of file
+NEXT_PUBLIC_METADATA_BASE_URL=
+
+PROXY_URL=
\ No newline at end of file
diff --git a/apps/website/Dockerfile b/apps/website/Dockerfile
index 39b9051..a5e0ae6 100644
--- a/apps/website/Dockerfile
+++ b/apps/website/Dockerfile
@@ -20,7 +20,11 @@ COPY . .
 
 RUN pnpm install --prod=false
 
-RUN --mount=type=secret,id=PROXY_URL PROXY_URL="$(cat /run/secrets/PROXY_URL)" pnpm exec nx build dailyscrum-website
+RUN --mount=type=secret,id=NEXT_PUBLIC_METADATA_BASE_URL \
+  --mount=type=secret,id=PROXY_URL \
+  NEXT_PUBLIC_METADATA_BASE_URL="$(cat /run/secrets/NEXT_PUBLIC_METADATA_BASE_URL)" \
+  PROXY_URL="$(cat /run/secrets/PROXY_URL)" \
+  pnpm exec nx build dailyscrum-website
 
 EXPOSE 3000
 
diff --git a/apps/website/src/app/layout.tsx b/apps/website/src/app/layout.tsx
index 6750222..10585c0 100644
--- a/apps/website/src/app/layout.tsx
+++ b/apps/website/src/app/layout.tsx
@@ -6,14 +6,30 @@ import { cn } from "ui";
 
 const inter = Inter({ subsets: ["latin"] });
 
+const metadataTitle =
+  "Kiwiy Daily Scrum | Minimalist daily scrum board for your team";
+
 const metadataDescription =
-  "Simplify your daily scrum with Kiwiy Daily Scrum, a free, open-source board for agile teams. Share updates in seconds and track your team's status effortlessly. No more copying and pasting templates in Slack. Focus on delivering value.";
+  "A free minimalist daily scrum board for your team. Share updates in seconds and keep your team in sync with a centralized, real-time board view. Easily invite team members, add daily updates, and use the board during meetings. Enjoy all features for free.";
 
 export const metadata: Metadata = {
-  title: "Kiwiy Daily Scrum",
+  title: metadataTitle,
   description: metadataDescription,
+  keywords: [
+    "daily scrum board",
+    "daily updates",
+    "team updates",
+    "team productivity",
+    "real-time board",
+    "team collaboration",
+    "open-source",
+    "daily scrum questions",
+    "dedicated workspace",
+    "Kiwiy Daily Scrum",
+  ],
+  metadataBase: new URL(process.env.NEXT_PUBLIC_METADATA_BASE_URL!),
   openGraph: {
-    title: "Kiwiy Daily Scrum - A board to streamline team daily scrum",
+    title: metadataTitle,
     description: metadataDescription,
     url: "https://dailyscrum.kiwiy.is",
     siteName: "Kiwiy Daily Scrum",
diff --git a/apps/website/src/app/opengraph-image.png b/apps/website/src/app/opengraph-image.png
index 3cc6926..96c5d09 100644
Binary files a/apps/website/src/app/opengraph-image.png and b/apps/website/src/app/opengraph-image.png differ