diff --git a/.github/workflows/Client-DEV-CD.yml b/.github/workflows/Client-DEV-CD.yml
index 2d0beb1..ebf33c4 100644
--- a/.github/workflows/Client-DEV-CD.yml
+++ b/.github/workflows/Client-DEV-CD.yml
@@ -14,7 +14,7 @@ jobs:
           fetch-depth: 0
 
       - name: Build Docker Image
-        run: docker build -f Dockerfile --build-arg NEXT_PUBLIC_BASE_URL=${{secrets.NEXT_PUBLIC_BASE_URL}} --build-arg PORT=${{secrets.CLIENT_DEV_PORT}} -t ${{ secrets.CLIENT_STORYBOOK_REPO }}/${{ secrets.CLIENT_DEV_SERVICE_NAME }}:latest .
+        run: docker build -f Dockerfile --build-arg NEXT_PUBLIC_BASE_URL=${{secrets.NEXT_PUBLIC_BASE_URL}}  --build-arg NEXT_PUBLIC_CLIENT_BASE_URL=${{secrets.NEXT_PUBLIC_CLIENT_BASE_URL}} --build-arg PORT=${{secrets.CLIENT_DEV_PORT}} -t ${{ secrets.CLIENT_STORYBOOK_REPO }}/${{ secrets.CLIENT_DEV_SERVICE_NAME }}:latest .
         working-directory: ./client
 
       - name: Login to Docker Hub
diff --git a/client/Dockerfile b/client/Dockerfile
index fd3c3d8..bbe6f25 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -20,9 +20,10 @@ COPY . .
 
 ARG NEXT_PUBLIC_BASE_URL
 ARG PORT=3000
+ARG NEXT_PUBLIC_CLIENT_BASE_URL
 
 ENV NEXT_PUBLIC_BASE_URL ${NEXT_PUBLIC_BASE_URL}
-ENV NEXT_PUBLIC_CLIENT_BASE_URL host.docker.internal:${PORT}
+ENV NEXT_PUBLIC_CLIENT_BASE_URL ${NEXT_PUBLIC_CLIENT_BASE_URL}:${PORT}
 
 RUN yarn build