diff --git a/docker-compose.yml b/docker-compose.yml
index 30be43e0..3373dd4c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,8 +5,8 @@ services:
     build:
       context: .
     environment:
-      NEXT_PUBLIC_API_BASE_URL: https://rpkm67-dev.sgcu.in.th/api/v1
-      NEXT_PUBLIC_FIRST_DATE_DATE: '2024-07-21'
-      NEXT_PUBLIC_RUP_PEUN_DATE: '2024-07-20'
+      API_BASE_URL: https://rpkm67-dev.sgcu.in.th/api/v1
+      FIRST_DATE_DATE: '2024-07-21'
+      RUP_PEUN_DATE: '2024-07-20'
     ports:
       - 80:3000
diff --git a/next.config.mjs b/next.config.mjs
index ce83cac0..e631d1cc 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -5,10 +5,15 @@ const nextConfig = {
     remotePatterns: [
       {
         protocol: 'https',
-        hostname: process.env.BASE_DOMAIN_IMAGES,
+        hostname: process.env.BASE_DOMAIN_IMAGES ?? '*',
       },
     ],
   },
+  env: {
+    NEXT_PUBLIC_API_BASE_URL: process.env.API_BASE_URL,
+    NEXT_PUBLIC_FIRST_DATE_DATE: process.env.FIRST_DATE_DATE,
+    NEXT_PUBLIC_RUP_PEUN_DATE: process.env.RUP_PEUN_DATE,
+  },
 };
 
 export default nextConfig;