diff --git a/Dockerfile b/Dockerfile
index a62b96a..f468fb1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,11 +18,12 @@ COPY frontend/package.json frontend/package-lock.json ./
 RUN npm ci
 
 FROM node:20-alpine AS frontend-builder
+ARG NEXT_PUBLIC_API_URL=http://127.0.0.1:8080
 WORKDIR /app
 COPY --from=frontend-deps /app/node_modules ./node_modules
 COPY frontend/ ./
 ENV NEXT_TELEMETRY_DISABLED 1
-ENV NEXT_PUBLIC_API_URL=http://localhost:8080
+ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
 RUN echo "NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL" && npm run build
 
 # ---- Final Unified Image ----
diff --git a/docker-compose.yml b/docker-compose.yml
index 88acdd1..b3ac6d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,9 +7,10 @@ services:
   kv-tube:
     build:
       context: .
+      dockerfile: Dockerfile
       args:
         - NEXT_PUBLIC_API_URL=http://ut.khoavo.myds.me:8981/api
-    image: git.khoavo.myds.me/vndangkhoa/kv-tube:v7
+    image: git.khoavo.myds.me/vndangkhoa/kv-tube:v9
     container_name: kv-tube
     platform: linux/amd64
     restart: unless-stopped
@@ -22,7 +23,6 @@ services:
       - KVTUBE_DATA_DIR=/app/data
       - GIN_MODE=release
       - NODE_ENV=production
-      - NEXT_PUBLIC_API_URL=http://ut.khoavo.myds.me:8981/api
       - CORS_ALLOWED_ORIGINS=https://ut.khoavo.myds.me,http://ut.khoavo.myds.me:5011,http://localhost:3000,http://127.0.0.1:3000
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
diff --git a/supervisord.conf b/supervisord.conf
index db83b44..4d888a8 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -12,7 +12,7 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
-environment=KVTUBE_DATA_DIR="/app/data",GIN_MODE="release",PORT="8080"
+environment=KVTUBE_DATA_DIR="/app/data",GIN_MODE="release",PORT="8080",CORS_ALLOWED_ORIGINS="https://ut.khoavo.myds.me,http://ut.khoavo.myds.me:5011,http://localhost:3000,http://127.0.0.1:3000"
 
 [program:frontend]
 command=node server.js