diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
index c1ef8c6..f0ff1a4 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
@@ -7,6 +7,7 @@
 - system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
+- system.linux.system.single.debian
 - system.rsyslog.client.single
 - system.prometheus.collector
 - system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
index 582837d..1f70a17 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
@@ -5,6 +5,7 @@
 - system.heka.log_collector.output.telegraf
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
+- system.linux.system.single.debian
 - system.rsyslog.client.single
 - system.prometheus.collector
 - system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
index 5affb23..d66af7f 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
@@ -7,6 +7,7 @@
 - system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
+- system.linux.system.single.debian
 - system.rsyslog.client.single
 - system.prometheus.collector
 - system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
index 0d296ba..ead583b 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
@@ -6,6 +6,7 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
 - system.rsyslog.client.single
+- system.linux.system.single.debian
 - system.prometheus.collector
 - system.telegraf.agent
 - system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
index aa01aec..ccef4f2 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
@@ -6,6 +6,7 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
 - system.rsyslog.client.single
+- system.linux.system.single.debian
 - system.prometheus.collector
 - system.telegraf.agent
 - system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
index c99924a..68d37ba 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
@@ -5,6 +5,7 @@
 - system.heka.log_collector.output.telegraf
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
+- system.linux.system.single.debian
 - system.rsyslog.client.single
 - system.prometheus.collector
 - system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
index f3ded54..5b47776 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
@@ -2,6 +2,7 @@
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
+- system.linux.system.single.debian
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
diff --git a/classes/cluster/virtual-mcp-pike-dvr/init.yml b/classes/cluster/virtual-mcp-pike-dvr/init.yml
index d551411..cbf24f0 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/init.yml
@@ -2,6 +2,7 @@
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
+- system.linux.system.single.debian
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
index 965e6c2..eb618fe 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
@@ -5,6 +5,7 @@
 - system.heka.log_collector.output.telegraf
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
+- system.linux.system.single.debian
 - system.rsyslog.client.single
 - system.prometheus.collector
 - system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-pike-ovs/init.yml b/classes/cluster/virtual-mcp-pike-ovs/init.yml
index d08e08f..6d75499 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/init.yml
@@ -2,6 +2,7 @@
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
+- system.linux.system.single.debian
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
index 0dade38..c943066 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
@@ -7,6 +7,7 @@
 - system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
+- system.linux.system.single.debian
 - system.rsyslog.client.single
 - system.prometheus.collector
 - system.telegraf.agent
diff --git a/classes/cluster/virtual-offline-pike-ovs/init.yml b/classes/cluster/virtual-offline-pike-ovs/init.yml
index 959ed0b..32b68e6 100644
--- a/classes/cluster/virtual-offline-pike-ovs/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/init.yml
@@ -8,6 +8,7 @@
 - system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
 - system.rsyslog.client.single
+- system.linux.system.single.debian
 - system.prometheus.collector
 - system.telegraf.agent
 - system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/init.yml
index 1fd9136..02c238c 100644
--- a/classes/cluster/virtual-pike-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/init.yml
@@ -1,6 +1,7 @@
 classes:
 - system.linux.network.dynamic_hosts
 - system.linux.system.single
+- system.linux.system.single.debian
 - cluster.virtual-pike-ovs-dpdk.infra
 - cluster.virtual-pike-ovs-dpdk.openstack
 - system.openssh.server.team.lab