diff --git a/backend b/backend
index da9279c2a18e711ddfaf5206fc296f50ab87079c..56c50026bf51b174d527a5258b92ac7b96fc152b 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit da9279c2a18e711ddfaf5206fc296f50ab87079c
+Subproject commit 56c50026bf51b174d527a5258b92ac7b96fc152b
diff --git a/docker-compose.yml b/docker-compose.yml
index 43968305b2c0e62a59b506e1d0e934244f1ee1d6..63b62b40071b591e7608d7cfc2f2339ccb3d5922 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,10 +26,16 @@ services:
       LOG_LEVEL: info
       LOG_FILE: villasweb-backend_log.txt
       DEFAULT_ADMIN: "true"
+    command: [
+      "wait-for", "broker:5672", "--",
+      "wait-for", "database:27017", "--",
+      "npm", "start"
+    ]
     volumes:
       - files:/usr/src/app/public/
     depends_on:
       - broker
+      - database
     restart: always
 
   # A single reverse proxy for all our services