diff --git a/src/app/(main)/berita/[slug]/page.tsx b/src/app/(main)/berita/[slug]/page.tsx
index e65f6cf1..d79ee9fc 100644
--- a/src/app/(main)/berita/[slug]/page.tsx
+++ b/src/app/(main)/berita/[slug]/page.tsx
@@ -29,13 +29,15 @@ export async function generateMetadata({
     title: post.title,
     description: post.description,
     authors: { name: post.user.name },
-    creator: post.user.name,
     openGraph: {
-      url: `https://moklet.org/berita/${post.slug}`,
+      url: `${process.env.URL ?? "https://www.moklet.org/berita/"}${post.slug}`,
       images: post.thumbnail,
       title: post.title,
       description: post.description,
       type: "article",
+      publishedTime: new Date(post.published_at!).toISOString(),
+      modifiedTime: new Date(post.updated_at).toISOString(),
+      authors: post.user.name,
     },
     robots: "max-image-preview:large",
     keywords:
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index f93e172d..17e678e8 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -24,6 +24,9 @@ export const metadata: Metadata = {
   authors: { name: "MokletDev", url: "https://dev.moklet.org" },
   creator: "MokletDev Team",
   publisher: "SMK Telkom Malang",
+  openGraph: {
+    images: "https://www.moklet.org/horizontal.svg",
+  },
   robots: robots,
 };
 
diff --git a/src/app/robots.ts b/src/app/robots.ts
index eb081640..526592da 100644
--- a/src/app/robots.ts
+++ b/src/app/robots.ts
@@ -7,6 +7,6 @@ export default function robots(): MetadataRoute.Robots {
       allow: "/",
       disallow: ["/admin/"],
     },
-    sitemap: `${process.env.NEXTAUTH_URL}/sitemap.xml`,
+    sitemap: `${process.env.URL ?? "https://www.moklet.org"}/sitemap.xml`,
   };
 }
diff --git a/src/app/sitemap.ts b/src/app/sitemap.ts
index 77862946..a74a92e4 100644
--- a/src/app/sitemap.ts
+++ b/src/app/sitemap.ts
@@ -13,9 +13,9 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
     "/tentang",
     "/kontributor",
   ].map((route) => ({
-    url: `${process.env.NEXTAUTH_URL}/${route}`,
+    url: `${process.env.URL ?? "https://moklet.org"}/${route}`,
     lastModified: new Date().toISOString(),
-    changeFrequency: "yearly" as
+    changeFrequency: "monthly" as
       | "yearly"
       | "monthly"
       | "never"
@@ -26,8 +26,8 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   }));
 
   const postsRoutes = posts.map((post) => ({
-    url: `${process.env.NEXTAUTH_URL}/blog/${post.slug}`,
-    lastModified: new Date().toISOString(),
+    url: `${process.env.URL ?? "https://www.moklet.org"}/blog/${post.slug}`,
+    lastModified: new Date(post.updated_at).toISOString(),
     changeFrequency: "yearly" as
       | "yearly"
       | "monthly"
@@ -40,7 +40,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
 
   return [
     {
-      url: `${process.env.NEXTAUTH_URL}/`,
+      url: `${process.env.URL ?? "https://www.moklet.org"}/`,
       lastModified: new Date().toISOString(),
       priority: 1,
       changeFrequency: "never",