diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a98fb3b..7836e9b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,8 +15,11 @@ jobs:
       - name: Log in to Docker Hub
         run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
 
-      - name: Build Docker image
-        run: docker build --pull -t ${{ secrets.DOCKERHUB_USERNAME }}/lockerit-frontend .
+      - name: Build Docker image with env
+        run: |
+          docker build --pull \
+            --build-arg VITE_BASE_SERVER_URL=${{ secrets.VITE_BASE_SERVER_URL }} \
+            -t ${{ secrets.DOCKERHUB_USERNAME }}/lockerit-frontend .
 
       - name: Push Docker image
         run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/lockerit-frontend
diff --git a/dockerfile b/dockerfile
index 5b11ba1..ef97332 100644
--- a/dockerfile
+++ b/dockerfile
@@ -2,11 +2,12 @@ FROM node:18 as build
 
 WORKDIR /app
 
+ARG VITE_BASE_SERVER_URL
+ENV VITE_BASE_SERVER_URL=$VITE_BASE_SERVER_URL
+
 COPY package*.json ./
 RUN npm install
 
-COPY .env.production .env.production
-
 COPY . .
 RUN npm run build -- --mode production