diff --git a/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
index 0766df7..32a8efc 100644
--- a/neutron/compute/cluster.yml
+++ b/neutron/compute/cluster.yml
@@ -31,6 +31,8 @@
         tenant_network_types: ${_param:neutron_tenant_network_types}"
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         members:
           - host: ${_param:openstack_message_queue_node01_address}
           - host: ${_param:openstack_message_queue_node02_address}
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index fe6f464..c95db09 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -20,6 +20,8 @@
         password: ${_param:keystone_nova_password}
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         members:
           - host: ${_param:openstack_message_queue_node01_address}
           - host: ${_param:openstack_message_queue_node02_address}
diff --git a/neutron/control/opencontrail/single.yml b/neutron/control/opencontrail/single.yml
index 00fa23c..ce55faa 100644
--- a/neutron/control/opencontrail/single.yml
+++ b/neutron/control/opencontrail/single.yml
@@ -10,6 +10,8 @@
         region: ${_param:openstack_region}
         host: ${_param:openstack_control_address}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         members:
           - host: ${_param:single_address}
       compute:
diff --git a/neutron/control/openvswitch/single.yml b/neutron/control/openvswitch/single.yml
index 5beb0ca..bbf629c 100644
--- a/neutron/control/openvswitch/single.yml
+++ b/neutron/control/openvswitch/single.yml
@@ -39,5 +39,7 @@
         region: ${_param:openstack_region}
         protocol: ${_param:internal_protocol}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         members:
           - host: ${_param:single_address}
diff --git a/neutron/control/ovn/single.yml b/neutron/control/ovn/single.yml
index 73702fd..3a73f05 100644
--- a/neutron/control/ovn/single.yml
+++ b/neutron/control/ovn/single.yml
@@ -37,6 +37,8 @@
         password: ${_param:keystone_neutron_password}
         region: ${_param:openstack_region}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         members:
           - host: ${_param:openstack_message_queue_node01_address}
       ovn_ctl_opts:
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index bc025eb..76f3654 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -26,6 +26,8 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index 58aaab8..517c955 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -22,6 +22,8 @@
         tenant_network_types: "${_param:neutron_tenant_network_types}"
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         members:
           - host: ${_param:openstack_message_queue_node01_address}
           - host: ${_param:openstack_message_queue_node02_address}