diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml
index 1e37116..22713dd 100644
--- a/.deploy/deploy-dev.yaml
+++ b/.deploy/deploy-dev.yaml
@@ -39,12 +39,10 @@ services:
     ports:
       - "15672:15672"
       - "5672:5672"
-    volumes:
-      - rabbitmq:/var/lib/rabbitmq/
+    environment:
+      RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV
     deploy:
       mode: replicated
-      placement:
-        constraints: [node.role == manager]
       restart_policy:
         condition: any
       update_config:
@@ -103,6 +101,4 @@ services:
 
 volumes:
   minio_data:
-    driver: local
-  rabbitmq:
     driver: local
\ No newline at end of file
diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml
index f8acdba..34aae65 100644
--- a/.deploy/deploy-prod.yaml
+++ b/.deploy/deploy-prod.yaml
@@ -39,10 +39,10 @@ services:
     ports:
       - "15672:15672"
       - "5672:5672"
+    environment:
+      RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_PROD
     deploy:
       mode: replicated
-      placement:
-        constraints: [node.role == manager]
       restart_policy:
         condition: any
       update_config:
@@ -101,6 +101,4 @@ services:
 
 volumes:
   minio_data:
-    driver: local
-  rabbitmq:
     driver: local
\ No newline at end of file