diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
index 85e9a29..633c0ae 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -12,7 +12,7 @@
 - system.ceilometer.client.nova_compute
 - system.ceilometer.agent.telemetry.cluster
 - system.ceilometer.agent.polling.default
-- cluster.virtual-offline-pike-ovs-dpdk
+- cluster.virtual-offline-pike-ovs-dpdk.infra
 - system.nova.compute.nfv.hugepages
 - system.nova.compute.nfv.cpu_pinning
 - system.neutron.compute.nfv.dpdk
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
index 757102c..5c41cab 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -17,6 +17,13 @@
 - system.glusterfs.server.volume.keystone
 - system.glusterfs.server.volume.backup
 - system.glusterfs.server.cluster
+- system.glusterfs.server.volume.aptly
+- system.glusterfs.server.volume.gerrit
+- system.glusterfs.server.volume.jenkins
+- system.glusterfs.server.volume.mysql
+- system.glusterfs.server.volume.openldap
+- system.glusterfs.server.volume.registry
+- system.glusterfs.server.cluster
 - system.glance.control.cluster
 - system.nova.control.cluster
 - system.neutron.control.openvswitch.cluster
@@ -38,7 +45,7 @@
 - system.ceilometer.client.cinder_volume
 - system.ceilometer.client.neutron
 - system.haproxy.proxy.listen.openstack.nova-placement
-- cluster.virtual-offline-pike-ovs-dpdk
+- cluster.virtual-offline-pike-ovs-dpdk.infra
 parameters:
   _param:
     keepalived_vip_interface: ens4
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
index 2c20b03..24f2b4b 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo_local.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
-- cluster.virtual-offline-pike-ovs-dpdk
+- cluster.virtual-offline-pike-ovs-dpdk.infra
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dns.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dns.yml
index ca49ae6..4fca292 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dns.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dns.yml
@@ -1,6 +1,6 @@
 classes:
 - system.powerdns.server.single
-- cluster.virtual-offline-pike-ovs-dpdk
+- cluster.virtual-offline-pike-ovs-dpdk.infra
 
 parameters:
   powerdns:
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
index 2dea160..afbe64b 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo_local.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
-- cluster.virtual-offline-pike-ovs-dpdk
+- cluster.virtual-offline-pike-ovs-dpdk.infra
 parameters:
   _param:
     primary_interface: ens4
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
index a760bea..730f074 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
@@ -4,7 +4,7 @@
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
 - system.salt.minion.cert.proxy
-- cluster.virtual-offline-pike-ovs-dpdk
+- cluster.virtual-offline-pike-ovs-dpdk.infra
 parameters:
   _param:
     cluster_public_host:  ${_param:openstack_proxy_address}
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml
index c804e24..c1c831b 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.linux.system.repo_local.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- cluster.virtual-offline-pike-ovs-dpdk
+- cluster.virtual-offline-pike-ovs-dpdk.infra
 parameters:
 
   linux:
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml
index db23a37..b664387 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml
@@ -23,7 +23,7 @@
 - system.aodh.server.coordination.redis
 - system.panko.server.cluster
 - system.ceilometer.server.backend.gnocchi
-- cluster.virtual-offline-pike-ovs-dpdk
+- cluster.virtual-offline-pike-ovs-dpdk.infra
 parameters:
   _param:
     gnocchi_statsd_resource_id: 07f26121-5777-48ba-8a0b-d70468133dd9