diff --git a/docker/master/docker-compose.yaml b/docker/master/docker-compose.yaml
index a2b76372..d86ac92e 100644
--- a/docker/master/docker-compose.yaml
+++ b/docker/master/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   pg:
-    image: postgres
+    image: timescale/timescaledb-ha:pg16
     ports:
       - "5432:5432"
     environment:
@@ -10,7 +10,7 @@ services:
     networks:
       - dn
     volumes:
-      - pg_data:/var/lib/postgresql/data
+      - pg_data:/home/postgres
 
 
   redis:
@@ -26,19 +26,18 @@ services:
       - redis-server
       - /etc/redis/redis.conf
 
-  coal:
-    image: coal:master
+  rabbitmq:
+    image: rabbitmq:3.13-management-alpine
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    volumes:
+      - rabbitmq_data:/var/lib/rabbitmq/
+      - rabbitmq_log:/var/log/rabbitmq
+      - ./rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
     networks:
       - dn
-    environment:
-       PG_HOST: pg
-       REDIS_HOST: redis
-    volumes:
-      - spring_data:/data
-    ports:
-      - "7456:7456"
-    command:
-      - --spring.profiles.active=master
+
 
 networks:
   dn:
@@ -49,5 +48,6 @@ networks:
 volumes:
   pg_data:
   redis_data:
-  spring_data:
+  rabbitmq_data:
+  rabbitmq_log:
 
diff --git a/docker/master/rabbitmq.conf b/docker/master/rabbitmq.conf
new file mode 100644
index 00000000..69d8c726
--- /dev/null
+++ b/docker/master/rabbitmq.conf
@@ -0,0 +1,6 @@
+loopback_users.guest = false
+listeners.tcp.default = 5672
+default_pass = coal
+default_user = coal
+default_vhost = /coal
+management.tcp.port = 15672
\ No newline at end of file
diff --git a/systemd/coal-master.service b/systemd/coal-master.service
index 9019cfaa..17a1f3b9 100644
--- a/systemd/coal-master.service
+++ b/systemd/coal-master.service
@@ -6,6 +6,6 @@ After=syslog.target network.target
 Type=simple
 User=root
 WorkingDirectory=/opt/coal/master/api/
-ExecStart=/usr/bin/java -Dspring.profiles.active=master -DPG_DATABASE=coal_master -DREDIS_DATABASE=0 org.springframework.boot.loader.JarLauncher
+ExecStart=/usr/bin/java -Dspring.profiles.active=master -DPG_DATABASE=coal_master -DRABBITMQ_VHOST=/coal/master -DREDIS_DATABASE=0 org.springframework.boot.loader.JarLauncher
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/coal-prod.service b/systemd/coal-prod.service
index 8de58278..05c2d6d7 100644
--- a/systemd/coal-prod.service
+++ b/systemd/coal-prod.service
@@ -6,6 +6,6 @@ After=syslog.target network.target
 Type=simple
 User=root
 WorkingDirectory=/opt/coal/prod/api/
-ExecStart=/usr/bin/java -Dspring.profiles.active=prod -DPG_DATABASE=coal_prod -DREDIS_DATABASE=0 org.springframework.boot.loader.JarLauncher
+ExecStart=/usr/bin/java -Dspring.profiles.active=prod -DPG_DATABASE=coal_prod -DRABBITMQ_VHOST=/coal/prod -DREDIS_DATABASE=0 org.springframework.boot.loader.JarLauncher
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/coal-test.service b/systemd/coal-test.service
index e8edd962..15f70e32 100644
--- a/systemd/coal-test.service
+++ b/systemd/coal-test.service
@@ -6,6 +6,6 @@ After=syslog.target network.target
 Type=simple
 User=root
 WorkingDirectory=/opt/coal/test/api/
-ExecStart=/usr/bin/java -Dspring.profiles.active=test -DPG_DATABASE=coal_test -DREDIS_DATABASE=1 org.springframework.boot.loader.JarLauncher
+ExecStart=/usr/bin/java -Dspring.profiles.active=test -DPG_DATABASE=coal_test -DRABBITMQ_VHOST=/coal/test -DREDIS_DATABASE=1 org.springframework.boot.loader.JarLauncher
 [Install]
 WantedBy=multi-user.target