diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 0881c16..67daa26 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -6,7 +6,7 @@
 - system.rabbitmq.server.vhost.openstack
 - system.keystone.server.wsgi
 - system.keystone.server.single
-- service.galera.master.cluster
+- service.galera.master.single
 - system.galera.server.database.cinder
 - system.galera.server.database.designate
 - system.galera.server.database.glance
@@ -28,7 +28,7 @@
 - service.neutron.gateway.single
 - system.cinder.control.single
 - system.cinder.control.backend.lvm
-- service.cinder.volume.single
+- service.cinder.volume.local
 - system.cinder.volume.backend.lvm
 - system.horizon.server.single
 - system.bind.server.single
@@ -123,9 +123,14 @@
     openstack_public_neutron_subnet_allocation_end: 192.168.130.254
     barbican_simple_crypto_kek: YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=
     barbican_integration_enabled: False
+    openstack_message_queue_node01_address: ${_param:single_address}
+    cluster_node01_address: 127.0.1.1
+    # DEPRECATED, these are hot-fix added just to deal with wrong class loading above. This model needs maintenance.
+    cluster_node02_address: 127.0.2.1
+    cluster_node03_address: 127.0.3.1
   galera:
     master:
-      members: ~
+      members: []
       innodb_buffer_pool_size: 1024M
       max_connections: 1000
     slave:
@@ -141,7 +146,7 @@
   neutron:
     server:
       message_queue:
-        members: ~
+        members: []
     gateway:
       agent_mode: dvr_snat
       dvr: True
@@ -155,7 +160,7 @@
         password: ${_param:keystone_neutron_password}
         tenant: service
       cache:
-        members: ~
+        members: []
     controller:
       barbican:
         enabled: ${_param:barbican_integration_enabled}
@@ -166,7 +171,7 @@
         enabled: ${_param:barbican_integration_enabled}
     volume:
       cache:
-        members: ~
+        members: []
   horizon:
     server:
       secure: False