diff --git a/docker/.env b/docker/.env
index ef96ea053..52f36f0ac 100644
--- a/docker/.env
+++ b/docker/.env
@@ -17,8 +17,8 @@ DEFAULT_DOCKER_REGISTRY=
 
 # Docker Images
 # -------------
-DOCKER_OPENSLIDES_HAPROXY_NAME=
-DOCKER_OPENSLIDES_HAPROXY_TAG=
+DOCKER_OPENSLIDES_PROXY_NAME=
+DOCKER_OPENSLIDES_PROXY_TAG=
 DOCKER_OPENSLIDES_BACKEND_NAME=
 DOCKER_OPENSLIDES_BACKEND_TAG=
 DOCKER_OPENSLIDES_FRONTEND_NAME=
diff --git a/docker/build.sh b/docker/build.sh
index 16cdff8d6..7ed942a01 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -6,7 +6,7 @@ declare -A TARGETS
 TARGETS=(
   [client]="$(dirname "${BASH_SOURCE[0]}")/../client/docker/"
   [server]="$(dirname "${BASH_SOURCE[0]}")/../server/docker/"
-  [caddy]="$(dirname "${BASH_SOURCE[0]}")/../caddy/"
+  [proxy]="$(dirname "${BASH_SOURCE[0]}")/../caddy/"
   [autoupdate]="$(dirname "${BASH_SOURCE[0]}")/../autoupdate/"
   [media]="https://github.com/OpenSlides/openslides-media-service.git"
   [pgbouncer]="https://github.com/OpenSlides/openslides-docker-compose.git#:pgbouncer"
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 970387e7e..574e99bd3 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -45,7 +45,7 @@ services:
   redis:
     image: redis:latest
 
-  caddy:
+  proxy:
     image: caddy:2.3.0-alpine
     volumes:
       - ../caddy/Caddyfile.dev:/etc/caddy/Caddyfile
diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4
index 847b161f7..7a6d086e3 100644
--- a/docker/docker-compose.yml.m4
+++ b/docker/docker-compose.yml.m4
@@ -13,10 +13,10 @@ define(`read_env', `esyscmd(`printf "\`%s'" "$$1"')')
 dnl return env variable if set; otherwise, return given alternative value
 define(`ifenvelse', `ifelse(read_env(`$1'),, `$2', read_env(`$1'))')
 
-define(`HAPROXY_IMAGE',
+define(`PROXY_IMAGE',
 ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
-ifenvelse(`DOCKER_OPENSLIDES_HAPROXY_NAME', openslides-caddy):dnl
-ifenvelse(`DOCKER_OPENSLIDES_HAPROXY_TAG', latest))
+ifenvelse(`DOCKER_OPENSLIDES_PROXY_NAME', openslides-proxy):dnl
+ifenvelse(`DOCKER_OPENSLIDES_PROXY_TAG', latest))
 define(`BACKEND_IMAGE',
 ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
 ifenvelse(`DOCKER_OPENSLIDES_BACKEND_NAME', openslides-server):dnl
@@ -95,8 +95,8 @@ x-pgnode-env: &default-pgnode-env
   REPMGR_WAL_ARCHIVE: "ifenvelse(`PGNODE_WAL_ARCHIVING', on)"
 
 services:
-  haproxy:
-    image: HAPROXY_IMAGE
+  proxy:
+    image: PROXY_IMAGE
     depends_on:
       - server
       - client
diff --git a/docker/docker-stack.yml.m4 b/docker/docker-stack.yml.m4
index af8eb6beb..8876e6836 100644
--- a/docker/docker-stack.yml.m4
+++ b/docker/docker-stack.yml.m4
@@ -13,10 +13,10 @@ define(`read_env', `esyscmd(`printf "\`%s'" "$$1"')')
 dnl return env variable if set; otherwise, return given alternative value
 define(`ifenvelse', `ifelse(read_env(`$1'),, `$2', read_env(`$1'))')
 
-define(`HAPROXY_IMAGE',
+define(`PROXY_IMAGE',
 ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
-ifenvelse(`DOCKER_OPENSLIDES_HAPROXY_NAME', openslides-caddy):dnl
-ifenvelse(`DOCKER_OPENSLIDES_HAPROXY_TAG', latest))
+ifenvelse(`DOCKER_OPENSLIDES_PROXY_NAME', openslides-proxy):dnl
+ifenvelse(`DOCKER_OPENSLIDES_PROXY_TAG', latest))
 define(`BACKEND_IMAGE',
 ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
 ifenvelse(`DOCKER_OPENSLIDES_BACKEND_NAME', openslides-server):dnl
@@ -95,8 +95,8 @@ x-pgnode-env: &default-pgnode-env
   REPMGR_WAL_ARCHIVE: "ifenvelse(`PGNODE_WAL_ARCHIVING', on)"
 
 services:
-  haproxy:
-    image: HAPROXY_IMAGE
+  proxy:
+    image: PROXY_IMAGE
     networks:
       - front
       - back