diff --git a/docker/.env b/docker/.env
index 9f7713257..1719cf798 100644
--- a/docker/.env
+++ b/docker/.env
@@ -89,6 +89,8 @@ REDIS_PORT=
 REDIS_SLAVE_HOST=
 REDIS_SLAVE_PORT=
 REDIS_SLAVE_WAIT_TIMEOUT=
+SERVER_SETUP_HOST=
+SERVER_SETUP_PORT=
 
 # Logging
 DJANGO_LOG_LEVEL=
diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4
index 023989d60..9e5d10680 100644
--- a/docker/docker-compose.yml.m4
+++ b/docker/docker-compose.yml.m4
@@ -82,6 +82,8 @@ x-osserver-env: &default-osserver-env
     REDIS_PORT: ifenvelse(`REDIS_PORT', 6379)
     REDIS_SLAVE_HOST: "ifenvelse(`REDIS_SLAVE_HOST', redis-slave)"
     REDIS_SLAVE_PORT: ifenvelse(`REDIS_SLAVE_PORT', 6379)
+    SERVER_SETUP_HOST: "ifenvelse(`SERVER_SETUP_HOST', server-setup)"
+    SERVER_SETUP_PORT: ifenvelse(`SERVER_SETUP_PORT', 8000)
     RESET_PASSWORD_VERBOSE_ERRORS: "ifenvelse(`RESET_PASSWORD_VERBOSE_ERRORS', False)"
 x-pgnode: &default-pgnode
   image: ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/openslides-repmgr:latest
diff --git a/server/docker/entrypoint b/server/docker/entrypoint
index 2932f2bf4..40b5eec16 100755
--- a/server/docker/entrypoint
+++ b/server/docker/entrypoint
@@ -14,8 +14,7 @@ export SECRET_KEY="$DJANGO_SECRET_KEY"
 # SAML setup
 . /usr/local/lib/saml-setup.sh
 
-# TODO: env variable for this host
-wait-for-it -t 0 "server-setup:8000"
+wait-for-it -t 0 "${SERVER_SETUP_HOST:-server-setup}:${SERVER_SETUP_PORT:-8000}"
 
 printf 'Executing server: "%s"\n' "$*"