diff --git a/phoenix-development/docker-compose.yml b/phoenix-development/docker-compose.yml
index 9721da4..d3737fa 100644
--- a/phoenix-development/docker-compose.yml
+++ b/phoenix-development/docker-compose.yml
@@ -134,6 +134,22 @@ services:
   db:
     image: postgres:alpine
     env_file: .db_env
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready --username=phoenix"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    logging:
+      options:
+       max-size: "1g"
+  rabbitmq:
+    image: rabbitmq:alpine
+    env_file: .rabbitmq_env
+    healthcheck:
+      test: rabbitmq-diagnostics -q ping
+      interval: 5s
+      timeout: 30s
+      retries: 3
     logging:
       options:
         max-size: "1g"