diff --git a/.drone.yml b/.drone.yml
index bbb5bfc..678f7c4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -63,6 +63,9 @@ steps:
 
   - name: build-image
     image: docker:24
+    environment:
+      API_BASE_URL:
+        from_secret: API_BASE_URL
     volumes:
       - name: dockersock
         path: /var/run/docker.sock
@@ -70,7 +73,12 @@ steps:
       - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt | tr -d '\n')
 
       - echo "🔨 Building Docker image apps/blog:$IMAGE_TAG ..."
-      - docker build --network=host -t apps/blog:$IMAGE_TAG -t apps/blog:latest /drone/src
+      - |
+        docker build --network=host \
+        --build-arg VITE_API_BASE_URL="$API_BASE_URL" \
+        -t apps/blog:$IMAGE_TAG \
+        -t apps/blog:latest \
+        /drone/src
 
   - name: push-image
     image: docker:24
@@ -108,9 +116,6 @@ steps:
 
   - name: run-container
     image: docker:24
-    environment:
-      API_BASE_URL:
-        from_secret: API_BASE_URL
     volumes:
       - name: dockersock
         path: /var/run/docker.sock
@@ -123,7 +128,6 @@ steps:
           --name blog \
           -p 3002:3000 \
           -e NODE_ENV=production \
-          -e VITE_API_BASE_URL="$API_BASE_URL" \
           --restart always \
           apps/blog:$IMAGE_TAG