diff --git a/.gitmodules b/.gitmodules
index cc0beef..597d3be 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,3 +14,7 @@
     path = manager-dashboard
     url = git@github.com:mapswipe/manager-dashboard.git
     branch = v0.3.5
+[submodule "mapswipe-web"]
+    path = mapswipe-web
+    url = git@github.com:mapswipe/mapswipe-web.git
+    branch = v0.3.4
diff --git a/community-dashboard b/community-dashboard
index 0c9d754..632ae1c 160000
--- a/community-dashboard
+++ b/community-dashboard
@@ -1 +1 @@
-Subproject commit 0c9d7544b00849dac1b34766e4e8e59ce8310c70
+Subproject commit 632ae1c21edb44af3caaaa05765f49b91cafe214
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 85bb01b..577eb36 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -55,13 +55,6 @@ x-server: &base_server_setup
   profiles:
     - core
 
-
-x-worker: &base_worker_setup
-  <<: *base_server_setup
-  environment:
-    <<: *base_server_environments
-    APP_TYPE: "WORKER-BEAT"
-
 services:
   ofelia:
     image: mcuadros/ofelia:0.3.17
@@ -162,12 +155,18 @@ services:
     command: bash -c "/code/misc/prod/run_web.sh"
 
   worker-beat:
-    <<: *base_worker_setup
+    <<: *base_server_setup
     command: bash -c "/code/misc/prod/run_worker_beat.sh"
+    environment:
+      <<: *base_server_environments
+      APP_TYPE: "WORKER-BEAT"
 
   worker:
-    <<: *base_worker_setup
+    <<: *base_server_setup
     command: bash -c "/code/misc/prod/run_worker.sh"
+    environment:
+      <<: *base_server_environments
+      APP_TYPE: "WORKER"
 
   # Manager Dashboard
   manager-dashboard:
diff --git a/manager-dashboard b/manager-dashboard
index 39cf675..f537707 160000
--- a/manager-dashboard
+++ b/manager-dashboard
@@ -1 +1 @@
-Subproject commit 39cf6753ca9543af9a9e7e835b5d4076a9a940c6
+Subproject commit f537707e9225a72eaa3293dd96eb0fb4689e4e5b
diff --git a/mapswipe-web b/mapswipe-web
new file mode 160000
index 0000000..6b89597
--- /dev/null
+++ b/mapswipe-web
@@ -0,0 +1 @@
+Subproject commit 6b895971edef8166e9f4cb24a96898d8d4fdc09a