diff --git a/next.config.mjs b/next.config.mjs
index 5463c52..1c03c07 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -1,31 +1,44 @@
 /** @type {import('next').NextConfig} */
+const isProd = process.env.NODE_ENV === 'production';
+
 const nextConfig = {
-    /**
-     * Enable static exports for the App Router.
-     *
-     * @see https://nextjs.org/docs/app/building-your-application/deploying/static-exports
-     */
-    output: "export",
+  /**
+   * Enable static exports for the App Router.
+   *
+   * @see https://nextjs.org/docs/app/building-your-application/deploying/static-exports
+   */
+  output: "export",
+
+  /**
+   * Set base path. This is the slug of your GitHub repository.
+   *
+   * @see https://nextjs.org/docs/app/api-reference/next-config-js/basePath
+   */
+  basePath: isProd ? '/fun4date' : '',
+
+  /**
+   * Set asset prefix. This is the URL prefix for assets.
+   *
+   * @see https://nextjs.org/docs/api-reference/next.config.js/cdn-support-with-asset-prefix
+   */
+  assetPrefix: isProd ? '/fun4date/' : '',
+
+  /**
+   * Disable server-based image optimization. Next.js does not support
+   * dynamic features with static exports.
+   *
+   * @see https://nextjs.org/docs/app/api-reference/components/image#unoptimized
+   */
+  images: {
+    unoptimized: true,
+  },
   
-    /**
-     * Set base path. This is the slug of your GitHub repository.
-     *
-     * @see https://nextjs.org/docs/app/api-reference/next-config-js/basePath
-     */
-    basePath: "",
-  
-    /**
-     * Disable server-based image optimization. Next.js does not support
-     * dynamic features with static exports.
-     *
-     * @see https://nextjs.org/docs/app/api-reference/components/image#unoptimized
-     */
-    images: {
-      unoptimized: true,
-    },
-    env: {
-      PUBLIC_URL: "https://ging.github.io/fun4date/"
-    }
-  };
-  
-  export default nextConfig;
\ No newline at end of file
+  /**
+   * Environment variables
+   */
+  env: {
+    PUBLIC_URL: isProd ? "https://ging.github.io/fun4date/" : "",
+  }
+};
+
+export default nextConfig;