diff --git a/api/jpo-conflictvisualizer-api/src/main/resources/application.yaml b/api/jpo-conflictvisualizer-api/src/main/resources/application.yaml
index 970ecf16..02716e50 100644
--- a/api/jpo-conflictvisualizer-api/src/main/resources/application.yaml
+++ b/api/jpo-conflictvisualizer-api/src/main/resources/application.yaml
@@ -13,7 +13,7 @@ spring.security.oauth2.resourceserver.jwt:
   issuer-uri: ${AUTH_SERVER_URL:http://localhost:8084}/realms/conflictvisualizer
   jwk-set-uri: ${AUTH_SERVER_URL:http://localhost:8084}/realms/conflictvisualizer/protocol/openid-connect/certs
 
-spring.kafka.bootstrap-servers: localhost:9092
+spring.kafka.bootstrap-servers: ${KAFKA_BROKER_IP:localhost}:${KAFKA_BROKER_PORT:9092}
 logging.level.org.apache.kafka: INFO
 logging.level: INFO
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 508685fa..80f60c75 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,6 @@ services:
         KEYCLOAK_CLIENT_SECRET: ${KEYCLOAK_CLIENT_SECRET}
         KEYCLOAK_REALM: ${KEYCLOAK_REALM}
         MAPBOX_TOKEN: ${MAPBOX_TOKEN}
-        MAPBOX_STYLE_URL: ${MAPBOX_STYLE_URL}
         GUI_SERVER_URL: ${GUI_SERVER_URL}
         AUTH_SERVER_URL: ${AUTH_SERVER_URL}
         API_SERVER_URL: ${API_SERVER_URL}