diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index f27b2b19..0b91dd93 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -4,6 +4,7 @@ services:
   ca:
     volumes:
       - data:/data
+      - step:/root/.step
 
   memcached:
     restart: always
@@ -22,7 +23,7 @@ services:
       - SSH_CMDLINE=${SSH_CMDLINE:-ssh ssh://aur@localhost:2222}
     volumes:
       - ${GIT_DATA_DIR}:/aurweb/aur.git
-      - ./data:/aurweb/data
+      - data:/aurweb/data
 
   smartgit:
     restart: always
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 8c74f947..1e466730 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,6 +1,11 @@
 version: "3.8"
 
 services:
+  ca:
+    volumes:
+      - ./data:/data
+      - step:/root/.step
+
   mariadb_init:
     depends_on:
       mariadb:
@@ -41,3 +46,9 @@ services:
       - ./web/template:/aurweb/web/template
       - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
+
+  nginx:
+    volumes:
+      - ./data:/data
+      - archives:/var/lib/aurweb/archives
+      - smartgit_run:/var/run/smartgit
diff --git a/docker-compose.yml b/docker-compose.yml
index c1f93319..5d8f7d78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,12 +33,6 @@ services:
     healthcheck:
       test: "bash /docker/health/run-ca.sh"
       interval: 3s
-    tmpfs:
-      - /tmp
-    volumes:
-      - ./docker:/docker
-      - ./data:/data
-      - step:/root/.step
 
   memcached:
     image: aurweb:latest
@@ -269,10 +263,6 @@ services:
         condition: service_healthy
       php-fpm:
         condition: service_healthy
-    volumes:
-      - ./data:/data
-      - archives:/var/lib/aurweb/archives
-      - smartgit_run:/var/run/smartgit
 
   sharness:
     image: aurweb:latest