diff --git a/classes/cluster/model-manager/infra/config.yml b/classes/cluster/model-manager/infra/config.yml
index ac19fcc..a92683e 100644
--- a/classes/cluster/model-manager/infra/config.yml
+++ b/classes/cluster/model-manager/infra/config.yml
@@ -3,8 +3,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-aio-contrail/infra/config.yml b/classes/cluster/os-aio-contrail/infra/config.yml
index ebcbe3c..9af72a5 100755
--- a/classes/cluster/os-aio-contrail/infra/config.yml
+++ b/classes/cluster/os-aio-contrail/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-aio-ovs/infra/config.yml b/classes/cluster/os-aio-ovs/infra/config.yml
index 9447401..ae1ccc0 100644
--- a/classes/cluster/os-aio-ovs/infra/config.yml
+++ b/classes/cluster/os-aio-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-contrail-40/infra/config.yml b/classes/cluster/os-ha-contrail-40/infra/config.yml
index dc238d6..6f85651 100644
--- a/classes/cluster/os-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index c3e9ea2..8c39819 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-ovs-ceph/infra/config.yml b/classes/cluster/os-ha-ovs-ceph/infra/config.yml
index a723985..fc1dee1 100644
--- a/classes/cluster/os-ha-ovs-ceph/infra/config.yml
+++ b/classes/cluster/os-ha-ovs-ceph/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-ovs-pike/infra/config.yml b/classes/cluster/os-ha-ovs-pike/infra/config.yml
index a33afeb..5c513da 100644
--- a/classes/cluster/os-ha-ovs-pike/infra/config.yml
+++ b/classes/cluster/os-ha-ovs-pike/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-ovs-syndic/infra/config.yml b/classes/cluster/os-ha-ovs-syndic/infra/config.yml
index 43ee1d7..81145b1 100644
--- a/classes/cluster/os-ha-ovs-syndic/infra/config.yml
+++ b/classes/cluster/os-ha-ovs-syndic/infra/config.yml
@@ -3,8 +3,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-ovs/infra/config.yml b/classes/cluster/os-ha-ovs/infra/config.yml
index a7d91a2..686088f 100644
--- a/classes/cluster/os-ha-ovs/infra/config.yml
+++ b/classes/cluster/os-ha-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/sl-os-contrail/infra/config.yml b/classes/cluster/sl-os-contrail/infra/config.yml
index 79d69bf..158efe7 100755
--- a/classes/cluster/sl-os-contrail/infra/config.yml
+++ b/classes/cluster/sl-os-contrail/infra/config.yml
@@ -7,8 +7,8 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.docker
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/sl-os-ovs/infra/config.yml b/classes/cluster/sl-os-ovs/infra/config.yml
index eac6a06..945673b 100644
--- a/classes/cluster/sl-os-ovs/infra/config.yml
+++ b/classes/cluster/sl-os-ovs/infra/config.yml
@@ -6,8 +6,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.docker
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
index 6235e8f..07eaa0f 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
index 7d0a986..fdd6cdd 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.ubuntu
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml b/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
index aa4c25f..0678b6e 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
index da81d4e..e1492eb 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.ubuntu
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
index 03135b3..f406a42 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo_local.mcp.salt
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index 90e94f8..cbffebb 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
index d9c1364..39f1b33 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo_local.mcp.salt
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
index 434c89e..0467708 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 22dfde8..b56b9ac 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
index fbacd1d..412a79c 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
 - system.reclass.storage.system.ceph_rgw_cluster
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index f5600aa..729d44f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index ebcf19b..4037283 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 #- system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.salt.master.formula.pkg.manila
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
index 5500883..f5c8597 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index f216aa9..0563d54 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 #- system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.salt.master.formula.pkg.manila
 - system.salt.master.formula.pkg.gnocchi
 - system.salt.master.formula.pkg.panko
diff --git a/classes/cluster/virtual-mcp05-dvr/infra/config.yml b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
index ed92a36..d8db7de 100644
--- a/classes/cluster/virtual-mcp05-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.tcp_salt
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp05-ovs/infra/config.yml b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
index 6e8be81..7882e02 100644
--- a/classes/cluster/virtual-mcp05-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.tcp_salt
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp10-contrail/infra/config.yml b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
index 64fb0a1..f51a706 100755
--- a/classes/cluster/virtual-mcp10-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
@@ -3,8 +3,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp10-dvr/infra/config.yml b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
index 3eaadc9..8b0c481 100644
--- a/classes/cluster/virtual-mcp10-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
@@ -3,8 +3,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp10-ovs/infra/config.yml b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
index dc77ca6..6ea73b6 100644
--- a/classes/cluster/virtual-mcp10-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
@@ -3,8 +3,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index 8a2b105..dfbfc10 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -4,8 +4,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
index ed9bbf6..2199faa 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index 4853abd..580d993 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/config.yml b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
index ad68abd..92da150 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
index c1528b4..0211bf4 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
index ad9a18f..3cf494d 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.salt.master.formula.pkg.baremetal
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index f62dd25..be7adff 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.salt.master.formula.pkg.baremetal
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index 237db95..16e21f2 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index 4224974..cd33c53 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo_local.mcp.salt
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 #- system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
index 18389dc..eb0da09 100644
--- a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo_local.mcp.salt
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
index 4c55eee..25baf27 100644
--- a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy