diff --git a/docker-compose.yml b/docker-compose.yml
index 691d844..9bd29fa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,7 @@
+volumes:
+  couchdb_data:
+  db_migrations_data:
+
 services:
   couchdb:
     build: services/couchdb
@@ -26,7 +30,8 @@ services:
     environment:
       - API_URL=http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb:5984
     depends_on:
-      - couchdb
+      db:
+        condition: service_healthy
     restart: no
     logging:
       driver: "json-file"
@@ -44,15 +49,14 @@ services:
       - VAPID_SUBJECT=${VAPID_SUBJECT}
       - GCM_API_KEY=${GCM_API_KEY}
     depends_on:
-      - couchdb
-      - db-migrations
+      db:
+        condition: service_healthy
+        restart: true
+      db-migrations:
+        condition: service_completed_successfully
     restart: no
     logging:
       driver: "json-file"
       options:
         max-size: "100m"
         max-file: "10"
-
-volumes:
-  couchdb_data:
-  db_migrations_data: