diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index c8c25bd..23787a7 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -65,6 +65,8 @@
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
+        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/cinder/control/single.yml b/cinder/control/single.yml
index 963e308..6760d05 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -42,6 +42,8 @@
       barbican:
         enabled: ${_param:barbican_integration_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/cinder/volume/backend/ceph.yml b/cinder/volume/backend/ceph.yml
index 6b41224..14a9a4a 100644
--- a/cinder/volume/backend/ceph.yml
+++ b/cinder/volume/backend/ceph.yml
@@ -4,6 +4,8 @@
   cinder:
     volume:
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         ha_queues: true
       enabled: true
       notification: true
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index c35129d..e0c6ed8 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -24,8 +24,9 @@
       barbican:
         enabled: ${_param:barbican_integration_enabled}
       message_queue:
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         port: ${_param:openstack_rabbitmq_port}
-        host: ${_param:single_address}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}
           ca_file: ${_param:rabbitmq_cinder_ssl_ca_file}
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index c40c7e9..695d27f 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -32,6 +32,8 @@
         enabled: ${_param:barbican_integration_enabled}
       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}