diff --git a/docker-compose-build.yml b/docker-compose-build.yml
index 50cecfc..ce9e936 100644
--- a/docker-compose-build.yml
+++ b/docker-compose-build.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 services:
 
@@ -50,28 +50,34 @@ services:
       - zammad-elasticsearch
       - zammad-postgresql
     restart: always
+    volumes:
+      - data-zammad:/home/zammad
 
   zammad-scheduler:
     build:
       context: .
       dockerfile: containers/zammad-scheduler/Dockerfile
     depends_on:
-      - zammad-railsserver
+      - zammad
     links:
       - zammad-elasticsearch
       - zammad-postgresql
     restart: always
+    volumes:
+      - data-zammad:/home/zammad
 
   zammad-websocket:
     build:
       context: .
       dockerfile: containers/zammad-websocket/Dockerfile
     depends_on:
-      - zammad-railsserver
+      - zammad
     links:
       - zammad-elasticsearch
       - zammad-postgresql
     restart: always
+    volumes:
+      - data-zammad:/home/zammad
 
 volumes:
   data-zammad:
diff --git a/docker-compose.yml b/docker-compose.yml
index 6114f2d..881d118 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 services:
 
@@ -42,39 +42,45 @@ services:
     restart: always
 
   zammad-railsserver:
+    depends_on:
+      - zammad
     image: zammad/zammad-docker-compose:zammad-railsserver
     labels:
       io.rancher.container.pull_image: always
     links:
       - zammad-elasticsearch
       - zammad-postgresql
-      - zammad
     depends_on:
       - zammad
     restart: always
+    volumes:
+      - data-zammad:/home/zammad
 
   zammad-scheduler:
+    depends_on:
+      - zammad
     image: zammad/zammad-docker-compose:zammad-scheduler
     labels:
       io.rancher.container.pull_image: always
     links:
       - zammad-elasticsearch
       - zammad-postgresql
-      - zammad
-    depends_on:
-      - zammad-railsserver
     restart: always
+    volumes:
+      - data-zammad:/home/zammad
 
   zammad-websocket:
+    depends_on:
+      - zammad
     image: zammad/zammad-docker-compose:zammad-websocket
     labels:
       io.rancher.container.pull_image: always
     links:
       - zammad-postgresql
       - zammad
-    depends_on:
-      - zammad-railsserver
     restart: always
+    volumes:
+      - data-zammad:/home/zammad
 
 volumes:
   data-zammad: