diff --git a/docker-compose.dev.override.yml b/docker-compose.dev.override.yml
index 08063bf..bdec16e 100644
--- a/docker-compose.dev.override.yml
+++ b/docker-compose.dev.override.yml
@@ -7,6 +7,9 @@ services:
       replicas: 1
     environment:
       DJANGO_SETTINGS_MODULE: feo_homepage.settings.dev
+    volumes:
+      - .:/app
+      - userhome:/home/runuser
     ports:
       - "8000:8000"
     depends_on:
@@ -25,11 +28,19 @@ services:
   manage:
     deploy:
       replicas: 0
+    volumes:
+      - .:/app
+      - userhome:/home/runuser
     environment:
       DJANGO_SETTINGS_MODULE: feo_homepage.settings.dev
     depends_on:
       - db
 
+  celery:
+    volumes:
+      - .:/app
+      - userhome:/home/runuser
+
   mailhog:
     image: mailhog/mailhog
     ports:
diff --git a/docker-compose.prod.override.yml b/docker-compose.prod.override.yml
index 8e45241..f5e35b9 100644
--- a/docker-compose.prod.override.yml
+++ b/docker-compose.prod.override.yml
@@ -25,6 +25,12 @@ services:
       - default
       - db
 
+  celery:
+    restart: unless-stopped
+    volumes:
+      - /mnt/data/feo-homepage/static:/app/static
+      - /mnt/data/feo-homepage/media:/app/media
+
   nginx:
     image: nginx:1.23
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 14d54d2..3a02c56 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,9 +12,6 @@ services:
       mode: replicated
       replicas: 6
       endpoint_mode: vip
-    volumes:
-      - .:/app
-      - userhome:/home/runuser
     env_file:
       - .env
     environment:
@@ -31,9 +28,6 @@ services:
     entrypoint:
       - "./manage.py"
     command: "collectstatic --no-input"
-    volumes:
-      - .:/app
-      - userhome:/home/runuser
     env_file:
       - .env
     environment:
@@ -52,9 +46,6 @@ services:
     environment:
       PYTHONDONTWRITEBYTECODE: 1
       DJANGO_SETTINGS_MODULE: feo_homepage.settings.prod
-    volumes:
-      - .:/app
-      - userhome:/home/uid1000
     env_file:
       - .env
     depends_on: