diff --git a/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
new file mode 100644
index 0000000..bf5b5b9
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
@@ -0,0 +1,22 @@
+parameters:
+  _param:
+    mirror_mirantis_com_ceph_luminous_xenial_force: False
+    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+  debmirror:
+    client:
+      enabled: true
+      mirrors:
+        mirror_mirantis_com_ceph_luminous_xenial:
+          force: ${_param:mirror_mirantis_com_ceph_luminous_xenial_force}
+          lock_target: True
+          extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+          method: "rsync"
+          arch: [ 'amd64' ]
+          mirror_host: "mirror.mirantis.com"
+          mirror_root: ":mirror/${_param:apt_mk_version}/ceph-luminous/xenial/"
+          target_dir: "${_param:debmirror_mirrors_base_target_dir}/ceph-luminous/xenial/"
+          log_file: "/var/log/debmirror/mirror_mirantis_com_ceph_luminous_xenial.log"
+          dist: [ xenial ]
+          section: [ main ]
+          filter:
+            001: "--exclude='(-dbg_|-dbg-)'"
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/docker/xenial.yml b/debmirror/mirror_mirantis_com/docker/xenial.yml
new file mode 100644
index 0000000..1ed38a9
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/docker/xenial.yml
@@ -0,0 +1,26 @@
+parameters:
+  _param:
+    mirror_mirantis_com_docker_xenial_force: False
+    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+  debmirror:
+    client:
+      enabled: true
+      mirrors:
+        mirror_mirantis_com_docker_xenial:
+          force: ${_param:mirror_mirantis_com_docker_xenial_force}
+          lock_target: True
+          extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+          method: "rsync"
+          arch: [ 'amd64' ]
+          mirror_host: "mirror.mirantis.com"
+          mirror_root: ":mirror/${_param:apt_mk_version}/docker/xenial/"
+          target_dir: "${_param:debmirror_mirrors_base_target_dir}/docker/xenial/"
+          log_file: "/var/log/debmirror/mirror_mirantis_com_docker_xenial.log"
+          dist: [ xenial ]
+          section: [ stable ]
+          filter:
+            # Include only latest Docker packages >= 18.06 && >= 17.12
+            001: "--exclude='docker-ce'"
+            002: "--include='docker-ce_18.((0[6-9])|([1-9][0-9]))'"
+            003: "--include='docker-ce_17.((1[2-9])|([2-9][0-9]))'"
+            003: "--include='docker-ce_((19)|([2-9][0-9]))'"
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/extra/xenial.yml b/debmirror/mirror_mirantis_com/extra/xenial.yml
new file mode 100644
index 0000000..892abd4
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/extra/xenial.yml
@@ -0,0 +1,20 @@
+parameters:
+  _param:
+    mirror_mirantis_com_extra_xenial_force: False
+    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+  debmirror:
+    client:
+      enabled: true
+      mirrors:
+        mirror_mirantis_com_extra_xenial:
+          force: ${_param:mirror_mirantis_com_extra_xenial_force}
+          lock_target: True
+          extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+          method: "rsync"
+          arch: [ 'amd64' ]
+          mirror_host: "mirror.mirantis.com"
+          mirror_root: ":mirror/${_param:apt_mk_version}/extra/xenial/"
+          target_dir: "${_param:debmirror_mirrors_base_target_dir}/extra/xenial/"
+          log_file: "/var/log/debmirror/mirror_mirantis_com_extra_xenial.log"
+          dist: [ xenial ]
+          section: [ main ]
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
new file mode 100644
index 0000000..3e6dca0
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
@@ -0,0 +1,20 @@
+parameters:
+  _param:
+    mirror_mirantis_com_openstack_pike_xenial_force: False
+    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+  debmirror:
+    client:
+      enabled: true
+      mirrors:
+        mirror_mirantis_com_openstack_pike_xenial:
+          force: ${_param:mirror_mirantis_com_openstack_pike_xenial_force}
+          lock_target: True
+          extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+          method: "rsync"
+          arch: [ 'amd64' ]
+          mirror_host: "mirror.mirantis.com"
+          mirror_root: ":mirror/${_param:apt_mk_version}/openstack-pike/xenial/"
+          target_dir: "${_param:debmirror_mirrors_base_target_dir}/openstack-pike/xenial/"
+          log_file: "/var/log/debmirror/mirror_mirantis_com_openstack_pike_xenial.log"
+          dist: [ xenial ]
+          section: [ main ]
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
new file mode 100644
index 0000000..99dec3b
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
@@ -0,0 +1,20 @@
+parameters:
+  _param:
+    mirror_mirantis_com_openstack_queens_xenial_force: False
+    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+  debmirror:
+    client:
+      enabled: true
+      mirrors:
+        mirror_mirantis_com_openstack_queens_xenial:
+          force: ${_param:mirror_mirantis_com_openstack_queens_xenial_force}
+          lock_target: True
+          extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+          method: "rsync"
+          arch: [ 'amd64' ]
+          mirror_host: "mirror.mirantis.com"
+          mirror_root: ":mirror/${_param:apt_mk_version}/openstack-queens/xenial/"
+          target_dir: "${_param:debmirror_mirrors_base_target_dir}/openstack-queens/xenial/"
+          log_file: "/var/log/debmirror/mirror_mirantis_com_openstack_queens_xenial.log"
+          dist: [ xenial ]
+          section: [ main ]
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/td-agent/xenial.yml b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
new file mode 100644
index 0000000..d141967
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
@@ -0,0 +1,20 @@
+parameters:
+  _param:
+    mirror_mirantis_com_td_agent_xenial_force: False
+    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+  debmirror:
+    client:
+      enabled: true
+      mirrors:
+        mirror_mirantis_com_td_agent_xenial:
+          force: ${_param:mirror_mirantis_com_td_agent_xenial_force}
+          lock_target: True
+          td_agent_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-td_agent=none' ]
+          method: "rsync"
+          arch: [ 'amd64' ]
+          mirror_host: "mirror.mirantis.com"
+          mirror_root: ":mirror/${_param:apt_mk_version}/td-agent/xenial/"
+          target_dir: "${_param:debmirror_mirrors_base_target_dir}/td-agent/xenial/"
+          log_file: "/var/log/debmirror/mirror_mirantis_com_td_agent_xenial.log"
+          dist: [ xenial ]
+          section: [ contrib ]
\ No newline at end of file
diff --git a/defaults/init.yml b/defaults/init.yml
index 1d4eafd..f17e399 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -1,5 +1,11 @@
+classes:
+- system.defaults.linux_system_repo
 parameters:
 # Transition in progress.
 # Please ignore 'G' transition marker - it uses only for internal purposes
   _param:
-    apt_mk_version: 'stable'
+    apt_mk_version: "stable"
+    linux_system_architecture: 'amd64'
+    linux_system_repo_url: "http://mirror.mirantis.com/${_param:apt_mk_version}/"
+    # Openstack
+    openstack_version: 'pike'
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
new file mode 100644
index 0000000..0b3d197
--- /dev/null
+++ b/defaults/linux_system_repo.yml
@@ -0,0 +1,36 @@
+parameters:
+  _param:
+    # Global
+    linux_repo_refresh_db: true
+    linux_system_repo_url: "http://mirror.mirantis.com/${_param:apt_mk_version}/"
+    # Global-updates
+    linux_system_repo_update_url: http://mirror.mirantis.com/update/${_param:apt_mk_version}/
+    linux_system_repo_update_ubuntu_url: ${_param:linux_system_repo_update_url}/ubuntu/
+    # Global-hotfix
+    linux_system_repo_hotfix_url: http://mirror.mirantis.com/hotfix/${_param:apt_mk_version}/
+    linux_system_repo_hotfix_ubuntu_url: ${_param:linux_system_repo_hotfix_url}/ubuntu/
+
+    # Per repos
+    linux_system_repo_mcp_aptly_url: ${_param:linux_system_repo_url}/aptly/
+    linux_system_repo_mcp_cassandra_url: ${_param:linux_system_repo_url}/cassandra/
+    linux_system_repo_mcp_docker_legacy_url: ${_param:linux_system_repo_url}/docker-1.x/
+    linux_system_repo_mcp_docker_url: ${_param:linux_system_repo_url}/docker/
+    linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
+    linux_system_repo_mcp_elasticsearch_url: ${_param:linux_system_repo_url}/elasticsearch-5.x/
+    linux_system_repo_mcp_extra_url: ${_param:linux_system_repo_url}/extra/
+    linux_system_repo_mcp_glusterfs_url: ${_param:linux_system_repo_url}/glusterfs-${_param:linux_system_repo_mcp_glusterfs_version_number}/
+    linux_system_repo_mcp_influxdb_url: ${_param:linux_system_repo_url}/influxdb
+    linux_system_repo_mcp_jenkins_url: ${_param:linux_system_repo_url}/jenkins/
+    linux_system_repo_mcp_maas_url: ${_param:linux_system_repo_url}/maas/
+    linux_system_repo_mcp_percona_url: ${_param:linux_system_repo_url}/percona/
+    linux_system_repo_mcp_saltstack_url: ${_param:linux_system_repo_url}/saltstack-${_param:linux_system_repo_mcp_saltstack_version_number}/
+    linux_system_repo_mirantis_openstack_url: ${_param:linux_system_repo_url}/openstack-${_param:openstack_version}/
+    linux_system_repo_ubuntu_url: ${_param:linux_system_repo_url}/ubuntu/
+
+
+    # Repo-component versions (if applicable)
+    salt_version: 2017.7 # TODO should be deprecated after q4
+    linux_system_repo_mcp_cassandra_version: '21x'
+    linux_system_repo_mcp_glusterfs_version_number: "3.8"
+    linux_system_repo_mcp_saltstack_version_number: "${_param:salt_version}"
+    linux_system_repo_mcp_ceph_codename: 'luminous'
diff --git a/etcd/server/cluster.yml b/etcd/server/cluster.yml
new file mode 100644
index 0000000..459d492
--- /dev/null
+++ b/etcd/server/cluster.yml
@@ -0,0 +1,13 @@
+classes:
+- service.etcd.server.cluster
+- service.etcd.support
+- service.etcd.linux
+parameters:
+  _param:
+    docker_image_etcd: quay.io/coreos/etcd:v3.3.8
+  etcd:
+    server:
+      enabled: true
+      image: ${_param:docker_image_etcd}
+      bind:
+        host: ${_param:cluster_local_address}
\ No newline at end of file
diff --git a/horizon/server/plugin/octavia.yml b/horizon/server/plugin/octavia.yml
index 2dd5c69..576fd5b 100644
--- a/horizon/server/plugin/octavia.yml
+++ b/horizon/server/plugin/octavia.yml
@@ -6,4 +6,9 @@
           source:
             engine: pkg
             name: python-octavia-dashboard
+      policy:
+        octavia:
+          enabled: true
+          name: octavia_policy.json
+          source: file
 
diff --git a/linux/system/repo/mcp/apt_mirantis/aptly.yml b/linux/system/repo/mcp/apt_mirantis/aptly.yml
index 8cbccda..e06597c 100644
--- a/linux/system/repo/mcp/apt_mirantis/aptly.yml
+++ b/linux/system/repo/mcp/apt_mirantis/aptly.yml
@@ -1,9 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.aptly
 parameters:
-  _param:
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_aptly_url: ${_param:linux_system_repo_url}/aptly/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/cassandra.yml b/linux/system/repo/mcp/apt_mirantis/cassandra.yml
index 29684e2..9b651fa 100644
--- a/linux/system/repo/mcp/apt_mirantis/cassandra.yml
+++ b/linux/system/repo/mcp/apt_mirantis/cassandra.yml
@@ -1,10 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.cassandra
 parameters:
-  _param:
-    linux_system_repo_mcp_cassandra_version: '21x'
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_cassandra_url: ${_param:linux_system_repo_url}/cassandra/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/docker.yml b/linux/system/repo/mcp/apt_mirantis/docker.yml
index fe9f5db..82411c5 100644
--- a/linux/system/repo/mcp/apt_mirantis/docker.yml
+++ b/linux/system/repo/mcp/apt_mirantis/docker.yml
@@ -1,9 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.docker
 parameters:
-  _param:
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_docker_url: ${_param:linux_system_repo_url}/docker/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml b/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
index 045b8c7..acb0a5c 100644
--- a/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
+++ b/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
@@ -1,9 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.docker_legacy
 parameters:
-  _param:
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_docker_legacy_url: ${_param:linux_system_repo_url}/docker-1.x/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/es.yml b/linux/system/repo/mcp/apt_mirantis/elastic/es.yml
index 1767112..c0d75d8 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/es.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/es.yml
@@ -1,9 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.elasticsearch
 parameters:
-  _param:
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_elasticsearch_url: ${_param:linux_system_repo_url}/elasticsearch-5.x/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/es_curator.yml b/linux/system/repo/mcp/apt_mirantis/elastic/es_curator.yml
index ac049d9..4d1ce8c 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/es_curator.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/es_curator.yml
@@ -1,9 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.elasticsearch
 parameters:
-  _param:
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/extra.yml b/linux/system/repo/mcp/apt_mirantis/extra.yml
index 5523f55..94c1d14 100644
--- a/linux/system/repo/mcp/apt_mirantis/extra.yml
+++ b/linux/system/repo/mcp/apt_mirantis/extra.yml
@@ -1,10 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.mirantis_com
 parameters:
-  _param:
-    linux_system_architecture: 'amd64'
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_extra_url: ${_param:linux_system_repo_url}/extra/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/glusterfs.yml b/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
index c97d903..1bb025f 100644
--- a/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
+++ b/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
@@ -1,10 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.glusterfs
 parameters:
-  _param:
-    linux_system_repo_mcp_glusterfs_version_number: "3.8"
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_glusterfs_url: ${_param:linux_system_repo_url}/glusterfs-${_param:linux_system_repo_mcp_glusterfs_version_number}/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/ubuntu.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/ubuntu.yml
index 77d5202..fb5ad73 100644
--- a/linux/system/repo/mcp/apt_mirantis/hotfix/ubuntu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/ubuntu.yml
@@ -1,22 +1,19 @@
 parameters:
-  _param:
-    linux_system_repo_hotfix_url: http://mirror.mirantis.com/hotfix/${_param:apt_mk_version}/
-    linux_system_repo_hotfix_ubuntu_url: ${_param:linux_system_repo_hotfix_url}/ubuntu/
   linux:
     system:
       repo:
 #        ubuntu_hotfix:
 #          refresh_db: ${_param:linux_repo_refresh_db}
 #          source: "deb [arch=amd64] ${_param:linux_system_repo_hotfix_ubuntu_url} ${_param:linux_system_codename} main restricted universe"
-#          architectures: amd64
+#          architectures: ${_param:linux_system_architecture
 #          default: true
 #        ubuntu_updates_hotfix:
 #          refresh_db: ${_param:linux_repo_refresh_db}
 #          source: "deb [arch=amd64] ${_param:linux_system_repo_hotfix_ubuntu_url} ${_param:linux_system_codename}-updates main restricted universe"
-#          architectures: amd64
+#          architectures: ${_param:linux_system_architecture
 #          default: true
         ubuntu_security_hotfix:
           refresh_db: ${_param:linux_repo_refresh_db}
           source: "deb [arch=amd64] ${_param:linux_system_repo_hotfix_ubuntu_url} ${_param:linux_system_codename}-security main restricted universe"
-          architectures: amd64
+          architectures: ${_param:linux_system_architecture}
           default: true
diff --git a/linux/system/repo/mcp/apt_mirantis/influxdb.yml b/linux/system/repo/mcp/apt_mirantis/influxdb.yml
index 610b6b7..b86d461 100644
--- a/linux/system/repo/mcp/apt_mirantis/influxdb.yml
+++ b/linux/system/repo/mcp/apt_mirantis/influxdb.yml
@@ -1,9 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.influxdb
 parameters:
-  _param:
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_influxdb_url: ${_param:linux_system_repo_url}/influxdb/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/jenkins.yml b/linux/system/repo/mcp/apt_mirantis/jenkins.yml
index 7e4a6a9..55cebad 100644
--- a/linux/system/repo/mcp/apt_mirantis/jenkins.yml
+++ b/linux/system/repo/mcp/apt_mirantis/jenkins.yml
@@ -1,9 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.jenkins
 parameters:
-  _param:
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_jenkins_url: ${_param:linux_system_repo_url}/jenkins/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/maas.yml b/linux/system/repo/mcp/apt_mirantis/maas.yml
index 3a533b0..228eec4 100644
--- a/linux/system/repo/mcp/apt_mirantis/maas.yml
+++ b/linux/system/repo/mcp/apt_mirantis/maas.yml
@@ -1,9 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.maas
 parameters:
-  _param:
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_maas_url: ${_param:linux_system_repo_url}/maas/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/percona.yml b/linux/system/repo/mcp/apt_mirantis/percona.yml
index f6377ea..457cc43 100644
--- a/linux/system/repo/mcp/apt_mirantis/percona.yml
+++ b/linux/system/repo/mcp/apt_mirantis/percona.yml
@@ -1,9 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.percona
 parameters:
-  _param:
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_percona_url: ${_param:linux_system_repo_url}/percona/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/saltstack.yml b/linux/system/repo/mcp/apt_mirantis/saltstack.yml
index 7e18c2e..2d4dd2c 100644
--- a/linux/system/repo/mcp/apt_mirantis/saltstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/saltstack.yml
@@ -1,17 +1,13 @@
 classes:
 - system.linux.system.repo.keystorage.saltstack
 parameters:
-  _param:
-    salt_version: 2017.7
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mcp_saltstack_url: ${_param:linux_system_repo_url}/saltstack-${_param:salt_version}/
   linux:
     system:
       repo:
         mcp_saltstack:
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_saltstack_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
           key: ${_param:linux_system_repo_mcp_saltstack_key}
-          architectures: amd64
+          architectures: ${_param:linux_system_architecture}
           clean_file: true
           pinning:
             10:
diff --git a/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml b/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
index 978d9a4..3445cf6 100644
--- a/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
+++ b/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
@@ -6,4 +6,4 @@
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 parameters:
   _param:
-    salt_version: 2016.3
+    linux_system_repo_mcp_saltstack_version_number: 2016.3
diff --git a/linux/system/repo/mcp/apt_mirantis/ubuntu.yml b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
index 1a1d5f1..15dabab 100644
--- a/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
@@ -1,10 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.ubuntu
 parameters:
-  _param:
-    linux_repo_refresh_db: true
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_ubuntu_url: ${_param:linux_system_repo_url}/ubuntu/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/update/ubuntu.yml b/linux/system/repo/mcp/apt_mirantis/update/ubuntu.yml
index d58ff85..07e95da 100644
--- a/linux/system/repo/mcp/apt_mirantis/update/ubuntu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/update/ubuntu.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    linux_system_repo_update_url: http://mirror.mirantis.com/update/${_param:apt_mk_version}/
-    linux_system_repo_update_ubuntu_url: ${_param:linux_system_repo_update_url}/ubuntu/
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml
index 66a5530..8a9a3a7 100644
--- a/linux/system/repo/mcp/mirror/v1/openstack.yml
+++ b/linux/system/repo/mcp/mirror/v1/openstack.yml
@@ -1,10 +1,6 @@
 classes:
 - system.linux.system.repo.keystorage.mirantis_com
 parameters:
-  _param:
-    linux_system_architecture: 'amd64'
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
-    linux_system_repo_mirantis_openstack_url: ${_param:linux_system_repo_url}/openstack-${_param:openstack_version}/
   linux:
     system:
       repo:
diff --git a/maas/region/cluster.yml b/maas/region/cluster.yml
index ff6dac5..3ec995b 100644
--- a/maas/region/cluster.yml
+++ b/maas/region/cluster.yml
@@ -5,7 +5,6 @@
 parameters:
   _param:
     cluster_vip_address: 10.0.175.80
-    linux_system_repo_mcp_saltstack_url: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2017.7/
   maas:
     cluster:
       enabled: true
diff --git a/opencontrail/compute/cluster.yml b/opencontrail/compute/cluster.yml
index 5e92709..7cdcdf6 100644
--- a/opencontrail/compute/cluster.yml
+++ b/opencontrail/compute/cluster.yml
@@ -33,6 +33,3 @@
         mask: ${_param:opencontrail_compute_iface_mask}
         dns: ${_param:opencontrail_compute_dns}
         mtu: 9000
-  nova:
-    compute:
-      networking: contrail
diff --git a/opencontrail/compute/cluster4_0.yml b/opencontrail/compute/cluster4_0.yml
index 8c16c70..425f897 100644
--- a/opencontrail/compute/cluster4_0.yml
+++ b/opencontrail/compute/cluster4_0.yml
@@ -48,6 +48,3 @@
         mask: ${_param:opencontrail_compute_iface_mask}
         dns: ${_param:opencontrail_compute_dns}
         mtu: 9000
-  nova:
-    compute:
-      networking: contrail
diff --git a/opencontrail/compute/single.yml b/opencontrail/compute/single.yml
index d3caa45..65426c8 100644
--- a/opencontrail/compute/single.yml
+++ b/opencontrail/compute/single.yml
@@ -30,7 +30,6 @@
         mtu: 9000
   nova:
     compute:
-      networking: contrail
       network:
         engine: keystone
         host: ${_param:control_address}
diff --git a/opencontrail/compute/single4_0.yml b/opencontrail/compute/single4_0.yml
index bd77c05..b48d1d0 100644
--- a/opencontrail/compute/single4_0.yml
+++ b/opencontrail/compute/single4_0.yml
@@ -38,7 +38,4 @@
         mask: ${_param:opencontrail_compute_iface_mask}
         dns: ${_param:opencontrail_compute_dns}
         mtu: 9000
-  nova:
-    compute:
-      networking: contrail
 
diff --git a/openssh/server/team/k8s_apps_team.yml b/openssh/server/team/k8s_apps_team.yml
index 496ce86..de1ca26 100644
--- a/openssh/server/team/k8s_apps_team.yml
+++ b/openssh/server/team/k8s_apps_team.yml
@@ -1,88 +1,11 @@
+classes:
+- system.openssh.server.team.members.apavlov
+- system.openssh.server.team.members.slukjanov
+- system.openssh.server.team.members.sreshetnyak
+- system.openssh.server.team.members.ytaraday
+# Deprecated users
+- system.openssh.server.team.members.deprecated.mzhnichkov
+
 parameters:
   _param:
     linux_system_user_sudo: true
-  linux:
-    system:
-      user:
-        apavlov:
-          enabled: true
-          name: apavlov
-          sudo: true
-          full_name: Andrey Pavlov
-          home: /home/apavlov
-          email: apavlov@mirantis.com
-        mzhnichkov:
-          enabled: true
-          name: mzhnichkov
-          sudo: true
-          full_name: Michail Zhnichkov
-          home: /home/mzhnichkov
-          email: mzhnichkov@mirantis.com
-        slukjanov:
-          enabled: true
-          name: slukjanov
-          sudo: true
-          full_name: Sergey Lukjanov
-          home: /home/slukjanov
-          email: slukjanov@mirantis.com
-        sreshetnyak:
-          enabled: true
-          name: sreshetnyak
-          sudo: true
-          full_name: Sergey Reshetnyak
-          home: /home/sreshetnyak
-          email: sreshetnyak@mirantis.com
-        ytaraday:
-          enabled: true
-          name: ytaraday
-          sudo: true
-          full_name: Yuriy Taraday
-          home: /home/ytaraday
-          email: ytaraday@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        apavlov:
-          enabled: true
-          public_keys:
-          - ${public_keys:apavlov}
-          user: ${linux:system:user:apavlov}
-        mzhnichkov:
-          enabled: true
-          public_keys:
-          - ${public_keys:mzhnichkov}
-          user: ${linux:system:user:mzhnichkov}
-        prazumovsky:
-          enabled: true
-          public_keys:
-          - ${public_keys:prazumovsky}
-          user: ${linux:system:user:prazumovsky}
-        slukjanov:
-          enabled: true
-          public_keys:
-          - ${public_keys:slukjanov}
-          user: ${linux:system:user:slukjanov}
-        sreshetnyak:
-          enabled: true
-          public_keys:
-          - ${public_keys:sreshetnyak}
-          user: ${linux:system:user:sreshetnyak}
-        ytaraday:
-          enabled: true
-          public_keys:
-          - ${public_keys:ytaraday}
-          user: ${linux:system:user:ytaraday}
-  public_keys:
-    apavlov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC13FvtJl6OdwdiaLFYfJO5WaA7YUMi2/DJJECWtrjJPObGPeAQ1Z8zxQWanwZVhDO7E5oR7n/LmuKHaJkRIFyQEZY3mHS3k4yybg0Vqu2FcGWQO4P3R16v6qDLvuvu9S4sUkYF3k8oYDzwN/Vc+o7a4AkL5U5rjB3vbLWVdGg8G61jFjdekXbJdFCb0liPpcQrUe1yZmjE2E4ERPOZLCVADPiVzXJhtbKigbn/nwdk4D0g+eq3NW0AwJfkyCu6mt1xXfk6gmhUrBPh1ostWv6mSpD9bXvxIKv/QnIM4SUJ/RhJH0uhWtpH4GeXvnPXHs0bxfyq1GtQt5bD3gqCHruz apavlov@Andreys-MacBook-Pro.local
-    prazumovsky:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMGi+I02wfKwHqKoTahRJg3TWX9SaYjKBRKndmVfz4J9kptuQEsVbJGiBIxOKV4unFvBSgVDVgZ4rUwwkL2nMrdATAWiBeVcgaNTt4kVBxD21wAeFWi0kTgrJ403jqOqH/WIKA6lnGUCmdRxp3phcjHRlgw/ZOnFu6AuZqtO1Luxg/9PawOFcoCjWWDolp/ICSHBhGZuDWThvTSgVQTd10oMP55LMjuxSOdvM1ZjWczyxegKD7lt7j+FjQXHzGUyqcCH/NlXl4VHdjaNG2muP0lY+QRiRMye3qftu15qgRxqQtL1QksBspDP2TvVVTwE7c0m7VtKaQtnmlsJGUx/7H prazumovsky@shprotby-box
-    mzhnichkov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDW54LczyIFu1cKKDiKTcc3CQpY1sosDez7nLlOCdhyn096rl5q4GbjcX5WtMvlArKKjw5cRoBGMlLdJuQ+5PGfxnlK0GOaa924AyQSNINUyvEshV4D1OvEScN/lM0TNQZ3tkIw4YbST1g5JoSkq0MRv/qlzdv8Jg0sV4phZcx410uVQ0oVhfQgrGuq6pjf1fQpvo00cfGUyZRzF9JsxVGHdkXPgYB+W479Smha9GE2wkpiQscnnFyAcs50auLEt9E6/Tw+4fSK1dTgbD0MCSopI+E9WgVaCAxcTaEKaIB32gbgG3jRziC711GDdF4567hM1xDspPc3LeGSsTa4eAYN
-    slukjanov:
-      key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOV5dNsXJ6aJMml7JSd4cJ54qYhOya18QNEdb7NJ88yo
-    sreshetnyak:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbc8cUMy2Stjq4qS8TaVGvTIUGetpgTcLCiW3NnG5Yqe+s+nlQnIL3ezvgSKHin4/PYHl8vV9FnmLdPLk+4eefoek1px8soW/B+Ri0KN6aQUy1ztcecMxcxRH9g4VLZWTbazqGsADwRCQVPXmyIQVQN5wMKd0IzXUp5c03dWv/I1PE7QPdKySrdhjjyo+1Npx/tQjtJaSnGCaUJrXfHXBxiiENzmHuY+se14nWV9RyYN3zRWsa8Yt1n2hWNNiKNfT89h6yFwZAxdsS+jGhzbGTLcWyAqq3sfvvgm0yeL5FEm0AKaOMv7AuM5LqjPkQE4zzCGA0j19EQlAjsVcvKHGH sreshetniak@workstation
-    ytaraday:
-      key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtcRlAQg3baU14eBh8THRv+1T5sHCGAIeFaReEB/KRT
diff --git a/openssh/server/team/members/aminasyan.yml b/openssh/server/team/members/aminasyan.yml
index 9664442..bf417de 100644
--- a/openssh/server/team/members/aminasyan.yml
+++ b/openssh/server/team/members/aminasyan.yml
@@ -16,6 +16,6 @@
         aminasyan:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCo9BHw8WdIFOEuY10XvUqHPl1jCqtA8TYntt5Aee2rR8X8pLG9lWjHPFkNArD5upCRvv6f88Xs4QLoEGWMWcbfMkJE4gMNkOWL4As5iNgagw+DybQrA6nXyassHi8le+quwICfJ1v16IXxPgMBCcrRcSYvHKv+n8KsuBH1csRnJ8aHvIZJTL43Eq0F+aj2S0/9D+m2dyRwcmamn6EqX61NfL5UP3422i4JykTXY6I8iwEHs7Er+jPBD7rtJ/q4Kn/bIyT/Vz0tGHiWyVt7B8GBoPb3PgDuzXKvU7OtOxFb3uhANeecjzIz5G5rAsAQcizf+MGCOoBwFLFJTPAharWN artem@Artem
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBH7+vVgUiiflgclsGBVoGeeSYocSHDkHsRKUOfprH/EPwoYM4mwPotKaO3u342U7Gakxhe9X95jpa1xk4O70w3rsTKERiBcvwM1GUeMoCjyNfUtseZku817wUj+NmU2/bo6YB/Jtuqx+QxxrzXrctowl7rkZud13gypKqVA4kaeT8cclSD0ZNAL99p7y8aXa3CuJ2nBzkzfM0/tuXGsiBZxDm7MzbIjySCTPJz8Y+n8rvmETfMG4smfl1E5R4o0AXpKwWUTZxQxx/BXh1jC9CxnDO/CccLdSY+jY7qvzhCvUsQf3v3Ppdi5wgqaVBf7SaLIeEsyqBwu6CMg1K6jHJt46sdiDSG79/SQHUsrrbVY9lA3tV5CAO0kz4Caae01k8BsO2lT9xLhed7V4ReAbAL3QBTvWMEob8ARQCB6EuaI7VxMcQvmoGK5Rf8/qh+B8JmbgAUyUy/j8qIjeZv4C7LbQO9z86AeGBrd6H5zDzlBL6RcyhvtVvOybovXLTujeMTyydqXfnZ7XTOEwp3lVzavsQO5ej1Ao5CJ/7yXFN3bpTO0fLFDSg/zzS2cME6J6KaT3dJLFfUpS/0hoQlOCV5L10LhZeh0Ot4GfVJ2tGOBQRnYGZHR2MpxQTZV/yhQDfYFBxZtvKcmAFdLTMaJ6GxLleuymJI4n4Vy3pg14O/w== aminasyan@artem
           user: ${linux:system:user:aminasyan}
-          
\ No newline at end of file
+
diff --git a/openssh/server/team/members/apavlov.yml b/openssh/server/team/members/apavlov.yml
new file mode 100644
index 0000000..8eaab41
--- /dev/null
+++ b/openssh/server/team/members/apavlov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        apavlov:
+          enabled: true
+          name: apavlov
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Andrey Pavlov
+          home: /home/apavlov
+          email: apavlov@mirantis.com
+  openssh:
+    server:
+      user:
+        apavlov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC13FvtJl6OdwdiaLFYfJO5WaA7YUMi2/DJJECWtrjJPObGPeAQ1Z8zxQWanwZVhDO7E5oR7n/LmuKHaJkRIFyQEZY3mHS3k4yybg0Vqu2FcGWQO4P3R16v6qDLvuvu9S4sUkYF3k8oYDzwN/Vc+o7a4AkL5U5rjB3vbLWVdGg8G61jFjdekXbJdFCb0liPpcQrUe1yZmjE2E4ERPOZLCVADPiVzXJhtbKigbn/nwdk4D0g+eq3NW0AwJfkyCu6mt1xXfk6gmhUrBPh1ostWv6mSpD9bXvxIKv/QnIM4SUJ/RhJH0uhWtpH4GeXvnPXHs0bxfyq1GtQt5bD3gqCHruz apavlov@Andreys-MacBook-Pro.local
+          user: ${linux:system:user:apavlov}
diff --git a/openssh/server/team/members/deprecated/ikharin.yml b/openssh/server/team/members/deprecated/ikharin.yml
new file mode 100644
index 0000000..6be8637
--- /dev/null
+++ b/openssh/server/team/members/deprecated/ikharin.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        ikharin:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/ikharin
+          name: ikharin
+  openssh:
+    server:
+      user:
+        ikharin:
+          enabled: false
+          user: ${linux:system:user:ikharin}
diff --git a/openssh/server/team/members/deprecated/jkirnosova.yml b/openssh/server/team/members/deprecated/jkirnosova.yml
new file mode 100644
index 0000000..07320c7
--- /dev/null
+++ b/openssh/server/team/members/deprecated/jkirnosova.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        jkirnosova:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/jkirnosova
+          name: jkirnosova
+  openssh:
+    server:
+      user:
+        jkirnosova:
+          enabled: false
+          user: ${linux:system:user:jkirnosova}
diff --git a/openssh/server/team/members/deprecated/mzhnichkov.yml b/openssh/server/team/members/deprecated/mzhnichkov.yml
new file mode 100644
index 0000000..dc3b1b0
--- /dev/null
+++ b/openssh/server/team/members/deprecated/mzhnichkov.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mzhnichkov:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/mzhnichkov
+          name: mzhnichkov
+  openssh:
+    server:
+      user:
+        mzhnichkov:
+          enabled: false
+          user: ${linux:system:user:mzhnichkov}
diff --git a/openssh/server/team/members/deprecated/vkramskikh.yml b/openssh/server/team/members/deprecated/vkramskikh.yml
new file mode 100644
index 0000000..7f8422d
--- /dev/null
+++ b/openssh/server/team/members/deprecated/vkramskikh.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        vkramskikh:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/vkramskikh
+          name: vkramskikh
+  openssh:
+    server:
+      user:
+        vkramskikh:
+          enabled: false
+          user: ${linux:system:user:vkramskikh}
diff --git a/openssh/server/team/members/deprecated/vstoiko.yml b/openssh/server/team/members/deprecated/vstoiko.yml
new file mode 100644
index 0000000..15ce1ce
--- /dev/null
+++ b/openssh/server/team/members/deprecated/vstoiko.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        vstoiko:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/vstoiko
+          name: vstoiko
+  openssh:
+    server:
+      user:
+        vstoiko:
+          enabled: false
+          user: ${linux:system:user:vstoiko}
diff --git a/openssh/server/team/members/mivanov.yml b/openssh/server/team/members/mivanov.yml
new file mode 100644
index 0000000..ec1dffe
--- /dev/null
+++ b/openssh/server/team/members/mivanov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        mivanov:
+          enabled: true
+          name: mivanov
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Michael Ivanov
+          home: /home/mivanov
+          email: mivanov@mirantis.com
+  openssh:
+    server:
+      user:
+        mivanov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLY+5Yc3MMOmxVGrBmvfMX9bwK98RdgW+9E/rj56rh1w5cuIy5qN0xsuU4634EcSLRUjGXBcutDXPEXV1s7BZfeZjXJri37RICLsKfvPZcyiEqtwTbGYkcDDOHH0nmZdfngi0r/qAc5o5k3KA7Eh4CJW+GgqPoShngCKo9YKqbWFUkrGpX7wIUMlqwyuVKsybxD6EU+CB3RAeASG4E0rRq7VYQaTj/+PQq8VrWGUs9QHW8wX+OakDDCI7Or4Ll5q/uPCopaU9r7yz+uEYA1L8P2wEJ4XG9V6dxUMvzrFLBE+wDrHHXcEZMWGbmrPHUy5Yt8UCFPgtYfOl2BvHHHUSp
+          user: ${linux:system:user:mivanov}
diff --git a/openssh/server/team/members/slukjanov.yml b/openssh/server/team/members/slukjanov.yml
new file mode 100644
index 0000000..745fc0c
--- /dev/null
+++ b/openssh/server/team/members/slukjanov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        slukjanov:
+          enabled: true
+          name: slukjanov
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Sergey Lukjanov
+          home: /home/slukjanov
+          email: slukjanov@mirantis.com
+  openssh:
+    server:
+      user:
+        slukjanov:
+          enabled: true
+          public_keys:
+          - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOV5dNsXJ6aJMml7JSd4cJ54qYhOya18QNEdb7NJ88yo
+          user: ${linux:system:user:slukjanov}
diff --git a/openssh/server/team/members/sreshetnyak.yml b/openssh/server/team/members/sreshetnyak.yml
new file mode 100644
index 0000000..52e341d
--- /dev/null
+++ b/openssh/server/team/members/sreshetnyak.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        sreshetnyak:
+          enabled: true
+          name: sreshetnyak
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Sergey Reshetnyak
+          home: /home/sreshetnyak
+          email: sreshetnyak@mirantis.com
+  openssh:
+    server:
+      user:
+        sreshetnyak:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbc8cUMy2Stjq4qS8TaVGvTIUGetpgTcLCiW3NnG5Yqe+s+nlQnIL3ezvgSKHin4/PYHl8vV9FnmLdPLk+4eefoek1px8soW/B+Ri0KN6aQUy1ztcecMxcxRH9g4VLZWTbazqGsADwRCQVPXmyIQVQN5wMKd0IzXUp5c03dWv/I1PE7QPdKySrdhjjyo+1Npx/tQjtJaSnGCaUJrXfHXBxiiENzmHuY+se14nWV9RyYN3zRWsa8Yt1n2hWNNiKNfT89h6yFwZAxdsS+jGhzbGTLcWyAqq3sfvvgm0yeL5FEm0AKaOMv7AuM5LqjPkQE4zzCGA0j19EQlAjsVcvKHGH sreshetniak@workstation
+          user: ${linux:system:user:sreshetnyak}
diff --git a/openssh/server/team/members/sskripnick.yml b/openssh/server/team/members/sskripnick.yml
new file mode 100644
index 0000000..e7e4328
--- /dev/null
+++ b/openssh/server/team/members/sskripnick.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        sskripnick:
+          enabled: true
+          name: sskripnick
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Serhii Skrypnik
+          home: /home/sskripnick
+          email: sskripnick@mirantis.com
+  openssh:
+    server:
+      user:
+        sskripnick:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbDedH7Aw1g2LDHrCLpxfq5GsdTpqRglDXy9dDSEr08tVVl7gSzPJ5oMlIr9VsNVHsR9vf/THhxghFrV1rQZDny8c6yLqus3Upc7pJfOUztWD4+E29H7qJOafrnuNRHGFaEiaG6aZm3WyyvAdlR1lh/i5zQtdrPBmjYkq5LMJvNQBpj4XqmHYp7gLRNDI30Ne49xxAIGC1Qbx0Xvhmq9/h4gZhI5mB/QeOj4tPcd7g+kSTdc5/fXbBLeQDBZt/HlDr7/LFjYZ4OBumVDOTfClFO5UoIAvHyfysaiWI/qZ7UZI7uU4yAPeI8/s/INOQOIoiqaHyiVnL5BvFklHldMot
+          user: ${linux:system:user:sskripnick}
diff --git a/openssh/server/team/members/ytaraday.yml b/openssh/server/team/members/ytaraday.yml
new file mode 100644
index 0000000..762bcb6
--- /dev/null
+++ b/openssh/server/team/members/ytaraday.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        ytaraday:
+          enabled: true
+          name: ytaraday
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Yuriy Taraday
+          home: /home/ytaraday
+          email: ytaraday@mirantis.com
+  openssh:
+    server:
+      user:
+        ytaraday:
+          enabled: true
+          public_keys:
+          - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtcRlAQg3baU14eBh8THRv+1T5sHCGAIeFaReEB/KRT
+          user: ${linux:system:user:ytaraday}
diff --git a/openssh/server/team/oss_team.yml b/openssh/server/team/oss_team.yml
index d5ba940..68348f7 100644
--- a/openssh/server/team/oss_team.yml
+++ b/openssh/server/team/oss_team.yml
@@ -1,95 +1,12 @@
+classes:
+- system.openssh.server.team.members.mivanov
+- system.openssh.server.team.members.sskripnick
+# Deprecated users
+- system.openssh.server.team.members.deprecated.ikharin
+- system.openssh.server.team.members.deprecated.jkirnosova
+- system.openssh.server.team.members.deprecated.vkramskikh
+- system.openssh.server.team.members.deprecated.vstoiko
+
 parameters:
   _param:
     linux_system_user_sudo: true
-  linux:
-    system:
-      user:
-        ikharin:
-          enabled: true
-          name: ikharin
-          sudo: true
-          full_name: Ilya Kharin
-          home: /home/ikharin
-          email: ikharin@mirantis.com
-        vstoiko:
-          enabled: true
-          name: vstoiko
-          sudo: true
-          full_name: Volodymyr Stoiko
-          home: /home/vstoiko
-          email: vstoiko@mirantis.com
-        mivanov:
-          enabled: true
-          name: mivanov
-          sudo: true
-          full_name: Michael Ivanov
-          home: /home/mivanov
-          email: mivanov@mirantis.com
-        vkramskikh:
-          enabled: true
-          name: vkramskikh
-          sudo: true
-          full_name: Vitaly Kramskikh
-          home: /home/vkramskikh
-          email: vkramskikh@mirantis.com
-        jkirnosova:
-          enabled: true
-          name: jkirnosova
-          sudo: true
-          full_name: Iuliia Aranovich
-          home: /home/jkirnosova
-          email: jkirnosova@mirantis.com
-        sskripnick:
-          enabled: true
-          name: sskripnick
-          sudo: true
-          full_name: Serhii Skrypnik
-          home: /home/sskripnick
-          email: sskripnick@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        ikharin:
-          enabled: true
-          public_keys:
-          - ${public_keys:ikharin}
-          user: ${linux:system:user:ikharin}
-        vstoiko:
-          enabled: true
-          public_keys:
-          - ${public_keys:vstoiko}
-          user: ${linux:system:user:vstoiko}
-        mivanov:
-          enabled: true
-          public_keys:
-          - ${public_keys:mivanov}
-          user: ${linux:system:user:mivanov}
-        vkramskikh:
-          enabled: true
-          public_keys:
-          - ${public_keys:vkramskikh}
-          user: ${linux:system:user:vkramskikh}
-        jkirnosova:
-          enabled: true
-          public_keys:
-          - ${public_keys:jkirnosova}
-          user: ${linux:system:user:jkirnosova}
-        sskripnick:
-          enabled: true
-          public_keys:
-          - ${public_keys:sskripnick}
-          user: ${linux:system:user:sskripnick}
-  public_keys:
-    ikharin:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0NNCF9Orei3Ls5wa7xNH/2nl4eAUYY/vuAers7as8lQXjUXkurLQUG1YTQhuRiqyLrqLZjokq87l3LcpXsiBaqNybwlg4OAcf7p59FwDwdpCcAfoHeP03vt/FOYgozeExIRxVNHMdZjQJ4o5j75vnwTfGIubSF1eUOwtRVeezAREK1OPA2TRvlSOXCsAinNSZHBFTlYVYIXQEk/zuH7PdwlU2rkN69mNivh1tAUDlhrwZHrR9rcudafp5s3C5MKFtI3W4MhYIqv9ZViEhLwfEhNb0WXiUv+sdGTf8jTcXaYOlw6z9A76Ab/9bfPyOTmI7tli8Pz15+YPj1ymdlIZlQ==
-    vstoiko:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDF13qwUbb+lva8KCNE6IppajmGfF3MJIFhIPD7HYwzeIyI3INlc6nMMOk+r4a6IO3okVxgqRi27boebvUpazw0Jw4T4e1oLQpWCxvhTZkukFsrd9DJiCj07VXluua2ofaCRLCSHVLdjAH4WocmZeCXpZF1ldDeNBeuX0iYJiFBslrG/pmOuCm3IEL7GmoIJjF0Idtwo3tkWcvCUXKvBaVqCHS34Q/KJLAvZc95MLESs/kdnhfxhxbpWrRRFcZn/zIxuuptuTBzWOPd7CnsOLo5PCnuxIfDznDYYzQUJq6OmwMZipepTtymXUvFQiqq7xc/HmNR51vowqwoftgHNxYvoaQgXkneWFnq4Cl9WZaLVs90wNgQewPaKmhL8ia1S2C3Cub0ILsbU/091L7adBeZI87pkfx72HhFQRUOcVprgPAEKKTbEvUQKAQ4rZ6GOIU5Tz/fKf1sXLhiTEAgpGpaTyyTP04vpgP5iY4kcXQHpRsPxg1BQ+93S3KqF2XAdXvrA4eZfAHmGhsAOePdnJQZVf8c4exsgkIGEyM9Wgi2ZWlq7oY0tFJLf+Kq7y23QuC6isIqBBIDN/TtmHRpiWNY4zwmGhzSxBdA6zMVy9PblrU71w1xVBS4KKwUqbWbP06pA7V04sp8kGKz5OmN9Z+rdTQJ2v41SSU71kT6XSFFOQ==
-    mivanov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLY+5Yc3MMOmxVGrBmvfMX9bwK98RdgW+9E/rj56rh1w5cuIy5qN0xsuU4634EcSLRUjGXBcutDXPEXV1s7BZfeZjXJri37RICLsKfvPZcyiEqtwTbGYkcDDOHH0nmZdfngi0r/qAc5o5k3KA7Eh4CJW+GgqPoShngCKo9YKqbWFUkrGpX7wIUMlqwyuVKsybxD6EU+CB3RAeASG4E0rRq7VYQaTj/+PQq8VrWGUs9QHW8wX+OakDDCI7Or4Ll5q/uPCopaU9r7yz+uEYA1L8P2wEJ4XG9V6dxUMvzrFLBE+wDrHHXcEZMWGbmrPHUy5Yt8UCFPgtYfOl2BvHHHUSp
-    vkramskikh:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9eVOmPT/jCS/q/+T5EmKIBol3wovE+qTb4SQI4y9ZUIT+tMGult1dheqXVKIMYdTe/cccPTf5A+b6QpkPEjzQQljn0qmyHM75ya+Gjd3uTWx+1VXSFL42p0+404oVkB+eOtax+Bf8CU14P6sJn+3ypO63VVCJz6V2cgkr14tqkMZb+4OBPJB6zrNAfXhNJlJ8fLV4d5c4guin74hoaor5VIER3hwMPIe0CtudzdjcdDDvVNqXYfoknwMTNR52h1Zfwvomsy5pdFcI5sQKaOxSqWyi3C22yu/ZK0Diq82INskZ1vjHiJHw8QguXLzevCK4BECnjDFr6Hu4J6eRK3YJ
-    jkirnosova:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuW6hvLo7eRwm6WcjJEDW7TsLG2rZrtmffHQ58c4AzlLAxV0tkvvfQRS4f5Pb+Wj1flxt+RW2rq4dSkQCpwNnYdTHHRnQJFJQEAouqNF7cTVrprioXNeoBe8DGVHiUUI8IpeN8hJYQw17NB6hf8oZulZqdZZ9DA7uwnC0HFfQ1E4MuFnfhB0/XyzJMsxrxHyjte+cOdgE9F43ccHInBGowrzOJP8AUdWdC0I2WU0sjvQrGcvlHr7/EqPP1Zh7PblwESyf3muas7iFTCKtCbXM+pT3e687++ueCqrAftVZGCPpXe23U3sSGdiIti0L6CYxBI02VKlsQgfSqWd8z+W1T
-    sskripnick:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbDedH7Aw1g2LDHrCLpxfq5GsdTpqRglDXy9dDSEr08tVVl7gSzPJ5oMlIr9VsNVHsR9vf/THhxghFrV1rQZDny8c6yLqus3Upc7pJfOUztWD4+E29H7qJOafrnuNRHGFaEiaG6aZm3WyyvAdlR1lh/i5zQtdrPBmjYkq5LMJvNQBpj4XqmHYp7gLRNDI30Ne49xxAIGC1Qbx0Xvhmq9/h4gZhI5mB/QeOj4tPcd7g+kSTdc5/fXbBLeQDBZt/HlDr7/LFjYZ4OBumVDOTfClFO5UoIAvHyfysaiWI/qZ7UZI7uU4yAPeI8/s/INOQOIoiqaHyiVnL5BvFklHldMot
diff --git a/salt/control/cluster/init.yml b/salt/control/cluster/init.yml
index 49d30b3..20ae7fa 100644
--- a/salt/control/cluster/init.yml
+++ b/salt/control/cluster/init.yml
@@ -7,3 +7,9 @@
         internal:
           rng:
             backend: ${_param:salt_control_cluster_rng_backend}
+          seed: cloud-init
+          cloud_init:
+            user_data:
+              salt_minion:
+                conf:
+                  master: ${_param:infra_config_deploy_address}