diff --git a/apps/web/scripts/check-og-images.ts b/apps/web/scripts/check-og-images.ts
index 9df88d7..7093bd5 100644
--- a/apps/web/scripts/check-og-images.ts
+++ b/apps/web/scripts/check-og-images.ts
@@ -1,22 +1,53 @@
 const BASE_URL = process.env.TEST_URL || "http://localhost:3000";
 
-console.log(`\n🚀 Starting OG Image Verification for ${BASE_URL}\n`);
+console.log(`\n🚀 Starting Dynamic OG Image Verification for ${BASE_URL}\n`);
 
-const routes = [
-  "/opengraph-image",
-  "/about/opengraph-image",
-  "/contact/opengraph-image",
-];
-
-async function verifyImage(path: string): Promise<boolean> {
-  const url = `${BASE_URL}${path}`;
-  const start = Date.now();
+const pages = ["/", "/about", "/contact"];
 
+async function getOgImageUrl(pagePath: string): Promise<string | null> {
+  const url = `${BASE_URL}${pagePath}`;
   try {
     const response = await fetch(url);
+    if (!response.ok) {
+      throw new Error(`Failed to fetch page: ${response.status}`);
+    }
+    const html = await response.text();
+
+    // Extract og:image content
+    const match = html.match(/property="og:image"\s+content="([^"]+)"/);
+    if (!match || !match[1]) {
+      // Try name="twitter:image" as fallback or check if it's there
+      const twitterMatch = html.match(
+        /name="twitter:image"\s+content="([^"]+)"/,
+      );
+      return twitterMatch ? twitterMatch[1] : null;
+    }
+    return match[1];
+  } catch (error) {
+    console.error(`  ❌ Failed to discover OG image for ${pagePath}:`, error);
+    return null;
+  }
+}
+
+async function verifyImage(
+  imageUrl: string,
+  pagePath: string,
+): Promise<boolean> {
+  // If the image URL is absolute and contains mintel.me (base domain),
+  // we replace it with our BASE_URL to test the current environment's generated image
+  let testUrl = imageUrl;
+  if (imageUrl.startsWith("https://mintel.me")) {
+    testUrl = imageUrl.replace("https://mintel.me", BASE_URL);
+  } else if (imageUrl.startsWith("/")) {
+    testUrl = `${BASE_URL}${imageUrl}`;
+  }
+
+  const start = Date.now();
+  try {
+    const response = await fetch(testUrl);
     const duration = Date.now() - start;
 
-    console.log(`Checking ${url}...`);
+    console.log(`Checking OG Image for ${pagePath}: ${testUrl}...`);
 
     const body = await response.clone().text();
     const contentType = response.headers.get("content-type");
@@ -46,19 +77,27 @@ async function verifyImage(path: string): Promise<boolean> {
 
 async function run() {
   let allOk = true;
-  for (const route of routes) {
-    const ok = await verifyImage(route);
+
+  for (const page of pages) {
+    console.log(`Discovering OG image for ${page}...`);
+    const ogUrl = await getOgImageUrl(page);
+
+    if (!ogUrl) {
+      console.error(`  ❌ No OG image meta tag found for ${page}`);
+      allOk = false;
+      continue;
+    }
+
+    const ok = await verifyImage(ogUrl, page);
     if (!ok) allOk = false;
   }
 
   if (allOk) {
-    console.log("\n✨ OG images verified successfully!\n");
+    console.log("\n✨ All OG images verified successfully!\n");
     process.exit(0);
   } else {
-    console.warn(
-      "\n⚠️  Some OG images failed verification (Non-blocking for now).\n",
-    );
-    process.exit(0); // Make it non-blocking if endpoints aren't fully ready
+    console.error("\n❌ Some OG images failed verification.\n");
+    process.exit(1);
   }
 }