diff --git a/docker-compose.yml b/docker-compose.yml
index 8e83cda..f03b308 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -62,6 +62,9 @@ services:
     environment:
       LAMASSU_DB_CONNECT_CLIENT_ID: ${LAMASSU_DB_CONNECT_CLIENT_ID:?'missing/empty env var $LAMASSU_DB_CONNECT_CLIENT_ID'}
       LAMASSU_DB_CONNECT_API_KEY: ${LAMASSU_DB_CONNECT_API_KEY:?'missing/empty env var $LAMASSU_DB_CONNECT_API_KEY'}
+      LAMASSU_BOLT_API_URL: ${LAMASSU_BOLT_API_URL:?'missing/empty env var $LAMASSU_BOLT_API_URL'}
+      LAMASSU_BOLT_USER: ${LAMASSU_BOLT_USER:?'missing/empty env var $LAMASSU_BOLT_USER'}
+      LAMASSU_BOLT_PASSWORD: ${LAMASSU_BOLT_PASSWORD:?'missing/empty env var $LAMASSU_BOLT_PASSWORD'}
       # depending on base image, JAVA_TOOL_OPTIONS must be used
       LAMASSU_BASE_URL: ${LAMASSU_BASE_URL}
       JDK_JAVA_OPTIONS:
@@ -70,10 +73,6 @@ services:
         -Dorg.entur.lamassu.adminPassword=${LAMASSU_ADMIN_PASSWORD}
         -Dhttp.proxyHost=transformer-proxy
         -Dhttp.proxyPort=8080
-      # Bolt authentification
-      - BOLT_API_URL
-      - BOLT_USER
-      - BOLT_PASSWORD
     volumes:
       - ./etc/lamassu/:/etc/application-config/
       - ./var/gbfs/feeds:/var/gbfs/feeds