diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
index 63b9d17..51294a2 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
@@ -10,9 +10,13 @@
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
 - system.keystone.server.cluster
-- system.keystone.server.storage.glusterfs
 - system.glance.control.cluster
-- system.glance.control.storage.glusterfs
+- system.glusterfs.server.volume.glance
+- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.glance
+- system.glusterfs.client.volume.keystone
 - system.nova.control.cluster
 - system.neutron.control.opencontrail.cluster
 - system.cinder.control.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index bd3fca0..087a8aa 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -11,9 +11,13 @@
 - system.rabbitmq.server.vhost.openstack
 - system.keystone.server.wsgi
 - system.keystone.server.cluster
-- system.keystone.server.storage.glusterfs
+- system.glusterfs.server.volume.glance
+- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.glance
+- system.glusterfs.client.volume.keystone
 - system.glance.control.cluster
-- system.glance.control.storage.glusterfs
 - system.nova.control.cluster
 - system.neutron.control.opencontrail.cluster
 - system.cinder.control.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
index 89db1f3..80b36fd 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
@@ -8,6 +8,7 @@
 - system.horizon.server.plugin.overrides
 - cluster.virtual-mcp11-contrail
 parameters:
+  linux:
     network:
       interface:
         ens4:
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
index c12ebbb..a25a3a1 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
@@ -9,7 +9,7 @@
   linux:
     network:
       interface:
-        eth1:
+        ens4:
           enabled: true
           type: eth
           proto: dhcp
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
index a1e98df..749161a 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
@@ -9,7 +9,7 @@
   linux:
     network:
       interface:
-        eth1:
+        ens4:
           enabled: true
           type: eth
           proto: dhcp