diff --git a/app/(dashboard)/cars/fuel-types/[fuelType]/page.tsx b/app/(dashboard)/cars/fuel-types/[fuelType]/page.tsx
index 3d73fff..74ceb69 100644
--- a/app/(dashboard)/cars/fuel-types/[fuelType]/page.tsx
+++ b/app/(dashboard)/cars/fuel-types/[fuelType]/page.tsx
@@ -38,25 +38,28 @@ export const generateMetadata = async (props: {
   const formattedFuelType = deslugify(fuelType);
   const title = `${formattedFuelType} Cars in Singapore`;
   const description = `Explore registration trends and statistics for ${formattedFuelType} cars in Singapore.`;
-  const images = `${SITE_URL}/api/og?type=${fuelType}&month=${month}`;
+  // const images = `/api/og?type=${fuelType}&month=${month}`;
   const pageUrl = `/cars/fuel-types/${fuelType}`;
 
   return {
+    metadataBase: new URL(SITE_URL),
     title,
     description,
     openGraph: {
       title,
       description,
-      images,
+      images: "/opengraph-image.png",
       url: pageUrl,
       siteName: SITE_TITLE,
       locale: "en_SG",
       type: "website",
     },
     twitter: {
+      card: "summary_large_image",
       title,
       description,
-      images,
+      images: "/opengraph-image.png",
+      site: "@sgcarstrends",
       creator: "@sgcarstrends",
     },
     alternates: {
diff --git a/app/(dashboard)/cars/makes/[make]/page.tsx b/app/(dashboard)/cars/makes/[make]/page.tsx
index 5762529..478c43c 100644
--- a/app/(dashboard)/cars/makes/[make]/page.tsx
+++ b/app/(dashboard)/cars/makes/[make]/page.tsx
@@ -30,21 +30,24 @@ export const generateMetadata = async (props: {
 
   const formattedMake = deslugify(make).toUpperCase();
   const description = `Historical trends and monthly breakdown of ${formattedMake} cars by fuel and vehicle types in Singapore.`;
-  const images = `/api/og?title=Historical Trend&make=${make}`;
+  // const images = `/api/og?title=Historical Trend&make=${make}`;
   const canonicalUrl = `/cars/makes/${make}`;
 
   return {
+    metadataBase: new URL(SITE_URL),
     title: formattedMake,
     description,
     openGraph: {
-      images,
+      images: "/opengraph-image.png",
       url: canonicalUrl,
       siteName: SITE_TITLE,
       locale: "en_SG",
       type: "website",
     },
     twitter: {
-      images,
+      card: "summary_large_image",
+      images: "/opengraph-image.png",
+      site: "@sgcarstrends",
       creator: "@sgcarstrends",
     },
     alternates: {
diff --git a/app/(dashboard)/cars/page.tsx b/app/(dashboard)/cars/page.tsx
index b63d96d..93a7cc3 100644
--- a/app/(dashboard)/cars/page.tsx
+++ b/app/(dashboard)/cars/page.tsx
@@ -40,20 +40,21 @@ export const generateMetadata = async (props: {
   // const images = `/api/og?title=Car Registrations for ${formattedMonth}`;
 
   return {
+    metadataBase: new URL(SITE_URL),
     title,
     description,
     openGraph: {
-      title,
-      description,
+      images: "/opengraph-image.png",
       url: pageUrl,
       siteName: SITE_TITLE,
       locale: "en_SG",
       type: "website",
     },
     twitter: {
-      title,
-      description,
       card: "summary_large_image",
+      images: "/opengraph-image.png",
+      site: "@sgcarstrends",
+      creator: "@sgcarstrends",
     },
     alternates: {
       canonical: pageUrl,
diff --git a/app/(dashboard)/cars/vehicle-types/[vehicleType]/page.tsx b/app/(dashboard)/cars/vehicle-types/[vehicleType]/page.tsx
index 3710f59..826d75e 100644
--- a/app/(dashboard)/cars/vehicle-types/[vehicleType]/page.tsx
+++ b/app/(dashboard)/cars/vehicle-types/[vehicleType]/page.tsx
@@ -27,21 +27,24 @@ export const generateMetadata = async (props: {
   const { vehicleType } = params;
 
   const formattedVehicleType = deslugify(vehicleType);
-  const images = `/api/og?title=Historical Trend&type=${vehicleType}`;
+  // const images = `/api/og?title=Historical Trend&type=${vehicleType}`;
   const canonicalUrl = `/cars/vehicle-types/${vehicleType}`;
 
   return {
+    metadataBase: new URL(SITE_URL),
     title: `${formattedVehicleType} Cars in Singapore`,
     description: `Explore registration trends and statistics for ${formattedVehicleType} cars in Singapore.`,
     openGraph: {
-      images,
+      images: "/opengraph-image.png",
       url: canonicalUrl,
       siteName: SITE_TITLE,
       locale: "en_SG",
       type: "website",
     },
     twitter: {
-      images,
+      card: "summary_large_image",
+      images: "/opengraph-image.png",
+      site: "@sgcarstrends",
       creator: "@sgcarstrends",
     },
     alternates: {
diff --git a/app/(dashboard)/coe/(prices)/opengraph-image.png b/app/(dashboard)/coe/(prices)/opengraph-image.png
deleted file mode 100644
index d9dce78..0000000
Binary files a/app/(dashboard)/coe/(prices)/opengraph-image.png and /dev/null differ
diff --git a/app/(dashboard)/coe/(prices)/page.tsx b/app/(dashboard)/coe/(prices)/page.tsx
index 614d57c..bd9edab 100644
--- a/app/(dashboard)/coe/(prices)/page.tsx
+++ b/app/(dashboard)/coe/(prices)/page.tsx
@@ -29,22 +29,24 @@ const description =
 
 export const generateMetadata = async (): Promise<Metadata> => {
   const pageUrl = "/coe";
+  // const images = "/api/og?title=COE Result";
 
   return {
+    metadataBase: new URL(SITE_URL),
     title,
     description,
     openGraph: {
+      images: "/opengraph-image.png",
       url: pageUrl,
-      title: "COE Dashboard",
-      description,
       siteName: SITE_TITLE,
       locale: "en_SG",
       type: "website",
     },
     twitter: {
       card: "summary_large_image",
-      title,
-      description,
+      images: "/opengraph-image.png",
+      site: "@sgcarstrends",
+      creator: "@sgcarstrends",
     },
     alternates: {
       canonical: pageUrl,
diff --git a/app/(dashboard)/coe/(prices)/twitter-image.png b/app/(dashboard)/coe/(prices)/twitter-image.png
deleted file mode 100644
index d9dce78..0000000
Binary files a/app/(dashboard)/coe/(prices)/twitter-image.png and /dev/null differ
diff --git a/app/(dashboard)/layout.tsx b/app/(dashboard)/layout.tsx
index 3a76360..017d153 100644
--- a/app/(dashboard)/layout.tsx
+++ b/app/(dashboard)/layout.tsx
@@ -27,6 +27,7 @@ export const metadata: Metadata = {
   openGraph: {
     title,
     description,
+    images: "/opengraph-image.png",
     url,
     siteName: title,
     locale: "en_SG",
@@ -36,6 +37,7 @@ export const metadata: Metadata = {
     card: "summary_large_image",
     title,
     description,
+    images: "/opengraph-image.png",
     site: "@sgcarstrends",
     creator: "@sgcarstrends",
   },
diff --git a/app/(dashboard)/opengraph-image.png b/app/(dashboard)/opengraph-image.png
deleted file mode 100644
index d9dce78..0000000
Binary files a/app/(dashboard)/opengraph-image.png and /dev/null differ
diff --git a/app/(dashboard)/twitter-image.png b/app/(dashboard)/twitter-image.png
deleted file mode 100644
index d9dce78..0000000
Binary files a/app/(dashboard)/twitter-image.png and /dev/null differ
diff --git a/app/(dashboard)/cars/opengraph-image.png b/app/opengraph-image.png
similarity index 100%
rename from app/(dashboard)/cars/opengraph-image.png
rename to app/opengraph-image.png
diff --git a/app/(dashboard)/cars/twitter-image.png b/app/twitter-image.png
similarity index 100%
rename from app/(dashboard)/cars/twitter-image.png
rename to app/twitter-image.png