diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index e0d01d9..16ec57a 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -67,6 +67,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/keystone/server/single.yml b/keystone/server/single.yml
index 8c5e594..080c65e 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -62,7 +62,8 @@
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
-        host: ${_param:single_address}
+        use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+        host: ${_param:openstack_message_queue_address}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'