diff --git a/index.html b/index.html
index d0e9192..c91859b 100644
--- a/index.html
+++ b/index.html
@@ -27,20 +27,20 @@
     <meta name="author" content="AOSSIE" />
     <meta name="robots" content="index, follow" />
 
-    <link rel="canonical" href="https://aossie-org.github.io/OrgExplorer/" />
+    <link rel="canonical" href="https://orgexplorer.aossie.org/" />
 
     <link
       rel="icon"
       type="image/svg+xml"
-      href="/OrgExplorer/org-explorer-logo.svg"
+      href="/org-explorer-logo.svg"
     />
-    <link rel="apple-touch-icon" href="/OrgExplorer/org-explorer-logo.png" />
+    <link rel="apple-touch-icon" href="/org-explorer-logo.png" />
 
     <meta property="og:type" content="website" />
 
     <meta
       property="og:url"
-      content="https://aossie-org.github.io/OrgExplorer/"
+      content="https://orgexplorer.aossie.org/"
     />
 
     <meta
@@ -55,7 +55,7 @@
 
     <meta
       property="og:image"
-      content="https://aossie-org.github.io/OrgExplorer/og-image.png"
+      content="https://orgexplorer.aossie.org/og-image.png"
     />
 
     <meta name="twitter:card" content="summary_large_image" />
@@ -72,7 +72,7 @@
 
     <meta
       name="twitter:image"
-      content="https://aossie-org.github.io/OrgExplorer/og-image.png"
+      content="https://orgexplorer.aossie.org/og-image.png"
     />
 
     <link rel="preconnect" href="https://api.github.com" />
@@ -83,11 +83,11 @@
         "@context": "https://schema.org",
         "@type": "WebApplication",
         "name": "OrgExplorer",
-        "url": "https://aossie-org.github.io/OrgExplorer/",
+        "url": "https://orgexplorer.aossie.org/",
         "applicationCategory": "DeveloperApplication",
         "operatingSystem": "Any",
         "description": "GitHub organization analytics platform for repository insights, contributor intelligence, governance metrics, and visual analytics.",
-        "image": "https://aossie-org.github.io/OrgExplorer/og-image.png",
+        "image": "https://orgexplorer.aossie.org/og-image.png",
         "creator": {
           "@type": "Organization",
           "name": "AOSSIE"
diff --git a/public/robots.txt b/public/robots.txt
index 0abdc76..c7a0f48 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,4 +1,4 @@
 User-agent: *
 Allow: /
 
-Sitemap: https://aossie-org.github.io/OrgExplorer/sitemap.xml
+Sitemap: https://orgexplorer.aossie.org/sitemap.xml
diff --git a/public/sitemap.xml b/public/sitemap.xml
index 8b77a6d..fc35c8e 100644
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
-    <loc>https://aossie-org.github.io/OrgExplorer/</loc>
+    <loc>https://orgexplorer.aossie.org/</loc>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
diff --git a/src/main.jsx b/src/main.jsx
index ed8e23f..d28c634 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -6,7 +6,7 @@ import './styles/global.css'
 
 ReactDOM.createRoot(document.getElementById('root')).render(
   <React.StrictMode>
-    <BrowserRouter  basename={import.meta.env.PROD ? "/OrgExplorer" : "/"}>
+    <BrowserRouter  basename= "/">
       <App />
     </BrowserRouter>
   </React.StrictMode>
diff --git a/vite.config.js b/vite.config.js
index b0d97de..8d98722 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -5,5 +5,5 @@ import tailwindcss from "@tailwindcss/vite";
 export default defineConfig(({ mode }) => ({
   plugins: [react(), tailwindcss()],
 
-  base: mode === "production" ? "/OrgExplorer/" : "/",
+  base: "/",
 }));