diff --git a/packages/web/docs/src/app/docs/[[...mdxPath]]/page.tsx b/packages/web/docs/src/app/docs/[[...mdxPath]]/page.tsx
index 0910199f1..85475ca60 100644
--- a/packages/web/docs/src/app/docs/[[...mdxPath]]/page.tsx
+++ b/packages/web/docs/src/app/docs/[[...mdxPath]]/page.tsx
@@ -23,7 +23,7 @@ export async function generateMetadata(
 
   // TODO: Remove this when Components have a fix for OG Images with basePath
   docsMetadata.openGraph = {
-    ...rootMetadata.openGraph,
+    ...rootMetadata!.openGraph,
     ...docsMetadata.openGraph,
   };
 
diff --git a/packages/web/docs/src/app/federation/page.tsx b/packages/web/docs/src/app/federation/page.tsx
index 1e4d9888c..cf0d8e6d1 100644
--- a/packages/web/docs/src/app/federation/page.tsx
+++ b/packages/web/docs/src/app/federation/page.tsx
@@ -19,7 +19,8 @@ export const metadata = {
   description:
     'Discover what GraphQL Federation is, how it unifies multiple APIs into a Supergraph, its core benefits, and the building blocks like subgraphs, schema composition and gateway.',
   openGraph: {
-    ...rootMetadata.openGraph,
+    ...rootMetadata!.openGraph,
+    url: '/federation',
     /**
      * We currently have `metadataBase` which includes `basePath`,
      * so the opengraph-image.png file convention results in a
diff --git a/packages/web/docs/src/app/gateway/page.tsx b/packages/web/docs/src/app/gateway/page.tsx
index 4579ea50c..756bf02b0 100644
--- a/packages/web/docs/src/app/gateway/page.tsx
+++ b/packages/web/docs/src/app/gateway/page.tsx
@@ -21,14 +21,9 @@ export const metadata: Metadata = {
   title: 'Hive Gateway',
   description:
     'Unify and accelerate your data graph with Hive Gateway, which seamlessly integrates with Apollo Federation.',
-  alternates: {
-    // to remove leading slash
-    canonical: '.',
-  },
   openGraph: {
     ...rootMetadata.openGraph,
-    // to remove leading slash
-    url: '.',
+    url: '/gateway',
   },
 };
 
diff --git a/packages/web/docs/src/app/layout.tsx b/packages/web/docs/src/app/layout.tsx
index 980352e2b..98254769f 100644
--- a/packages/web/docs/src/app/layout.tsx
+++ b/packages/web/docs/src/app/layout.tsx
@@ -42,7 +42,6 @@ metadata.openGraph = {
   images: [
     new URL('./opengraph-image.png', import.meta.url)
       .toString()
-
       .replace(process.env.NEXT_BASE_PATH || '', ''),
   ],
 };
diff --git a/packages/web/docs/src/app/partners/page.tsx b/packages/web/docs/src/app/partners/page.tsx
index 106626d80..d7049f2b1 100644
--- a/packages/web/docs/src/app/partners/page.tsx
+++ b/packages/web/docs/src/app/partners/page.tsx
@@ -18,7 +18,7 @@ export const metadata = {
   description:
     'Accelerate GraphQL Federation adoption with the Hive Partner Network. Access enterprise-grade tools and expertise to build scalable, unified APIs across distributed systems. Join our network of federation experts.',
   openGraph: {
-    ...rootMetadata.openGraph,
+    ...rootMetadata!.openGraph,
     /**
      * We currently have `metadataBase` which includes `basePath`,
      * so the opengraph-image.png file convention results in a
@@ -30,7 +30,6 @@ export const metadata = {
     images: [
       new URL('./opengraph-image.png', import.meta.url)
         .toString()
-
         .replace(process.env.NEXT_BASE_PATH || '', ''),
     ],
   },
diff --git a/packages/web/docs/src/app/product-updates/(posts)/layout.tsx b/packages/web/docs/src/app/product-updates/(posts)/layout.tsx
index 6e434dbb2..5863f5407 100644
--- a/packages/web/docs/src/app/product-updates/(posts)/layout.tsx
+++ b/packages/web/docs/src/app/product-updates/(posts)/layout.tsx
@@ -5,7 +5,7 @@ import { ProductUpdateHeader } from './product-update-header';
 
 export const metadata = {
   // TODO: Remove this when Components have a fix for OG Images with basePath
-  openGraph: rootMetadata.openGraph,
+  openGraph: rootMetadata!.openGraph,
 };
 
 const Layout = ({ children }: { children: ReactNode }): ReactElement => {