diff --git a/classes/cluster/virtual-mcp11-aio-barbican/infra/init.yml b/classes/cluster/virtual-mcp11-aio-barbican/infra/init.yml
deleted file mode 100644
index 219ed8d..0000000
--- a/classes/cluster/virtual-mcp11-aio-barbican/infra/init.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
-  - cluster.virtual-mcp11-aio.infra
diff --git a/classes/cluster/virtual-mcp11-aio-barbican/init.yml b/classes/cluster/virtual-mcp11-aio-barbican/init.yml
index b1cb0a4..abcf7f0 100755
--- a/classes/cluster/virtual-mcp11-aio-barbican/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-barbican/init.yml
@@ -1,5 +1,4 @@
 classes:
-- cluster.virtual-mcp11-aio-barbican.infra
 - cluster.virtual-mcp11-aio-barbican.openstack
 - cluster.virtual-mcp11-aio
 - cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml
deleted file mode 100644
index 219ed8d..0000000
--- a/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
-  - cluster.virtual-mcp11-aio.infra
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/init.yml
index 448fe80..56513f8 100755
--- a/classes/cluster/virtual-mcp11-aio-ironic/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ironic/init.yml
@@ -1,5 +1,4 @@
 classes:
 - cluster.virtual-mcp11-aio
-- cluster.virtual-mcp11-aio-ironic.infra
 - cluster.virtual-mcp11-aio-ironic.openstack
 - cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
index 0390924..b4ef9c4 100755
--- a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
@@ -43,7 +43,7 @@
       bind:
         address: 0.0.0.0
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       database:
@@ -53,7 +53,7 @@
       api_url: http://${_param:single_baremetal_address}:6385
       http_url: http://${_param:single_baremetal_address}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       database:
diff --git a/classes/cluster/virtual-mcp11-aio-manila/infra/init.yml b/classes/cluster/virtual-mcp11-aio-manila/infra/init.yml
deleted file mode 100644
index 219ed8d..0000000
--- a/classes/cluster/virtual-mcp11-aio-manila/infra/init.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
-  - cluster.virtual-mcp11-aio.infra
diff --git a/classes/cluster/virtual-mcp11-aio-manila/init.yml b/classes/cluster/virtual-mcp11-aio-manila/init.yml
index 0d382b8..a810cc7 100755
--- a/classes/cluster/virtual-mcp11-aio-manila/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-manila/init.yml
@@ -1,5 +1,4 @@
 classes:
-- cluster.virtual-mcp11-aio-manila.infra
 - cluster.virtual-mcp11-aio-manila.openstack
 - cluster.virtual-mcp11-aio
 - cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-aio-octavia/infra/init.yml b/classes/cluster/virtual-mcp11-aio-octavia/infra/init.yml
deleted file mode 100644
index 41f5c0b..0000000
--- a/classes/cluster/virtual-mcp11-aio-octavia/infra/init.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
-  - cluster.virtual-mcp11-aio.infra
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio-octavia/init.yml b/classes/cluster/virtual-mcp11-aio-octavia/init.yml
index 55f3bd4..5be1752 100755
--- a/classes/cluster/virtual-mcp11-aio-octavia/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-octavia/init.yml
@@ -1,5 +1,4 @@
 classes:
-- cluster.virtual-mcp11-aio-octavia.infra
 - cluster.virtual-mcp11-aio-octavia.openstack
 - cluster.virtual-mcp11-aio-octavia.openstack.octavia_manager
 - cluster.virtual-mcp11-aio
diff --git a/classes/cluster/virtual-mcp11-aio-ssl/infra/config.yml b/classes/cluster/virtual-mcp11-aio-ssl/infra/config.yml
index 0927924..703458c 100644
--- a/classes/cluster/virtual-mcp11-aio-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio-ssl/infra/config.yml
@@ -1,3 +1,18 @@
 classes:
   - cluster.virtual-mcp11-aio-ssl
   - cluster.virtual-mcp11-aio.infra.config
+parameters:
+  _param:
+    salt_minion_ca_host: cfg01.${linux:system:domain}
+  salt:
+    minion:
+      cert:
+        internal_proxy:
+          host: ${_param:salt_minion_ca_host}
+          authority: ${_param:salt_minion_ca_authority}
+          common_name: internal_proxy
+          signing_policy: cert_open
+          alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_public_host},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_local_address},DNS:${_param:cluster_public_host}
+          key_file: "/etc/ssl/private/internal_proxy.key"
+          cert_file: "/etc/ssl/certs/internal_proxy.crt"
+          all_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
diff --git a/classes/cluster/virtual-mcp11-aio-ssl/infra/init.yml b/classes/cluster/virtual-mcp11-aio-ssl/infra/init.yml
deleted file mode 100644
index 325f046..0000000
--- a/classes/cluster/virtual-mcp11-aio-ssl/infra/init.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-classes:
- - cluster.virtual-mcp11-aio.infra
-parameters:
-  _param:
-    salt_minion_ca_host: cfg01.${linux:system:domain}
-  salt:
-   minion:
-      cert:
-        internal_proxy:
-          host: ${_param:salt_minion_ca_host}
-          authority: ${_param:salt_minion_ca_authority}
-          common_name: internal_proxy
-          signing_policy: cert_open
-          alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_public_host},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_local_address},DNS:${_param:cluster_public_host}
-          key_file: "/etc/ssl/private/internal_proxy.key"
-          cert_file: "/etc/ssl/certs/internal_proxy.crt"
-          all_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
diff --git a/classes/cluster/virtual-mcp11-aio-ssl/init.yml b/classes/cluster/virtual-mcp11-aio-ssl/init.yml
index 4000410..3c33799 100755
--- a/classes/cluster/virtual-mcp11-aio-ssl/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ssl/init.yml
@@ -1,5 +1,4 @@
 classes:
-- cluster.virtual-mcp11-aio-ssl.infra
 - cluster.virtual-mcp11-aio-ssl.openstack
 - cluster.virtual-mcp11-aio
 - cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
index 485d00a..2057e56 100755
--- a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
@@ -80,7 +80,7 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
   ceilometer:
@@ -88,7 +88,7 @@
       role: ${_param:openstack_node_role}
       region: ${_param:openstack_region}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       notification:
diff --git a/classes/cluster/virtual-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml
index bd56cd6..fc68b03 100644
--- a/classes/cluster/virtual-mcp11-aio/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -3,6 +3,8 @@
 parameters:
   _param:
     linux_system_codename: xenial
+    apt_mk_version: testing
+    linux_system_purge_repos: false
   linux:
     system:
       name: cfg01
@@ -13,5 +15,8 @@
       pkgs:
        - salt-api
        - python-cherrypy3
+    minion:
+      trusted_ca_minions:
+        -  cfg01.${_param:cluster_domain}
     master:
       worker_threads: 5
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio/infra/init.yml b/classes/cluster/virtual-mcp11-aio/infra/init.yml
deleted file mode 100644
index c74a1ac..0000000
--- a/classes/cluster/virtual-mcp11-aio/infra/init.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-parameters:
-  _param:
-    apt_mk_version: testing
-    linux_system_purge_repos: false
-  salt:
-   minion:
-      trusted_ca_minions:
-        -  cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index 3ea1465..2f3df0f 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -13,7 +13,6 @@
 - system.mysql.client
 - system.memcached.server.single
 - system.rabbitmq.server.single
-- cluster.virtual-mcp11-aio.infra
 - cluster.virtual-mcp11-aio.openstack
 - system.auditd.server.ciscat
 - system.openscap.server
@@ -52,15 +51,6 @@
           enabled: true
           # r00tme
           password: $6$9ojWyyN.$26Vj46JtCUL6C7XBQ8RmQTZLwo8/8SkqTRElXh0X2YBLrt7E/aVe2AYQ5gguYUwUknZNOSn5q7M9M3Jyf2gof/
-      repo:
-        linux_system_repo:
-          source: ${_param:linux_system_repo}
-          architectures: amd64
-          clean_file: true
-          pin:
-          - pin: ${_param:linux_system_repo_pin}
-            priority: ${_param:linux_system_repo_priority}
-            package: '*'
     network:
       bridge: openvswitch
       interface:
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 885d53e..6356065 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -1,8 +1,9 @@
 classes:
+- system.defaults
 - system.salt.minion.cert.mysql.server
 - system.salt.minion.cert.rabbitmq_server
 - system.linux.system.lowmem
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.mirror.v1.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.storage.loopback
 - service.rabbitmq.server.ssl
@@ -116,16 +117,13 @@
       rndc_key_file: /etc/designate/rndc.key
     designate_quota_zones: 40
     designate_worker_enabled: true
-    linux_system_repo: deb [arch=amd64] http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/xenial ${_param:openstack_version} main
-    linux_system_repo_pin: release a=${_param:openstack_version}
-    linux_system_repo_priority: 1200
     openstack_public_neutron_subnet_gateway:  192.168.130.1
     openstack_public_neutron_subnet_cidr: 192.168.130.0/24
     openstack_public_neutron_subnet_allocation_start: 192.168.130.10
     openstack_public_neutron_subnet_allocation_end: 192.168.130.254
     galera_ssl_enabled: true
     rabbitmq_ssl_enabled: false # untill rabbitmq formula with https://gerrit.mcp.mirantis.net/#/c/15198/ promoted to stable
-    rabbitmq_port: 5672 # for non-ssl use 5672/for ssl 5671
+    openstack_rabbitmq_port: 5672 # for non-ssl use 5672/for ssl 5671
     runtest_tempest_cfg_dir: /root/rally_reports/
     runtest_tempest_cfg_name: tempest_generated.conf
     runtest_tempest_log_file: /home/rally/rally_reports/tempest.log
@@ -135,6 +133,7 @@
     openstack_log_appender: true
     openstack_fluentd_handler_enabled: true
     openstack_ossyslog_handler_enabled: true
+    openstack_memcache_security_enabled: false
   galera:
     master:
       members: ~
@@ -161,7 +160,7 @@
       rpc_workers: 2
       message_queue:
         members: ~
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       database:
@@ -173,7 +172,7 @@
       agent_mode: dvr_snat
       dvr: True
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
   nova:
@@ -186,7 +185,7 @@
       cache:
         members: ~
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       # Since in AIO by default option config_drive is false,
@@ -201,7 +200,7 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
   cinder:
@@ -210,7 +209,7 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
     volume:
@@ -220,7 +219,7 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
   horizon:
@@ -238,7 +237,7 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
     worker:
@@ -251,7 +250,7 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
   keystone:
@@ -260,7 +259,7 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
     client:
@@ -275,6 +274,6 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/classes/system b/classes/system
index 03bd042..141c460 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 03bd042f2ef4fb0e9cd86663494445dcabe96120
+Subproject commit 141c4605aa229fa60ce49de73d4419eafc3df6a1