diff --git a/services/docker-compose.yml b/services/docker-compose.yml
index ffdec7be9..046a40556 100644
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -1,98 +1,99 @@
 version: "3.9"
 networks:
   services-net:
     name: services-net
 volumes:
   localstack:
 services:
   # tunnelbroker
   tunnelbroker-server:
     depends_on:
       - localstack
       - rabbitmq
     build:
       dockerfile: services/tunnelbroker/Dockerfile
       context: ../
       args:
         - COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
+        - COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE}
     image: commapp/tunnelbroker-server:0.2
     ports:
       - "${COMM_SERVICES_PORT_TUNNELBROKER}:50051"
     volumes:
       - $HOME/.aws/config:/root/.aws/config:ro
       - $HOME/.aws/credentials:/root/.aws/credentials:ro
       - ./tunnelbroker/tunnelbroker.ini:/root/tunnelbroker/tunnelbroker.ini:ro
       - ./tunnelbroker/tunnelbroker-dev.ini:/root/tunnelbroker/tunnelbroker-dev.ini:ro
   # backup
   backup-server:
     depends_on:
       - localstack
     networks:
       - services-net
     build:
       dockerfile: services/backup/Dockerfile
       context: ../
       args:
         - COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
         - COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE}
     image: commapp/backup-server:0.1
     ports:
       - "${COMM_SERVICES_PORT_BACKUP}:50051"
     volumes:
       - $HOME/.aws/credentials:/root/.aws/credentials:ro
   # blob
   blob-server:
     depends_on:
       - localstack
     networks:
       - services-net
     build:
       dockerfile: services/blob/Dockerfile
       context: ../
       args:
         - COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
         - COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE}
     image: commapp/blob-server:0.1
     ports:
       - "${COMM_SERVICES_PORT_BLOB}:50051"
     volumes:
       - $HOME/.aws/credentials:/root/.aws/credentials:ro
   # identity
   identity-server:
     depends_on:
       - localstack
     networks:
       - services-net
     build:
       dockerfile: services/identity/Dockerfile
       context: ../
     image: commapp/identity-server:0.1
     ports:
       - "${COMM_SERVICES_PORT_IDENTITY}:50051"
   # localstack
   localstack:
     image: localstack/localstack
     hostname: localstack
     ports:
       - "4566:4566"
     environment:
       - SERVICES=s3,dynamodb
       - DATA_DIR=/tmp/localstack
       - HOSTNAME_EXTERNAL=localstack
     volumes:
       - localstack:/tmp/localstack
     networks:
       - services-net
   # RabbitMQ
   rabbitmq:
     image: rabbitmq:3-management
     hostname: rabbitmq
     ports:
       - "5672:5672"
       - "5671:5671"
       - "15672:15672"
     environment:
       - RABBITMQ_DEFAULT_USER=comm
       - RABBITMQ_DEFAULT_PASS=comm
     networks:
       - services-net
diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile
index 65a3e0a8f..b566993ab 100644
--- a/services/tunnelbroker/Dockerfile
+++ b/services/tunnelbroker/Dockerfile
@@ -1,32 +1,35 @@
 FROM commapp/services-base:1.1
 
 ARG MAKE_JOBS=4
 ENV MAKEFLAGS="-j${MAKE_JOBS}"
 
 WORKDIR /transferred/scripts
 
 # Install SDKs
 COPY services/tunnelbroker/docker/install_amqp_cpp.sh .
 RUN ./install_amqp_cpp.sh
 
 COPY services/tunnelbroker/docker/install_cryptopp.sh .
 RUN ./install_cryptopp.sh
 
 COPY services/tunnelbroker/docker/install_libuv.sh .
 RUN ./install_libuv.sh
 
 ARG COMM_TEST_SERVICES
+ARG COMM_SERVICES_DEV_MODE
+
 ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
+ENV COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE}
 
 WORKDIR /transferred
 
 COPY native/cpp/CommonCpp/grpc/protos/tunnelbroker.proto protos/tunnelbroker.proto
 COPY services/lib/cmake-components cmake-components
 COPY services/lib/docker/ scripts/
 COPY services/tunnelbroker/docker/* docker/
 COPY services/tunnelbroker/ .
 COPY services/lib/src/* src/
 
 RUN scripts/build_service.sh
 
 CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then scripts/run_service.sh; else scripts/run_service.sh; fi