diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index cfd93f7..135dbe8 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -16,8 +16,10 @@
         password: ${_param:keystone_ceilometer_password}
       message_queue:
         engine: rabbitmq
-        host: ${_param:openstack_message_queue_address}
-        port: 5672
+        members:
+          - host: ${_param:openstack_message_queue_node01_address}
+          - host: ${_param:openstack_message_queue_node02_address}
+          - host: ${_param:openstack_message_queue_node03_address}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index b5d8013..cfe54f9 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -26,8 +26,10 @@
         password: ${_param:keystone_ceilometer_password}
       message_queue:
         engine: rabbitmq
-        host: ${_param:openstack_message_queue_address}
-        port: 5672
+        members:
+          - host: ${_param:openstack_message_queue_node01_address}
+          - host: ${_param:openstack_message_queue_node02_address}
+          - host: ${_param:openstack_message_queue_node03_address}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index 6df5290..868b71e 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -39,8 +39,10 @@
         port: 9292
       message_queue:
         engine: rabbitmq
-        host: ${_param:openstack_message_queue_address}
-        port: 5672
+        members:
+          - host: ${_param:openstack_message_queue_node01_address}
+          - host: ${_param:openstack_message_queue_node02_address}
+          - host: ${_param:openstack_message_queue_node03_address}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index cede74c..9c8f7c2 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -9,6 +9,9 @@
       glance:
         host: ${_param:openstack_control_address}
       message_queue:
-        host: ${_param:openstack_message_queue_address}
+        members:
+          - host: ${_param:openstack_message_queue_node01_address}
+          - host: ${_param:openstack_message_queue_node02_address}
+          - host: ${_param:openstack_message_queue_node03_address}
       identity:
-        host: ${_param:openstack_control_address}
\ No newline at end of file
+        host: ${_param:openstack_control_address}
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index c7f11a0..6db4f7a 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -33,9 +33,11 @@
         location: /var/lib/keystone/fernet-keys
       message_queue:
         engine: rabbitmq
-        host: ${_param:openstack_message_queue_address}
-        port: 5672
+        members:
+          - host: ${_param:openstack_message_queue_node01_address}
+          - host: ${_param:openstack_message_queue_node02_address}
+          - host: ${_param:openstack_message_queue_node03_address}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
-        ha_queues: true
\ No newline at end of file
+        ha_queues: true
diff --git a/opencontrail/control/control.yml b/opencontrail/control/control.yml
index 794682d..9c1d905 100644
--- a/opencontrail/control/control.yml
+++ b/opencontrail/control/control.yml
@@ -20,7 +20,10 @@
       bind:
         address: ${_param:cluster_local_address}
       message_queue:
-        host: ${_param:openstack_message_queue_address}
+        members:
+          - host: ${_param:openstack_message_queue_node01_address}
+          - host: ${_param:openstack_message_queue_node02_address}
+          - host: ${_param:openstack_message_queue_node03_address}
       identity:
         region: ${_param:openstack_region}
         host: ${_param:openstack_control_address}