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}