diff --git a/docker-compose.yml b/docker-compose.yml
index 403cb989..de8617ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 services:
   database:
     image: registry.gitlab.com/openstapps/database:master
@@ -6,6 +6,12 @@ services:
       - ./database:/usr/share/elasticsearch/data
     expose:
       - "9200"
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "nc", "-zv", "localhost", "9200"]
+      interval: 5s
+      timeout: 10s
+      retries: 20
 
   backend:
     image: registry.gitlab.com/openstapps/backend/default:master
@@ -22,6 +28,10 @@ services:
       - "database"
     labels:
       - stapps.version=1.0.0
+    restart: unless-stopped
+    depends_on:
+      database:
+        condition: service_healthy
 
   api:
     image: registry.gitlab.com/openstapps/api/copy:v0.0.3