diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 7f53da5..79ad2f5 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -11,20 +11,34 @@ services:
       - "${POSTGRES_PORT}:5432"
     volumes:
       - postgres_data:/var/lib/postgresql
+    networks:
+      - nyanimedb-network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
 
-  # pgadmin:
-  #   image: dpage/pgadmin4:${PGADMIN_VERSION}
-  #   container_name: pgadmin
-  #   restart: always
-  #   environment:
-  #     PGADMIN_DEFAULT_EMAIL: ${PGADMIN_EMAIL}
-  #     PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD}
-  #   ports:
-  #     - "${PGADMIN_PORT}:80"
-  #   depends_on:
-  #     - postgres
-  #   volumes:
-  #     - pgadmin_data:/var/lib/pgadmin
+  rabbitmq:
+    image: rabbitmq:3-management
+    container_name: rabbitmq
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    environment:
+      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
+      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
+    volumes:
+      - rabbitmq_data:/var/lib/rabbitmq
+    networks:
+      - nyanimedb-network
+    healthcheck:
+      test: ["CMD", "rabbitmqctl", "status"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
 
   nyanimedb-backend:
     image: meowgit.nekoea.red/nihonium/nyanimedb-backend:latest
@@ -37,6 +51,9 @@ services:
       - "8080:8080"
     depends_on:
       - postgres
+      - rabbitmq
+    networks:
+      - nyanimedb-network
 
   nyanimedb-auth:
     image: meowgit.nekoea.red/nihonium/nyanimedb-auth:latest
@@ -49,6 +66,8 @@ services:
       - "8082:8082"
     depends_on:
       - postgres
+    networks:
+      - nyanimedb-network
   
   nyanimedb-frontend:
     image: meowgit.nekoea.red/nihonium/nyanimedb-frontend:latest
@@ -58,7 +77,12 @@ services:
       - "8081:80"
     depends_on:
       - nyanimedb-backend
+    networks:
+      - nyanimedb-network
 
 volumes:
   postgres_data:
-  pgadmin_data:
+  rabbitmq_data:
+
+networks:
+  nyanimedb-network: