diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index 4c03619..ae000b0 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
index badb177..70d5ee6 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index 536dfff..8608bad 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index eae863f..db1d6ac 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index 7d5acb7..a73a57b 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index 10d54c9..e3b8396 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index f4038a9..5a54ff4 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index 34e1512..7afdd01 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -1,7 +1,7 @@
 classes:
 - service.etcd.server.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - cluster.sl-k8s-calico.kubernetes.compute
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
index cdd5047..8a508c4 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
index 7b1b16a..04d188a 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
@@ -1,7 +1,7 @@
 classes:
 - service.etcd.server.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - cluster.sl-k8s-contrail.kubernetes.compute
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
index 79a552f..6ee687b 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
index 7f42665..c84a223 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index e1325ea..405b75a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 1935ae4..f9bad77 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client