diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
index 07eaa0f..977eea1 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
@@ -2,7 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.pkg
 - system.salt.master.api
@@ -24,11 +24,11 @@
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.openstack_proxy_single
 - system.reclass.storage.system.openstack_gateway_single
-- cluster.virtual-mcp-mitaka-dvr.openstack.proxy
-- cluster.virtual-mcp-mitaka-dvr.stacklight.proxy
 - cluster.virtual-mcp-mitaka-dvr
 parameters:
   _param:
+    linux_system_codename: xenial
+    openstack_linux_system_codename: xenial
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
     reclass_data_revision: master
     salt_master_environment_repository: "https://github.com/tcpcloud"
@@ -140,7 +140,6 @@
           node_class:
             value_template:
               - cluster.<<node_cluster>>.openstack.dashboard
-              - cluster.<<node_cluster>>.openstack.proxy
           cluster_param:
             openstack_proxy_node01_address:
               value_template: <<node_control_ip>>
@@ -150,37 +149,46 @@
           - service.galera.master.cluster
           params:
             mysql_cluster_role: master
-            linux_system_codename: xenial
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_control_node02:
           classes:
           - service.galera.slave.cluster
           params:
             mysql_cluster_role: slave
-            linux_system_codename: xenial
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_control_node03:
           classes:
           - service.galera.slave.cluster
           params:
             mysql_cluster_role: slave
-            linux_system_codename: xenial
-        stacklight_server_node01:
-          classes:
-          - system.influxdb.server.single
-          - system.influxdb.database.stacklight
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_compute_node01:
           params:
             tenant_address: 10.1.0.105
             external_address: 10.16.0.105
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_compute_node02:
           params:
             tenant_address: 10.1.0.106
             external_address: 10.16.0.106
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_gateway_node01:
           params:
             tenant_address: 10.1.0.110
             external_address: 10.16.0.110
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_proxy_node01:
-          classes:
-          - cluster.virtual-mcp-mitaka-dvr.openstack.proxy
           params:
-            linux_system_codename: xenial
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node02:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node03:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
index 9e41e85..d000096 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.linux.network.hosts
@@ -15,7 +15,6 @@
     tenant_interface: ens5
     external_interface: ens6
     interface_mtu: 1500
-    linux_system_codename: xenial
   neutron:
     compute:
       notification:
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
index 1fac8c1..20c3b3d 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
@@ -2,7 +2,7 @@
 - system.linux.system.lowmem
 - system.linux.storage.loopback
 - system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
index 743aa63..6b484c5 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
@@ -1,10 +1,6 @@
 classes:
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
 - system.horizon.server.single
-- cluster.virtual-mcp-mitaka-dvr
+- system.linux.system.repo.saltstack.xenial
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
index d7d93e8..0717926 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.linux.network.interface.single_ovs_dvr
@@ -13,7 +13,6 @@
     interface_mtu: 9000
     neutron_gateway_dvr: True
     neutron_gateway_agent_mode: dvr_snat
-    linux_system_codename: xenial
   neutron:
     gateway:
       notification: