diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 1e332923..d66462b1 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -112,3 +112,5 @@ services:
       US_MASTER_TOKEN: "fake-us-master-token"
       NODE_EXTRA_CA_CERTS: "/usr/local/share/ca-certificates/cert.pem"
       HC: ${HC:-0}
+      YANDEX_MAP_ENABLED: ${YANDEX_MAP_ENABLED:-0}
+      YANDEX_MAP_TOKEN: ${YANDEX_MAP_TOKEN:-0}
diff --git a/docker-compose.yml b/docker-compose.yml
index 5f76e4c4..36505aaa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -104,3 +104,5 @@ services:
       US_MASTER_TOKEN: "fake-us-master-token"
       NODE_EXTRA_CA_CERTS: "/usr/local/share/ca-certificates/cert.pem"
       HC: ${HC:-0}
+      YANDEX_MAP_ENABLED: ${YANDEX_MAP_ENABLED:-0}
+      YANDEX_MAP_TOKEN: ${YANDEX_MAP_TOKEN:-0}
diff --git a/docker-compose.zitadel.yml b/docker-compose.zitadel.yml
index 74d0632c..b60ab44e 100644
--- a/docker-compose.zitadel.yml
+++ b/docker-compose.zitadel.yml
@@ -179,6 +179,8 @@ services:
       US_MASTER_TOKEN: "${US_MASTER_TOKEN}"
       NODE_EXTRA_CA_CERTS: "/usr/local/share/ca-certificates/cert.pem"
       HC: ${HC:-0}
+      YANDEX_MAP_ENABLED: ${YANDEX_MAP_ENABLED:-0}
+      YANDEX_MAP_TOKEN: ${YANDEX_MAP_TOKEN:-0}
 
       ZITADEL: "true"
       CLIENT_ID: "${DL_CLIENT_ID}"
diff --git a/templates/docker-compose.j2 b/templates/docker-compose.j2
index d20e3f4d..8d84e363 100644
--- a/templates/docker-compose.j2
+++ b/templates/docker-compose.j2
@@ -120,3 +120,5 @@ services:
       US_MASTER_TOKEN: "fake-us-master-token"
       NODE_EXTRA_CA_CERTS: "/usr/local/share/ca-certificates/cert.pem"
       HC: ${HC:-0}
+      YANDEX_MAP_ENABLED: ${YANDEX_MAP_ENABLED:-0}
+      YANDEX_MAP_TOKEN: ${YANDEX_MAP_TOKEN:-0}
diff --git a/templates/docker-compose.zitadel.j2 b/templates/docker-compose.zitadel.j2
index 8a04c9e5..8a7eab21 100644
--- a/templates/docker-compose.zitadel.j2
+++ b/templates/docker-compose.zitadel.j2
@@ -199,6 +199,8 @@ services:
       US_MASTER_TOKEN: "${US_MASTER_TOKEN}"
       NODE_EXTRA_CA_CERTS: "/usr/local/share/ca-certificates/cert.pem"
       HC: ${HC:-0}
+      YANDEX_MAP_ENABLED: ${YANDEX_MAP_ENABLED:-0}
+      YANDEX_MAP_TOKEN: ${YANDEX_MAP_TOKEN:-0}
 
       ZITADEL: "true"
       CLIENT_ID: "${DL_CLIENT_ID}"