diff --git a/tcp_tests/templates/common-services/virtual-mcp-ocata-dvr-common-services.yaml b/tcp_tests/templates/common-services/virtual-mcp-ocata-dvr-common-services.yaml
index fcd3ba6..319bffb 100644
--- a/tcp_tests/templates/common-services/virtual-mcp-ocata-dvr-common-services.yaml
+++ b/tcp_tests/templates/common-services/virtual-mcp-ocata-dvr-common-services.yaml
@@ -44,10 +44,16 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
+- description: Install RabbitMQ on ctl01
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+    -C 'I@rabbitmq:server and *01*' state.sls rabbitmq
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
 
 - description: Install RabbitMQ
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@rabbitmq:server' state.sls rabbitmq -b 1
+    -C 'I@rabbitmq:server' state.sls rabbitmq
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
diff --git a/tcp_tests/templates/common-services/virtual-mcp-ocata-ovs-common-services.yaml b/tcp_tests/templates/common-services/virtual-mcp-ocata-ovs-common-services.yaml
index e4a56ea..4d8b13c 100644
--- a/tcp_tests/templates/common-services/virtual-mcp-ocata-ovs-common-services.yaml
+++ b/tcp_tests/templates/common-services/virtual-mcp-ocata-ovs-common-services.yaml
@@ -44,9 +44,16 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
+- description: Install RabbitMQ on ctl01
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+    -C 'I@rabbitmq:server and *01*' state.sls rabbitmq
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
+
 - description: Install RabbitMQ
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@rabbitmq:server' state.sls rabbitmq -b 1
+    -C 'I@rabbitmq:server' state.sls rabbitmq
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
diff --git a/tcp_tests/templates/common-services/virtual-mcp11-dvr-common-services.yaml b/tcp_tests/templates/common-services/virtual-mcp11-dvr-common-services.yaml
index c12ae06..1b85527 100644
--- a/tcp_tests/templates/common-services/virtual-mcp11-dvr-common-services.yaml
+++ b/tcp_tests/templates/common-services/virtual-mcp11-dvr-common-services.yaml
@@ -44,10 +44,16 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
+- description: Install RabbitMQ on ctl01
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+    -C 'I@rabbitmq:server and *01*' state.sls rabbitmq
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
 
 - description: Install RabbitMQ
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@rabbitmq:server' state.sls rabbitmq -b 1
+    -C 'I@rabbitmq:server' state.sls rabbitmq
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
diff --git a/tcp_tests/templates/common-services/virtual-mcp11-ovs-common-services.yaml b/tcp_tests/templates/common-services/virtual-mcp11-ovs-common-services.yaml
index e67a128..3dff868 100644
--- a/tcp_tests/templates/common-services/virtual-mcp11-ovs-common-services.yaml
+++ b/tcp_tests/templates/common-services/virtual-mcp11-ovs-common-services.yaml
@@ -44,10 +44,16 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
+- description: Install RabbitMQ on ctl01
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+    -C 'I@rabbitmq:server and *01*' state.sls rabbitmq
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
 
 - description: Install RabbitMQ
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@rabbitmq:server' state.sls rabbitmq -b 1
+    -C 'I@rabbitmq:server' state.sls rabbitmq
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false