diff --git a/.gitmodules b/.gitmodules
index 17b36605e..573864177 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -24,3 +24,6 @@
 [submodule "openslides-permission-service"]
 	path = openslides-permission-service
 	url = git@github.com:OpenSlides/openslides-permission-service.git
+[submodule "openslides-manage-service"]
+	path = openslides-manage-service
+	url = git@github.com:OpenSlides/openslides-manage-service.git
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index cde29b6e6..8901b2018 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -93,6 +93,14 @@ services:
     env_file: services.env
     volumes:
       - ../openslides-media-service/src:/app/src
+  manage:
+    image: openslides-manage-dev
+    depends_on:
+    - auth
+    - datastore-writer
+    env_file: services.env
+    ports:
+    - "8001:8001"
   message-bus:
     image: redis:latest
   haproxy:
diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4
index 6ac675364..025d2a591 100644
--- a/docker/docker-compose.yml.m4
+++ b/docker/docker-compose.yml.m4
@@ -43,6 +43,10 @@ define(`MEDIA_IMAGE',
 ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
 ifenvelse(`DOCKER_OPENSLIDES_MEDIA_NAME', openslides-media):dnl
 ifenvelse(`DOCKER_OPENSLIDES_MEDIA_TAG', latest))
+define(`MANAGE_IMAGE',
+ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl
+ifenvelse(`DOCKER_OPENSLIDES_MANAGE_NAME', openslides-manage):dnl
+ifenvelse(`DOCKER_OPENSLIDES_MANAGE_TAG', latest))
 
 define(`PROJECT_DIR', ifdef(`PROJECT_DIR',PROJECT_DIR,.))
 define(`ADMIN_SECRET_AVAILABLE', `syscmd(`test -f 'PROJECT_DIR`/secrets/admin.env')sysval')
@@ -169,6 +173,16 @@ services:
       - backend
       - postgres
 
+  manage:
+    image: MANAGE_IMAGE
+    depends_on:
+    - auth
+    - datastore-writer
+    env_file: services.env
+    networks:
+    - backend
+    - auth
+
 # Setup: host <-uplink-> haproxy <-frontend-> services that are reachable from the client <-backend-> services that are internal-only
 # There are special networks for some services only, e.g. postgres only for the postgresql, datastore reader and datastore writer
 networks:
diff --git a/openslides-manage-service b/openslides-manage-service
new file mode 160000
index 000000000..4cdf78ae0
--- /dev/null
+++ b/openslides-manage-service
@@ -0,0 +1 @@
+Subproject commit 4cdf78ae0478e09b6db2740703856285bd0d82f3