diff --git a/.drone.yml b/.drone.yml
index 4d68d25..4019042 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -187,11 +187,6 @@ steps:
 - name: Deploy Container
   image: docker
   privileged: true
-  environment:
-    - HOST='area51.mifi.dev'
-    - PORT=9001
-    - ROUTE_PREFIX='/auth'
-    - CONTAINER_PREFIX=mifi
   commands:
     - docker compose -f docker-compose.staging.yml pull
     - docker compose -f docker-compose.staging.yml build --no-cache
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 48ad7bb..acc831e 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -3,6 +3,9 @@ version: '3.8'
 services:
     auth-service_mongo:
         env_file: .env.dev
+        build:
+            args:
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service_mongo
         ports:
             - 27017:27017
@@ -15,7 +18,13 @@ services:
         image: mongo:latest
     auth-service:
         env_file: .env.dev
-        build: .
+        build: 
+            context: .
+            args:
+              - HOST=${HOST}
+              - PORT=${PORT}
+              - ROUTE_PREFIX=${ROUTE_PREFIX}
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service
         ports:
             - 9001:9001