diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 444050a..9bc2971 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -10,11 +10,6 @@
     openstack_event_alarm_topic: alarm.all
     # Keep alarm history in database for 30 days
     aodh_alarm_history_ttl: 2592000
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       cron:
diff --git a/aodh/server/single.yml b/aodh/server/single.yml
index 2dfdea9..106a1b6 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -7,11 +7,6 @@
     openstack_event_alarm_topic: alarm.all
     # Keep alarm history in database for 30 days
     aodh_alarm_history_ttl: 2592000
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       cron:
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index 60700a7..52c8712 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -6,11 +6,6 @@
 parameters:
   _param:
     cluster_internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   barbican:
     server:
       role: ${_param:openstack_node_role}
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index f004c85..6897cbd 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -5,11 +5,6 @@
 parameters:
   _param:
     internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   barbican:
     server:
       database:
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 4e028f1..681e990 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -2,11 +2,6 @@
 - service.ceilometer.agent.cluster
 - system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
 parameters:
-  _param:
-    openstack_rabbitmq_port: 5672
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    ceilometer_agent_ssl_enabled: False
   ceilometer:
     agent:
       region: ${_param:openstack_region}
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index dc75fc5..ada8cd5 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -2,11 +2,6 @@
 - service.ceilometer.agent.single
 - system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
 parameters:
-  _param:
-    openstack_rabbitmq_port: 5672
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    ceilometer_agent_ssl_enabled: False
   ceilometer:
     agent:
       libvirt:
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index a110361..73f6d5a 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -2,11 +2,6 @@
 - service.ceilometer.agent.cluster.common
 - system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
 parameters:
-  _param:
-    openstack_rabbitmq_port: 5672
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    ceilometer_agent_ssl_enabled: False
   ceilometer:
     agent:
       region: ${_param:openstack_region}
diff --git a/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index 0f87d73..c86bee4 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -2,11 +2,6 @@
 - service.ceilometer.agent.single.common
 - system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
 parameters:
-  _param:
-    openstack_rabbitmq_port: 5672
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    ceilometer_agent_ssl_enabled: False
   ceilometer:
     agent:
       libvirt:
diff --git a/ceilometer/server/backend/gnocchi.yml b/ceilometer/server/backend/gnocchi.yml
index 723d58c..6ebf45f 100644
--- a/ceilometer/server/backend/gnocchi.yml
+++ b/ceilometer/server/backend/gnocchi.yml
@@ -22,3 +22,19 @@
           enabled: true
           url: "notifier://?topic=${_param:openstack_event_alarm_topic}"
           publish_event: true
+  # default permissions in panko configuration files and ssl certificates are restricted
+  # to panko group, therefore ceilometer must have those permission to have ability to
+  # connect to panko's backend db
+  linux:
+    system:
+      group:
+        panko:
+          enabled: true
+      user:
+        ceilometer:
+          enabled: true
+          name: 'ceilometer'
+          home: '/var/lib/ceilometer'
+          shell: '/bin/false'
+          groups:
+            - 'panko'
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 31a0abe..5e3c9a2 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -6,10 +6,6 @@
 - system.keepalived.cluster.instance.openstack_telemetry_vip
 - system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
 parameters:
-  _param:
-    openstack_rabbitmq_port: 5672
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
   ceilometer:
     server:
       enabled: true
diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index 37feddc..9045f68 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -2,10 +2,6 @@
 - service.ceilometer.server.single
 - system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
 parameters:
-  _param:
-    openstack_rabbitmq_port: 5672
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
   ceilometer:
     server:
       role: ${_param:openstack_node_role}
diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
index a887536..81f6c38 100644
--- a/ceilometer/server/telemetry/cluster.yml
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -4,10 +4,6 @@
 - system.keepalived.cluster.instance.openstack_telemetry_vip
 - system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
 parameters:
-  _param:
-    openstack_rabbitmq_port: 5672
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
   ceilometer:
     server:
       enabled: true
diff --git a/ceilometer/server/telemetry/single.yml b/ceilometer/server/telemetry/single.yml
index 9ff35d1..66b9431 100644
--- a/ceilometer/server/telemetry/single.yml
+++ b/ceilometer/server/telemetry/single.yml
@@ -2,10 +2,6 @@
 - service.ceilometer.server.single.common
 - system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
 parameters:
-  _param:
-    openstack_rabbitmq_port: 5672
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
   ceilometer:
     server:
       role: ${_param:openstack_node_role}
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index e4a0718..e34f55c 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -8,11 +8,6 @@
 parameters:
   _param:
     cluster_internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 0d29e31..46bf972 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -5,11 +5,6 @@
 parameters:
   _param:
     internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/cinder/volume/backend/lvm.yml b/cinder/volume/backend/lvm.yml
index 768fb6b..6559e46 100644
--- a/cinder/volume/backend/lvm.yml
+++ b/cinder/volume/backend/lvm.yml
@@ -1,6 +1,8 @@
 parameters:
   _param:
-    cinder_lvm_devices: [ "/dev/loop0" ]
+    cinder_lvm_default_device:  "/dev/loop0"
+    cinder_lvm_devices:
+    - ${_param:cinder_lvm_default_device}
   linux:
     storage:
       lvm:
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index b0e179a..52f45db 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -3,12 +3,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.cinder
 - system.salt.minion.cert.rabbitmq.clients.openstack.cinder
 parameters:
-  _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   cinder:
     volume:
       enabled: True
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index 03c4b3c..35902b8 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -5,11 +5,6 @@
 parameters:
   _param:
     cluster_internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/debmirror/mirror_mirantis_com/cassandra/xenial.yml b/debmirror/mirror_mirantis_com/cassandra/xenial.yml
index e9a80de..807efd1 100644
--- a/debmirror/mirror_mirantis_com/cassandra/xenial.yml
+++ b/debmirror/mirror_mirantis_com/cassandra/xenial.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mirror_mirantis_com_cassandra_xenial_force: False
-    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
   debmirror:
     client:
       enabled: true
diff --git a/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
index bf5b5b9..fb8facc 100644
--- a/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
@@ -1,7 +1,4 @@
 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
@@ -19,4 +16,4 @@
           dist: [ xenial ]
           section: [ main ]
           filter:
-            001: "--exclude='(-dbg_|-dbg-)'"
\ No newline at end of file
+            001: "--exclude='(-dbg_|-dbg-)'"
diff --git a/debmirror/mirror_mirantis_com/docker/xenial.yml b/debmirror/mirror_mirantis_com/docker/xenial.yml
index 1ed38a9..04d31b3 100644
--- a/debmirror/mirror_mirantis_com/docker/xenial.yml
+++ b/debmirror/mirror_mirantis_com/docker/xenial.yml
@@ -1,7 +1,4 @@
 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
@@ -23,4 +20,4 @@
             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
+            003: "--include='docker-ce_((19)|([2-9][0-9]))'"
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
index 9230416..89384fb 100644
--- a/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
+++ b/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mirror_mirantis_com_elasticsearch_5_x_xenial_force: False
-    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
   debmirror:
     client:
       enabled: true
@@ -20,4 +17,5 @@
           dist: [ stable ]
           section: [ main ]
           filter:
-            001: "--exclude='-dbg_'"
+            # drop all versions below 5.6.11
+            001: --exclude='(_|-)5\.([0-5]\.|6\.([0-9]|10)(-|\.))'
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
index fbf1222..dfad4ea 100644
--- a/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
+++ b/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mirror_mirantis_com_elasticsearch_curator_5_xenial_force: False
-    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
   debmirror:
     client:
       enabled: true
diff --git a/debmirror/mirror_mirantis_com/extra/xenial.yml b/debmirror/mirror_mirantis_com/extra/xenial.yml
index 892abd4..28a4b7a 100644
--- a/debmirror/mirror_mirantis_com/extra/xenial.yml
+++ b/debmirror/mirror_mirantis_com/extra/xenial.yml
@@ -1,7 +1,4 @@
 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
@@ -17,4 +14,4 @@
           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
+          section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml b/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
index 7e2b06c..a8a5680 100644
--- a/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
+++ b/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mirror_mirantis_com_glusterfs_3_8_xenial_force: False
-    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
   debmirror:
     client:
       enabled: true
diff --git a/debmirror/mirror_mirantis_com/maas/xenial.yml b/debmirror/mirror_mirantis_com/maas/xenial.yml
index 77267cc..f90589b 100644
--- a/debmirror/mirror_mirantis_com/maas/xenial.yml
+++ b/debmirror/mirror_mirantis_com/maas/xenial.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mirror_mirantis_com_maas_xenial_force: False
-    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
   debmirror:
     client:
       enabled: true
diff --git a/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
index 3e6dca0..c327901 100644
--- a/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
+++ b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
@@ -1,7 +1,4 @@
 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
@@ -17,4 +14,6 @@
           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
+          section: [ main ]
+          filter:
+            001: --exclude='(-|_)dbg(_|-)'
diff --git a/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
index 99dec3b..54a8d38 100644
--- a/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
+++ b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
@@ -1,7 +1,4 @@
 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
@@ -17,4 +14,6 @@
           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
+          section: [ main ]
+          filter:
+            001: --exclude='(-|_)dbg(_|-)'
diff --git a/debmirror/mirror_mirantis_com/percona/xenial.yml b/debmirror/mirror_mirantis_com/percona/xenial.yml
index 95e8a32..42f5ade 100644
--- a/debmirror/mirror_mirantis_com/percona/xenial.yml
+++ b/debmirror/mirror_mirantis_com/percona/xenial.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mirror_mirantis_com_percona_xenial_force: False
-    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
   debmirror:
     client:
       enabled: true
diff --git a/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml b/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
index cfd3bfd..9945483 100644
--- a/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
+++ b/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mirror_mirantis_com_saltstack_2016_3_xenial_force: False
-    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
   debmirror:
     client:
       enabled: true
diff --git a/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml b/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
index a5c6097..13d13c2 100644
--- a/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
+++ b/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mirror_mirantis_com_saltstack_2017_7_xenial_force: False
-    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
   debmirror:
     client:
       enabled: true
diff --git a/debmirror/mirror_mirantis_com/td-agent/xenial.yml b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
index d141967..6d9a7f2 100644
--- a/debmirror/mirror_mirantis_com/td-agent/xenial.yml
+++ b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
@@ -1,7 +1,4 @@
 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
@@ -9,7 +6,7 @@
         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' ]
+          extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
@@ -17,4 +14,4 @@
           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
+          section: [ contrib ]
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index 6bc9d79..d09c4f8 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mirror_mirantis_com_ubuntu_xenial_force: False
-    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
   debmirror:
     client:
       enabled: true
@@ -119,22 +116,24 @@
             95: "--exclude='/gcc-.*-cross.*'"
             96: "--exclude='/(nvidia).*'"
             97: "--exclude='/universe/.*(metastudent).*'"
+            # Drop all dbg pkgs
+            98: --exclude='(-|_)dbg(_|-)'
             # List of unused linux kernels and unsupported arch
             300: "--exclude='/.*(arm64|powerpc|s390x|armel|armhf|sparc64|mips64|ppc64el|mipsn32)(?!.*amd64)'"
             301: "--exclude='(main|universe)/l/linux-*-(.*azure|.*aws|gke|gcp|.*azure-edge|.*oem/|.*euclid/)'"
             302: "--exclude='/*universe.*(-armel-|-arm-)(?!.*amd64)'"
             303: "--exclude='/main/l/linux(.*)/linux-source-*'"
             # Old minor version of kernel|tools|extra|cloud and related.
-            # Generic: Old - if minor less then < 127, but not 4numeric
-            304: '--exclude="main/l/linux.*/linux-.*4\.4\.0-(([0-9][0-9])|([0-9][0-2][0-6]))(\.|_|-)"'
+            # Generic: Old - if minor less then < 136, but not 4numeric
+            304: --exclude='main/l/linux.*/linux-.*4\.4\.0-(([0-9][0-9])|([0-9][0-3][0-6]))(\.|_|-)'
             # Hwe 4.8: Old - if minor in 30-49 and < 57.
             305: '--exclude="main/l/linux.*/linux-.*4\.8\.0-(([0-4][0-9])|([0-9][0-6]))"'
             # Hwe 4.10: Old - if minor in 0-39, < 42 .
             306: '--exclude="main/l/linux.*/linux-.*4\.10\.0-(([0-3][0-9])|(4[0-1]))"'
             # Hwe 4.13: Old - if minor in 0-39, < 44
             307: '--exclude="main/l/linux.*/linux-.*4\.13\.0-(([0-3][0-9])|(4[0-4]))"'
-            # Hwe 4.15: Old - if minor in 0-19, < 24
-            308: '--exclude="main/l/linux.*/linux-.*4\.15\.0-(([0-1][0-9])|([0-2][0-3]))"'
+            # Hwe 4.15: Old - if minor in 0-19, < 34
+            308: '--exclude="main/l/linux.*/linux-.*4\.15\.0-(([0-1][0-9])|([0-3][0-3]))"'
             # List of packages, that should be fetched from fresh ppa or other mirror
             # So,removing them from upstream mirror.
             500: "--exclude='/main/m/maas/'"
@@ -168,6 +167,7 @@
             528: "--exclude='/(universe|main)/i/(ironic)'"
             529: "--exclude='/(universe|main)/a/(aodh)'"
             530: "--exclude='/(universe|main)/p/python-(ironic|aodh)client'"
+            531: --exclude='/universe/p/percona-'
             # List of extra includes, founded after tests.
             800: "--include='/main(.*)manpages'"
             801: "--include='/main(.*)python-(.*)doc'"
@@ -178,4 +178,3 @@
             805: '--include="/main(.*)llvm-toolchain-(?![1-5])"' # pki-ca: < 389-ds-base < dogtag
             806: "--include='/main(.*)man-db'" # include man tool
             807: "--include='/main(.*)zfs-doc'" # Some extra fs dep's for MAAS provision stage.PROD-21531
-
diff --git a/defaults/debmirror.yml b/defaults/debmirror.yml
new file mode 100644
index 0000000..4376529
--- /dev/null
+++ b/defaults/debmirror.yml
@@ -0,0 +1,20 @@
+parameters:
+  _param:
+    # Global
+    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+    # Per repo modificators
+    mirror_mirantis_com_cassandra_xenial_force: False
+    mirror_mirantis_com_ceph_luminous_xenial_force: False
+    mirror_mirantis_com_docker_xenial_force: False
+    mirror_mirantis_com_elasticsearch_5_x_xenial_force: False
+    mirror_mirantis_com_elasticsearch_curator_5_xenial_force: False
+    mirror_mirantis_com_extra_xenial_force: False
+    mirror_mirantis_com_glusterfs_3_8_xenial_force: False
+    mirror_mirantis_com_maas_xenial_force: False
+    mirror_mirantis_com_openstack_pike_xenial_force: False
+    mirror_mirantis_com_openstack_queens_xenial_force: False
+    mirror_mirantis_com_percona_xenial_force: False
+    mirror_mirantis_com_saltstack_2016_3_xenial_force: False
+    mirror_mirantis_com_saltstack_2017_7_xenial_force: False
+    mirror_mirantis_com_td_agent_xenial_force: False
+    mirror_mirantis_com_ubuntu_xenial_force: False
diff --git a/defaults/galera/init.yml b/defaults/galera/init.yml
new file mode 100644
index 0000000..a99b281
--- /dev/null
+++ b/defaults/galera/init.yml
@@ -0,0 +1,4 @@
+parameters:
+  _param:
+    # SSL
+    galera_ssl_enabled: False
diff --git a/defaults/init.yml b/defaults/init.yml
index f17e399..9674799 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -1,11 +1,22 @@
+# This is list of all default soft params, across reclass-system lvl.
+# Please always include those 'init.yml', and don't use direct sub-lvls.
+# Some rules approach:
+# - Always use uniq names, which exactly identify key
+# - Avoid any component intersection's
+# - No if\else\whatever logic allowed.
+
 classes:
 - system.defaults.linux_system_repo
+- system.defaults.openstack
+- system.defaults.galera
+- system.defaults.rabbitmq
+- system.defaults.debmirror
 parameters:
-# Transition in progress.
-# Please ignore 'G' transition marker - it uses only for internal purposes
   _param:
     apt_mk_version: "stable"
     linux_system_architecture: 'amd64'
     linux_system_repo_url: "http://mirror.mirantis.com/${_param:apt_mk_version}/"
-    # Openstack
-    openstack_version: 'pike'
+    # Openstack globals
+    openstack_version: 'queens'
+    # Docker artifact globals
+    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index b59437d..0b3d197 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -4,11 +4,11 @@
     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/
-    linux_system_repo_update_url: ${_param:linux_system_repo_url}/update/${_param:apt_mk_version}/
     # 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/
-    linux_system_repo_hotfix_url: ${_param:linux_system_repo_url}/hotfix/${_param:apt_mk_version}/
 
     # Per repos
     linux_system_repo_mcp_aptly_url: ${_param:linux_system_repo_url}/aptly/
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
new file mode 100644
index 0000000..e2856a0
--- /dev/null
+++ b/defaults/openstack/init.yml
@@ -0,0 +1,8 @@
+parameters:
+  _param:
+    # SSL
+    ceilometer_agent_ssl_enabled: False
+    openstack_mysql_x509_enabled: False
+    # for non-ssl use 5672 / for ssl 5671
+    openstack_rabbitmq_port: 5672
+    openstack_rabbitmq_x509_enabled: False
diff --git a/defaults/rabbitmq/init.yml b/defaults/rabbitmq/init.yml
new file mode 100644
index 0000000..2cad9ec
--- /dev/null
+++ b/defaults/rabbitmq/init.yml
@@ -0,0 +1,4 @@
+parameters:
+  _param:
+    # SSL
+    rabbitmq_ssl_enabled: False
diff --git a/designate/server/cluster/default.yml b/designate/server/cluster/default.yml
index 1e8076e..db453f7 100644
--- a/designate/server/cluster/default.yml
+++ b/designate/server/cluster/default.yml
@@ -9,11 +9,6 @@
   _param:
     designate_admin_api_enabled: false
     cluster_internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/designate/server/cluster/simple.yml b/designate/server/cluster/simple.yml
index 459ab96..bf520a4 100644
--- a/designate/server/cluster/simple.yml
+++ b/designate/server/cluster/simple.yml
@@ -6,11 +6,6 @@
   _param:
     designate_admin_api_enabled: false
     cluster_internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/designate/server/single.yml b/designate/server/single.yml
index e89afe1..10aac33 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -6,11 +6,6 @@
   _param:
     designate_admin_api_enabled: false
     internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/docker/swarm/stack/decapod.yml b/docker/swarm/stack/decapod.yml
index 2d915fc..c0cf8a6 100644
--- a/docker/swarm/stack/decapod.yml
+++ b/docker/swarm/stack/decapod.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     docker_decapod_fe_replicas: 3
     decapod_version: latest
     docker_image_admin: ${_param:mcp_docker_registry}/mirantis/ceph/decapod/admin:${_param:decapod_version}
diff --git a/docker/swarm/stack/devops_portal.yml b/docker/swarm/stack/devops_portal.yml
index c7790d8..495526a 100644
--- a/docker/swarm/stack/devops_portal.yml
+++ b/docker/swarm/stack/devops_portal.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     docker_devops_portal_replicas: 1
     docker_image_devops_portal: ${_param:mcp_docker_registry}/mirantis/oss/devops-portal:latest
   docker:
diff --git a/docker/swarm/stack/hce.yml b/docker/swarm/stack/hce.yml
index a2d4505..38e92ff 100644
--- a/docker/swarm/stack/hce.yml
+++ b/docker/swarm/stack/hce.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     docker_hce_replicas: 1
     docker_image_hce: ${_param:mcp_docker_registry}/mirantis/oss/hce
     hce_bind_host: hce-api
diff --git a/docker/swarm/stack/janitor_monkey.yml b/docker/swarm/stack/janitor_monkey.yml
index 4793b1a..fb926e8 100644
--- a/docker/swarm/stack/janitor_monkey.yml
+++ b/docker/swarm/stack/janitor_monkey.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     docker_janitor_monkey_replicas: 1
     docker_image_mongodb: library/mongo:3.4
     docker_mongodb_admin_username: admin
diff --git a/docker/swarm/stack/monitoring/alerta.yml b/docker/swarm/stack/monitoring/alerta.yml
index 8c9d7aa..0f82821 100644
--- a/docker/swarm/stack/monitoring/alerta.yml
+++ b/docker/swarm/stack/monitoring/alerta.yml
@@ -2,7 +2,6 @@
 - system.prometheus.alerta
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     docker_image_alerta: ${_param:mcp_docker_registry}/mirantis/external/alerta-web:latest
     alerta_mongodb_uri: "mongodb://${_param:cluster_node01_address}:27017,${_param:cluster_node02_address}:27017,${_param:cluster_node03_address}:27017/alerta?replicaSet=stacklight"
     alerta_admin_username: "admin@alerta.io"
diff --git a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
index 2e509f1..d642dd2 100644
--- a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
+++ b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     docker_image_elasticsearch: ${_param:mcp_docker_registry}/mirantis/external/elasticsearch:nightly
     elasticsearch_client_node_publish_host: ${_param:cluster_public_host}
     elasticsearch_cluster_name: elasticsearch
diff --git a/docker/swarm/stack/monitoring/gainsight.yml b/docker/swarm/stack/monitoring/gainsight.yml
index 5748034..06c87aa 100644
--- a/docker/swarm/stack/monitoring/gainsight.yml
+++ b/docker/swarm/stack/monitoring/gainsight.yml
@@ -2,7 +2,6 @@
 - system.prometheus.gainsight.container
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     gainsight_enabled: 'true'
     gainsight_csv_upload_url: 'http://localhost:9999'
     gainsight_account_id: 'default'
diff --git a/docker/swarm/stack/pushkin.yml b/docker/swarm/stack/pushkin.yml
index 65d400e..2ee26e4 100644
--- a/docker/swarm/stack/pushkin.yml
+++ b/docker/swarm/stack/pushkin.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     docker_pushkin_replicas: 1
     docker_image_pushkin: ${_param:mcp_docker_registry}/mirantis/oss/pushkin
     pushkin_bind_host: pushkin-api
diff --git a/docker/swarm/stack/rundeck.yml b/docker/swarm/stack/rundeck.yml
index b680eea..a1e8f5a 100644
--- a/docker/swarm/stack/rundeck.yml
+++ b/docker/swarm/stack/rundeck.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     docker_rundeck_replicas: 1
     docker_image_rundeck: ${_param:mcp_docker_registry}/mirantis/oss/rundeck:latest
     rundeck_bind_host: rundeck-api
diff --git a/docker/swarm/stack/security_monkey.yml b/docker/swarm/stack/security_monkey.yml
index 2c46878..5db205e 100644
--- a/docker/swarm/stack/security_monkey.yml
+++ b/docker/swarm/stack/security_monkey.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     docker_security_monkey_api_replicas: 1
     docker_security_monkey_scheduler_replicas: 1
     secmonkey_login_id: 11
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index c69cf55..da4b9e8 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -6,12 +6,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.glance
 - system.salt.minion.cert.rabbitmq.clients.openstack.glance
 parameters:
-  _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       cron:
diff --git a/glance/control/single.yml b/glance/control/single.yml
index a789a56..34e3e96 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -3,12 +3,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.glance
 - system.salt.minion.cert.rabbitmq.clients.openstack.glance
 parameters:
-  _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       cron:
diff --git a/gnocchi/common/cluster.yml b/gnocchi/common/cluster.yml
index 8d7ae5e..a841b56 100644
--- a/gnocchi/common/cluster.yml
+++ b/gnocchi/common/cluster.yml
@@ -2,9 +2,6 @@
 - service.gnocchi.common.cluster
 - system.salt.minion.cert.mysql.clients.openstack.gnocchi
 parameters:
-  _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
   gnocchi:
     common:
       database:
diff --git a/gnocchi/common/single.yml b/gnocchi/common/single.yml
index 1f68f5c..b7d9d96 100644
--- a/gnocchi/common/single.yml
+++ b/gnocchi/common/single.yml
@@ -2,9 +2,6 @@
 - service.gnocchi.common.single
 - system.salt.minion.cert.mysql.clients.openstack.gnocchi
 parameters:
-  _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
   gnocchi:
     common:
       database:
diff --git a/haproxy/proxy/listen/opencontrail/control4_0.yml b/haproxy/proxy/listen/opencontrail/control4_0.yml
new file mode 100644
index 0000000..baeb86e
--- /dev/null
+++ b/haproxy/proxy/listen/opencontrail/control4_0.yml
@@ -0,0 +1,60 @@
+parameters:
+  _param:
+    opencontrail_stats_password: password
+    opencontrail_api_start_offset: 0
+    opencontrail_api_workers_count: 1
+  haproxy:
+    proxy:
+      listen:
+        contrail_api:
+          type: contrail-api
+          service_name: contrail
+          binds:
+          - address: ${_param:cluster_vip_address}
+            port: 8082
+          servers:
+          - name: ntw01
+            host: ${_param:cluster_node01_address}
+            port: 9100
+            params: check inter 2000 rise 2 fall 3
+            port_range_length: ${_param:opencontrail_api_workers_count}
+            port_range_start_offset: ${_param:opencontrail_api_start_offset}
+          - name: ntw02
+            host: ${_param:cluster_node02_address}
+            port: 9100
+            params: check inter 2000 rise 2 fall 3
+            port_range_length: ${_param:opencontrail_api_workers_count}
+            port_range_start_offset: ${_param:opencontrail_api_start_offset}
+          - name: ntw03
+            host: ${_param:cluster_node03_address}
+            port: 9100
+            params: check inter 2000 rise 2 fall 3
+            port_range_length: ${_param:opencontrail_api_workers_count}
+            port_range_start_offset: ${_param:opencontrail_api_start_offset}
+        contrail_config_stats:
+          type: contrail-config
+          check: false
+          format: listen
+          binds:
+          - address: '*'
+            port: 5937
+          user: haproxy
+          password: ${_param:opencontrail_stats_password}
+        contrail_openstack_stats:
+          type: contrail-config
+          check: false
+          format: listen
+          binds:
+          - address: '*'
+            port: 5936
+          user: haproxy
+          password: ${_param:opencontrail_stats_password}
+        contrail_collector_stats:
+          type: contrail-config
+          check: false
+          format: listen
+          binds:
+          - address: '*'
+            port: 5938
+          user: haproxy
+          password: ${_param:opencontrail_stats_password}
diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index e11feae..52b3582 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -9,11 +9,6 @@
   _param:
     cluster_public_protocol: 'https'
     cluster_internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    galera_ssl_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/heat/server/single.yml b/heat/server/single.yml
index 1ecb122..c0dc700 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -3,12 +3,6 @@
 - system.salt.minion.cert.mysql.clients.openstack.heat
 - system.salt.minion.cert.rabbitmq.clients.openstack.heat
 parameters:
-  _param:
-    openstack_mysql_x509_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    galera_ssl_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index 849b923..fe90091 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -3,12 +3,6 @@
 - system.salt.minion.cert.rabbitmq.clients.openstack.ironic
 - service.ironic.api.cluster
 parameters:
-  _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
@@ -38,4 +32,4 @@
           key_file: ${_param:rabbitmq_ironic_client_ssl_key_file}
           cert_file: ${_param:rabbitmq_ironic_client_ssl_cert_file}
         ssl:
-          enabled: ${_param:rabbitmq_ssl_enabled}
\ No newline at end of file
+          enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index 3313eb2..1ca654b 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -3,12 +3,6 @@
 - system.salt.minion.cert.rabbitmq.clients.openstack.ironic
 - service.ironic.api.single
 parameters:
-  _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 81fa2b5..a839f5d 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -3,12 +3,6 @@
 - system.salt.minion.cert.rabbitmq.clients.openstack.ironic
 - service.ironic.conductor.cluster
 parameters:
-  _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 7a24028..b08239e 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -3,12 +3,6 @@
 - system.salt.minion.cert.rabbitmq.clients.openstack.ironic
 - service.ironic.conductor.single
 parameters:
-  _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index 55c7f88..a713427 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -1,155 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      view:
-        Aptly:
-          enabled: true
-          type: CategorizedJobsView
-          include_regex: "aptly-.*"
-          categories:
-            - group_regex: "aptly-.*-nightly-testing"
-              naming_rule: "Nightly -> Testing"
-            - group_regex: "aptly-.*-testing-stable"
-              naming_rule: "Testing -> Stable"
-      job_template:
-        aptly:
-          name: aptly-{{operation}}-{{dist}}-{{source}}-{{target}}
-          jobs:
-            - operation: promote
-              diff_only: false
-              dist: trusty
-              source: nightly
-              target: testing
-            - operation: promote
-              dist: trusty
-              source: testing
-              target: stable
-            - operation: promote
-              dist: xenial
-              source: nightly
-              target: testing
-            - operation: promote
-              dist: xenial
-              source: testing
-              target: stable
-            - operation: diff
-              diff_only: true
-              dist: trusty
-              source: nightly
-              target: testing
-            - operation: diff
-              diff_only: true
-              dist: trusty
-              source: testing
-              target: stable
-            - operation: diff
-              diff_only: true
-              dist: xenial
-              source: nightly
-              target: testing
-            - operation: diff
-              diff_only: true
-              dist: xenial
-              source: testing
-              target: stable
-          template:
-            discard:
-              build:
-                keep_num: 25
-              artifact:
-                keep_num: 25
-            type: workflow-scm
-            concurrent: false
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: aptly-promote-pipeline.groovy
-            param:
-              SOURCE:
-                type: string
-                default: "{{dist}}/{{source}}"
-              TARGET:
-                type: string
-                default: "{{dist}}/{{target}}"
-              RECREATE:
-                type: boolean
-                default: 'false'
-              DUMP_PUBLISH:
-                type: boolean
-                default: 'true'
-              DIFF_ONLY:
-                type: boolean
-                default: '{{diff_only}}'
-              APTLY_URL:
-                type: string
-                default: "${_param:jenkins_aptly_api_url}"
-              COMPONENTS:
-                type: string
-                default: "all"
-                description: "Comma separated list (,)"
-              PACKAGES:
-                type: string
-                default: "all"
-                description: "Comma separated list (,)"
-              STORAGES:
-                type: string
-                default: "${_param:jenkins_aptly_storages}"
-                description: "Comma separated list of storage"
-        aptly-all:
-          name: aptly-{{operation}}-all-{{source}}-{{target}}
-          jobs:
-            - operation: promote
-              diff_only: false
-              source: nightly
-              target: testing
-            - operation: promote
-              diff_only: false
-              source: testing
-              target: stable
-          template:
-            discard:
-              build:
-                keep_num: 25
-              artifact:
-                keep_num: 25
-            type: workflow-scm
-            concurrent: false
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: aptly-promote-pipeline.groovy
-            param:
-              SOURCE:
-                type: string
-                default: "(.*)/{{source}}"
-              TARGET:
-                type: string
-                default: "{0}/{{target}}"
-              RECREATE:
-                type: boolean
-                default: 'false'
-              DUMP_PUBLISH:
-                type: boolean
-                default: 'true'
-              DIFF_ONLY:
-                type: boolean
-                default: '{{diff_only}}'
-              APTLY_URL:
-                type: string
-                default: "${_param:jenkins_aptly_api_url}"
-              COMPONENTS:
-                type: string
-                default: "all"
-                description: "Comma separated list (,)"
-              PACKAGES:
-                type: string
-                default: "all"
-                description: "Comma separated list (,)"
-              STORAGES:
-                type: string
-                default: "${_param:jenkins_aptly_storages}"
-                description: "Comma separated list of storage"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 1914ec5..7e419f6 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     jenkins_deploy_jobs: []
     heat_stack_zone_job_param:
       type: string
diff --git a/jenkins/client/job/gating.yml b/jenkins/client/job/gating.yml
index 513df82..a713427 100644
--- a/jenkins/client/job/gating.yml
+++ b/jenkins/client/job/gating.yml
@@ -1,68 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      view:
-        Gating:
-          enabled: true
-          type: ListView
-          include_regex: "gate-.*"
-      job_template:
-        gate-gerrit-namespace:
-          name: gate-gerrit-{{name}}
-          jobs:
-            - name: mk
-              regex: 'mk\/.*'
-            - name: debian
-              regex: 'debian\/.*'
-            - name: contrail
-              regex: 'contrail\/.*'
-            - name: salt-models
-              regex: 'salt-models\/.*'
-            - name: salt-formulas
-              regex: 'salt-formulas\/.*'
-            - name: oss
-              regex: 'oss\/devops-portal'
-          template:
-            discard:
-              build:
-                keep_num: 150
-              artifact:
-                keep_num: 150
-            type: workflow-scm
-            concurrent: true
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: gating-pipeline.groovy
-            quiet_period: 60
-            trigger:
-              gerrit:
-                project:
-                  '{{regex}}':
-                    compare_type: REG_EXP
-                    branches:
-                      - master
-                      - compare_type: ANT
-                        name: release/*
-                skip_vote:
-                  - successful
-                  - failed
-                  - unstable
-                  - not_built
-                event:
-                  comment:
-                    - added:
-                        verdictCategory: 'Workflow'
-                        commentAddedTriggerApprovalValue: '+1'
-            param:
-              JOBS_NAMESPACE:
-                type: string
-                default: "{{name}}"
-              SKIP_TEST:
-                type: string
-                default: false
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/git-mirrors/2way.yml b/jenkins/client/job/git-mirrors/2way.yml
index 71d8f9a..2fe2fab 100644
--- a/jenkins/client/job/git-mirrors/2way.yml
+++ b/jenkins/client/job/git-mirrors/2way.yml
@@ -11,7 +11,7 @@
             - name: mcp-common-scripts
               source: mcp/mcp-common-scripts
               target: Mirantis/mcp-common-scripts
-              branches: "master,release/2018.8.1"
+              branches: "master,release/2018.8.1,release/2018.11.0"
             - name: mcp-local-repo-model
               source: mcp/mcp-local-repo-model
               target: Mirantis/mcp-local-repo-model
diff --git a/jenkins/client/job/git-mirrors/downstream/pipelines.yml b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
index 17611cb..58c23b0 100644
--- a/jenkins/client/job/git-mirrors/downstream/pipelines.yml
+++ b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
@@ -8,8 +8,8 @@
       - name: pipeline-library
         downstream: mcp-ci/pipeline-library
         upstream: "${_param:gerrit_pipeline_library_repo}"
-        branches: "master,release/2018.8.1"
+        branches: "master,release/2018.8.1,release/2018.11.0"
       - name: mk-pipelines
         downstream: mk/mk-pipelines
         upstream: "${_param:gerrit_mk_pipelines_repo}"
-        branches: "master,release/2018.8.1"
+        branches: "master,release/2018.8.1,release/2018.11.0"
diff --git a/jenkins/client/job/git-mirrors/upstream/pipelines.yml b/jenkins/client/job/git-mirrors/upstream/pipelines.yml
index 9e82f80..4fc3b8f 100644
--- a/jenkins/client/job/git-mirrors/upstream/pipelines.yml
+++ b/jenkins/client/job/git-mirrors/upstream/pipelines.yml
@@ -6,8 +6,8 @@
       - name: pipeline-library
         downstream: mcp-ci/pipeline-library
         upstream: "git@github.com:Mirantis/pipeline-library.git"
-        branches: master,release/2018.8.1
+        branches: "master,release/2018.8.1,release/2018.11.0"
       - name: mk-pipelines
         downstream: mk/mk-pipelines
         upstream: "git@github.com:Mirantis/mk-pipelines.git"
-        branches: master,release/2018.8.1
+        branches: "master,release/2018.8.1,release/2018.11.0"
diff --git a/jenkins/client/job/git-mirrors/upstream/templates.yml b/jenkins/client/job/git-mirrors/upstream/templates.yml
index a386ba4..c5a371f 100644
--- a/jenkins/client/job/git-mirrors/upstream/templates.yml
+++ b/jenkins/client/job/git-mirrors/upstream/templates.yml
@@ -6,7 +6,7 @@
       - name: cookiecutter-templates
         downstream: mk/cookiecutter-templates
         upstream: "git@github.com:Mirantis/mk2x-cookiecutter-reclass-model"
-        branches: master,mcp10,release/2018.8.1
+        branches: "master,mcp10,release/2018.8.1,release/2018.11.0"
       - name: heat-fragments
         downstream: mk/heat-fragments
         upstream: "git@github.com:Mirantis/heat-fragments"
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
index 976ed1a..fe0f959 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
@@ -18,6 +18,27 @@
             url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
             credentials: "gerrit"
             script: pipelines/mcp-formula-change-test-pipeline.groovy
+          trigger:
+            gerrit:
+              project:
+                kubernetes/kubernetes:
+                  branches:
+                    - compare_type: "ANT"
+                      name: "**"
+              skip_vote:
+                - successful
+                - failed
+                - unstable
+                - not_built
+              event:
+                patchset:
+                  - created:
+                      excludeDrafts: false
+                      excludeTrivialRebase: false
+                      excludeNoCodeChange: false
+                comment:
+                  - addedContains:
+                      commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
           param:
             SOURCE_CREDENTIALS:
               type: string
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml
index 0c01626..ad66033 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
-    mcp_prod_docker_registry: 'docker-prod-local.docker.mirantis.net'
   jenkins:
     client:
       job_template:
@@ -57,9 +54,9 @@
             param:
               KUBE_DOCKER_REGISTRY:
                 type: string
-                default: ${_param:mcp_docker_registry}
+                default: docker-dev-local.docker.mirantis.net
                 description: 'Docker registry for binaries and images'
               KUBE_PROD_DOCKER_REGISTRY:
                 type: string
-                default: ${_param:mcp_prod_docker_registry}
+                default: ${_param:mcp_docker_registry}
                 description: 'Prod docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml
index de5e5a6..3bf77cb 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml
@@ -1,6 +1,4 @@
 parameters:
-  _param:
-    mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
   jenkins:
     client:
       job_template:
@@ -65,5 +63,5 @@
             param:
               KUBE_DOCKER_REGISTRY:
                 type: string
-                default: ${_param:mcp_docker_registry}
+                default: 'docker-dev-local.docker.mirantis.net'
                 description: 'Docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
index e7697a0..042e8d3 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
@@ -1,6 +1,4 @@
 parameters:
-  _param:
-    mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
   jenkins:
     client:
       job:
@@ -34,5 +32,5 @@
           param:
             KUBE_DOCKER_REGISTRY:
               type: string
-              default: ${_param:mcp_docker_registry}
+              default: docker-dev-local.docker.mirantis.net
               description: 'Docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
index c4f2af0..c5ffe4e 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
@@ -1,7 +1,4 @@
 parameters:
-  _param:
-    mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
-    mcp_prod_docker_registry: 'docker-prod-local.docker.mirantis.net'
   jenkins:
     client:
       job:
@@ -35,9 +32,9 @@
           param:
             KUBE_DOCKER_REGISTRY:
               type: string
-              default: ${_param:mcp_docker_registry}
+              default: docker-dev-local.docker.mirantis.net
               description: 'Docker registry for binaries and images'
             KUBE_PROD_DOCKER_REGISTRY:
               type: string
-              default: ${_param:mcp_prod_docker_registry}
+              default: ${_param:mcp_docker_registry}
               description: 'Prod docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
index 8ebd8eb..fbce687 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
@@ -1,6 +1,4 @@
 parameters:
-  _param:
-    mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
   jenkins:
     client:
       job:
@@ -43,6 +41,6 @@
           param:
             KUBE_DOCKER_REGISTRY:
               type: string
-              default: ${_param:mcp_docker_registry}
+              default: 'docker-dev-local.docker.mirantis.net'
               description: 'Docker registry for binaries and images'
 
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 99a3884..09f04bc 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -1,6 +1,4 @@
 parameters:
-  _param:
-    mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
   jenkins:
     client:
       job:
@@ -20,7 +18,7 @@
           trigger:
             gerrit:
               project:
-                kubernetes/kubernetes:
+                salt-formulas/kubernetes:
                   branches:
                     - compare_type: "ANT"
                       name: "**"
@@ -43,7 +41,7 @@
           param:
             KUBE_DOCKER_REGISTRY:
               type: string
-              default: ${_param:mcp_docker_registry}
+              default: docker-dev-local.docker.mirantis.net
               description: 'Docker registry for binaries and images'
             CALICO_DOCKER_REGISTRY:
               type: string
diff --git a/jenkins/client/job/kill_stuck_jobs.yml b/jenkins/client/job/kill_stuck_jobs.yml
index cc69c6b..a713427 100644
--- a/jenkins/client/job/kill_stuck_jobs.yml
+++ b/jenkins/client/job/kill_stuck_jobs.yml
@@ -1,26 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      job:
-        kill-stuck-jobs:
-          name: kill-stuck-jobs
-          discard:
-            build:
-              keep_num: 3
-            artifact:
-              keep_num: 3
-          type: workflow-scm
-          concurrent: true
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: abort-long-running-jobs.groovy
-          trigger:
-            timer:
-              spec: "H H * * *"
-          param:
-            MAX_DURATION_IN_HOURS:
-              type: string
-              default: "24"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/oscore/cookiecutter.yml b/jenkins/client/job/oscore/cookiecutter.yml
index 0ea2bba..53d8260 100644
--- a/jenkins/client/job/oscore/cookiecutter.yml
+++ b/jenkins/client/job/oscore/cookiecutter.yml
@@ -87,6 +87,10 @@
               type: boolean
               description: "Delete Heat stack when finished (bool)"
               default: 'false'
+            EXTRA_REPOS:
+              type: text
+              description: "Yaml based extra repos metadata to be added during bootstrap phase"
+              default: ''
         oscore-test-cookiecutter-models:
           display_name: oscore-test-cookiecutter-models
           name: oscore-test-cookiecutter-models
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index 331bd7e..ba6e150 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -132,6 +132,7 @@
                 type: string
                 default: "{{stack_cleanup_job}}"
               # salt
+              # FIXME allign to DISTRIB_REVISION
               FORMULA_PKG_REVISION:
                 type: string
                 description: Version of formulas for salt-master bootstrap
diff --git a/jenkins/client/job/oscore/salt_virtual_models.yml b/jenkins/client/job/oscore/salt_virtual_models.yml
index 7bffaf2..0088fbd 100644
--- a/jenkins/client/job/oscore/salt_virtual_models.yml
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -55,6 +55,7 @@
               type: boolean
               default: 'false'
               description: "Enable it when stack have to be deleted."
+            # FIXME allign to DISTRIB_REVISION
             FORMULA_PKG_REVISION:
               type: string
               description: Version of formulas for salt-master bootstrap
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index c082306..650e1de 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -70,6 +70,7 @@
                 type: text
                 default: ""
                 description: YAML with overrides for Salt deployment
+              # FIXME allign to DISTRIB_REVISION
               FORMULA_PKG_REVISION:
                 type: string
                 description: Version of formulas for salt-master bootstrap
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index f2efc67..a713427 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -1,493 +1,2 @@
-parameters:
-  _param:
-    jenkins_pollscm_spec: "H/60 * * * *"
-    job_description_2way: <br>Syncronizes code projects with GitHub.<br>
-  jenkins:
-    client:
-      job_template:
-        git-mirror-2way-salt-formula:
-          name: git-mirror-2way-salt-formula-{{name}}
-          jobs:
-            - name: aodh
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: apache
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: aptcacher
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: aptly
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: artifactory
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: avinetworks
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: auditd
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: backupninja
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: barbican
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: baremetal-simulator
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: billometer
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: bind
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: bird
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: cadf
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: calico
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: cassandra
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: ccp
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: ceilometer
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: ceph
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: chrony
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: cinder
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: collectd
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: debmirror
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: dekapod
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: devops-portal
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: docker
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: dogtag
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: dovecot
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: elasticsearch
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: etcd
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: fluentbit
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: fluentd
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: foreman
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: freeipa
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: galera
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: gerrit
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: git
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: gitlab
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: glance
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: glusterfs
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: gnocchi
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: grafana
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: graphite
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: haproxy
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: heat
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: heka
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: heketi
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: helm
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: horizon
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: influxdb
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: iptables
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: ironic
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: isc-dhcp
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: java
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: jenkins
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: kedb
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: keepalived
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: keystone
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: kibana
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: kubernetes
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: letsencrypt
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: libvirt
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: linux
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: lldp
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: logrotate
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: maas
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: magnum
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: manila
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: memcached
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: mirascan
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: midonet
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: monasca
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: mongodb
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: murano
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: mysql
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: nagios
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: network
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: neutron
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: nfs
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: nginx
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: nodejs
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: nova
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: ntp
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: octavia
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: opencontrail
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: openldap
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: openssh
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: openvpn
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: openvstorage
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: oslo-templates
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: owncloud
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: panko
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: postfix
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: postgresql
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: powerdns
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: pritunl
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: prometheus
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: python
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: rabbitmq
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: reclass
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: redis
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: roundcube
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: rsync
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: rsyslog
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: rundeck
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: runtest
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: sahara
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: salt
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: sensu
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: sentry
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: shibboleth
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: sphinx
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: spinnaker
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: statsd
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: supervisor
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: swift
-              branches: ${_param:salt_formulas_extra_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: taiga
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: telegraf
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: tinyproxy
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: varnish
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: watchdog
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: xtrabackup
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-            - name: zookeeper
-              branches: ${_param:salt_formulas_branches}
-              notification_recipients: ${_param:salt_formulas_notification_recipients}
-          template:
-            description: ${_param:job_description_2way}
-            discard:
-              build:
-                keep_num: 10
-              artifact:
-                keep_num: 10
-            type: workflow-scm
-            concurrent: false
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: git-mirror-2way-pipeline.groovy
-              github:
-                url: "https://github.com/salt-formulas/salt-formula-{{name}}"
-            trigger:
-              github:
-              pollscm:
-                spec: ${_param:jenkins_pollscm_spec}
-              gerrit:
-                project:
-                  salt-formulas/{{name}}:
-                    branches:
-                      - master
-                event:
-                  ref:
-                    - updated
-            param:
-              SOURCE_URL:
-                type: string
-                default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}.git"
-              TARGET_URL:
-                type: string
-                default: "git@github.com:salt-formulas/salt-formula-{{name}}.git"
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
-              BRANCHES:
-                type: string
-                default: "{{branches}}"
-              NOTIFICATION_RECIPIENTS:
-                type: string
-                default: "{{notification_recipients}}"
-      job:
-        git-mirror-2way-salt-formulas-scripts:
-          description: ${_param:job_description_2way}
-          discard:
-            build:
-              keep_num: 10
-            artifact:
-              keep_num: 10
-          type: workflow-scm
-          concurrent: false
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: git-mirror-2way-pipeline.groovy
-            github:
-              url: "https://github.com/salt-formulas/salt-formulas-scripts"
-          trigger:
-            github:
-            pollscm:
-              spec: ${_param:jenkins_pollscm_spec}
-          param:
-            SOURCE_URL:
-              type: string
-              default: "${_param:jenkins_gerrit_url}/salt-formulas/salt-formulas-scripts.git"
-            TARGET_URL:
-              type: string
-              default: "git@github.com:salt-formulas/salt-formulas-scripts.git"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
-            BRANCHES:
-              type: string
-              default: "master,release/2018.8.1"
-        git-mirror-2way-salt-formulas-cookiecutter:
-          description: ${_param:job_description_2way}
-          discard:
-            build:
-              keep_num: 10
-            artifact:
-              keep_num: 10
-          type: workflow-scm
-          concurrent: false
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: git-mirror-2way-pipeline.groovy
-            github:
-              url: "https://github.com/salt-formulas/salt-formulas-cookiecutter"
-          trigger:
-            github:
-            pollscm:
-              spec: ${_param:jenkins_pollscm_spec}
-          param:
-            SOURCE_URL:
-              type: string
-              default: "${_param:jenkins_gerrit_url}/salt-formulas/cookiecutter-salt-formula"
-            TARGET_URL:
-              type: string
-              default: "git@github.com:salt-formulas/cookiecutter-salt-formula"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
-            BRANCHES:
-              type: string
-              default: "master"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/init.yml b/jenkins/client/job/salt-formulas/git-mirrors/init.yml
index 676fe4e..a713427 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/init.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/init.yml
@@ -1,7 +1,2 @@
-classes:
-  - system.jenkins.client.job.salt-formulas.git-mirrors.2way
-parameters:
-  _param:
-    salt_formulas_branches: "master"
-    salt_formulas_extra_branches: "master,debian/xenial,debian/trusty"
-    salt_formulas_notification_recipients: "ci-notifications@mirantis.com"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/init.yml b/jenkins/client/job/salt-formulas/init.yml
index 8c8c2e2..a713427 100644
--- a/jenkins/client/job/salt-formulas/init.yml
+++ b/jenkins/client/job/salt-formulas/init.yml
@@ -1,17 +1,2 @@
-classes:
-  - system.jenkins.client.job.salt-formulas.git-mirrors
-  - system.jenkins.client.job.salt-formulas.tests
-  - system.jenkins.client.job.salt-formulas.release
-parameters:
-  jenkins:
-    client:
-      view:
-        "Salt formulas":
-          enabled: true
-          type: CategorizedJobsView
-          include_regex: "build-debian-salt-formula-.*"
-          categories:
-            - group_regex: ".*-ubuntu-trusty"
-              naming_rule: "Ubuntu Trusty"
-            - group_regex: ".*-ubuntu-xenial"
-              naming_rule: "Ubuntu Xenial"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/release.yml b/jenkins/client/job/salt-formulas/release.yml
index eca83f6..a713427 100644
--- a/jenkins/client/job/salt-formulas/release.yml
+++ b/jenkins/client/job/salt-formulas/release.yml
@@ -1,32 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      job:
-        release-salt-formulas:
-          type: workflow-scm
-          concurrent: false
-          discard:
-            build:
-              keep_num: 10
-            artifact:
-              keep_num: 10
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: release-salt-formulas-pipeline.groovy
-            github:
-              url: "https://github.com/salt-formulas/salt-formulas"
-          param:
-            TAG:
-              type: string
-            SOURCE_URL:
-              type: string
-              default: "https://github.com/salt-formulas/salt-formulas.git"
-            GERRIT_BASE:
-              type: string
-              default: "${_param:jenkins_gerrit_url}/salt-formulas"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index b5b286d..a713427 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -1,231 +1,2 @@
-parameters:
-  jenkins:
-    client:
-      job_template:
-        test-salt-formula:
-          name: test-salt-formula-{{name}}-latest
-          jobs:
-            - name: aodh
-            - name: apache
-            - name: aptcacher
-            - name: aptly
-            - name: artifactory
-            - name: auditd
-            - name: avinetworks
-            - name: backupninja
-            - name: barbican
-            - name: baremetal-simulator
-            - name: billometer
-            - name: bind
-            - name: bird
-            - name: cadf
-            - name: calico
-            - name: cassandra
-            - name: ccp
-            - name: ceilometer
-            - name: ceph
-            - name: chrony
-            - name: cinder
-            - name: collectd
-            - name: designate
-            - name: debmirror
-            - name: dekapod
-            - name: devops-portal
-            - name: docker
-            - name: dogtag
-            - name: dovecot
-            - name: elasticsearch
-            - name: etcd
-            - name: fluentbit
-            - name: fluentd
-            - name: foreman
-            - name: freeipa
-            - name: galera
-            - name: gerrit
-            - name: git
-            - name: gitlab
-            - name: glance
-            - name: glusterfs
-            - name: gnocchi
-            - name: grafana
-            - name: graphite
-            - name: haproxy
-            - name: heat
-            - name: heka
-            - name: heketi
-            - name: helm
-            - name: horizon
-            - name: hubble
-            - name: influxdb
-            - name: iptables
-            - name: ironic
-            - name: isc-dhcp
-            - name: java
-            - name: jenkins
-            - name: kedb
-            - name: keepalived
-            - name: keycloak
-            - name: keystone
-            - name: kibana
-            - name: kubernetes
-            - name: letsencrypt
-            - name: libvirt
-            - name: linux
-            - name: lldp
-            - name: logrotate
-            - name: maas
-            - name: magnum
-            - name: manila
-            - name: memcached
-            - name: midonet
-            - name: mirascan
-            - name: monasca
-            - name: mongodb
-            - name: murano
-            - name: mysql
-            - name: nagios
-            - name: network
-            - name: neutron
-            - name: nfs
-            - name: nginx
-            - name: nodejs
-            - name: nova
-            - name: ntp
-            - name: octavia
-            - name: opencontrail
-            - name: openldap
-            - name: openscap
-            - name: openssh
-            - name: openvpn
-            - name: openvstorage
-            - name: oslo-templates
-            - name: owncloud
-            - name: panko
-            - name: postfix
-            - name: postgresql
-            - name: powerdns
-            - name: pritunl
-            - name: prometheus
-            - name: python
-            - name: rabbitmq
-            - name: reclass
-            - name: redis
-            - name: roundcube
-            - name: rsync
-            - name: rsyslog
-            - name: rundeck
-            - name: runtest
-            - name: sahara
-            - name: salt
-            - name: sensu
-            - name: sentry
-            - name: shibboleth
-            - name: sphinx
-            - name: spinnaker
-            - name: statsd
-            - name: supervisor
-            - name: swift
-            - name: taiga
-            - name: telegraf
-            - name: tinyproxy
-            - name: tftpd-hpa
-            - name: varnish
-            - name: watchdog
-            - name: xtrabackup
-            - name: zookeeper
-          template:
-            discard:
-              build:
-                keep_num: 25
-              artifact:
-                keep_num: 25
-            type: workflow-scm
-            concurrent: true
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: test-salt-formulas-pipeline.groovy
-            trigger:
-              gerrit:
-                project:
-                  salt-formulas/{{name}}:
-                    branches:
-                      - master
-                      - '2018.8.1'
-                event:
-                  comment:
-                    - addedContains:
-                        commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
-            param:
-              SALT_VERSION:
-                type: string
-                default: "2017.7.7"
-                description: "Version of salt for use in test, empty string means latest (default)"
-              SALT_OPTS:
-                type: string
-                default: "--force-color"
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
-              DEFAULT_GIT_URL:
-                type: string
-                description: "Run against alternate system reclass"
-                default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}"
-              DEFAULT_GIT_REF:
-                type: string
-                default: master
-              CUSTOM_KITCHEN_ENVS:
-                type: text
-              PARALLEL_GROUP_SIZE:
-                type: string
-                default: "8"
-              RUN_TEST_IN_DOCKER:
-                type: boolean
-                description: "Run test stage in docker environment"
-                default: 'true'
-              SMOKE_TEST_DOCKER_IMG:
-                type: string
-                default: "ubuntu:16.04"
-      job:
-        test-salt-formulas-env:
-          name: test-salt-formulas-env
-          discard:
-            build:
-              keep_num: 1000
-            artifact:
-              keep_num: 10
-          type: workflow-scm
-          concurrent: true
-          plugin_properties:
-            throttleconcurrents:
-              enabled: true
-              throttle_option: category
-              categories:
-                - test-formula
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: test-salt-formulas-env.groovy
-          param:
-            SALT_VERSION:
-              type: string
-              default: "latest"
-            SALT_OPTS:
-              type: string
-              default: "--force-color"
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
-            DEFAULT_GIT_URL:
-              type: string
-              description: "Run against alternate system reclass"
-              default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}"
-            DEFAULT_GIT_REF:
-              type: string
-              default: master
-            KITCHEN_ENV:
-              type: text
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 73f815d..783be95 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -20,20 +20,21 @@
               type: git
               url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
               branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "jenkins-mk"
+              credentials: "gerrit"
               script: generate-cookiecutter-products.groovy
             param:
               # Cookiecutter
               COOKIECUTTER_TEMPLATE_CONTEXT:
                 type: text
-
               # Other
               EMAIL_ADDRESS:
                 type: string
               TEST_MODEL:
                 type: boolean
                 default: true
-              RECLASS_VERSION:
+              DISTRIB_REVISION:
                 type: string
-                default: 'v1.5.4'
-                description: "Version (branch) of Reclass we will use.pip+git package"
+                default: 'proposed'
+                description: |-
+                    "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
+
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index ec0792e..e9ba541 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -51,9 +51,6 @@
               FORMULAS_SOURCE:
                 type: string
                 default: "{{formulas_src}}"
-              FORMULAS_REVISION:
-                type: string
-                default: "{{formulas_revision}}"
               SYSTEM_GIT_URL:
                 type: string
                 default: ""
@@ -63,9 +60,9 @@
               CONFIG_NODE_NAME_PATTERN:
                 type: string
                 default: "{{config_node_name}}"
-              RECLASS_VERSION:
+              DISTRIB_REVISION:
                 type: string
-                default: "master"
+                default: "{{distrib_revision}}"
               MAX_CPU_PER_JOB:
                 type: string
                 default: "2"
@@ -157,9 +154,11 @@
               FORMULAS_SOURCE:
                 type: string
                 default: "{{formulas_src}}"
-              FORMULAS_REVISION:
+              DISTRIB_REVISION:
                 type: string
-                default: "{{formulas_revision}}"
+                default: "{{distrib_revision}}"
+                description: |-
+                    "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
               SYSTEM_GIT_URL:
                 type: string
                 default: ""
@@ -175,10 +174,6 @@
               RECLASS_IGNORE_CLASS_NOTFOUND:
                 type: boolean
                 default: "{{reclass_ignore_class_notfound}}"
-              RECLASS_VERSION:
-                type: string
-                default: "master"
-                description: "Version (branch) of Reclass we will use"
               LEGACY_TEST_MODE:
                 type: boolean
                 default: "{{legacy_test_mode}}"
@@ -250,7 +245,7 @@
               type: git
               url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
               branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "jenkins-mk"
+              credentials: "gerrit"
               script: test-cookiecutter-reclass.groovy
             trigger:
               gerrit:
@@ -290,11 +285,8 @@
               DISTRIB_REVISION:
                 type: string
                 default: 'nightly'
-                description: "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env"
-              RECLASS_VERSION:
-                type: string
-                default: 'v1.5.4'
-                description: "Version (branch) of reclass PACKAGE we will use"
+                description: |-
+                    "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
               CREDENTIALS_ID:
                 type: string
                 default: gerrit
@@ -343,23 +335,17 @@
             FORMULAS_SOURCE:
               type: string
               default: "pkg"
-            FORMULAS_REVISION:
-              type: string
-              default: "stable"
             SYSTEM_GIT_URL:
               type: string
               default: ""
             SYSTEM_GIT_REF:
               type: string
               default: ""
-            RECLASS_VERSION:
+            DISTRIB_REVISION:
               type: string
-              # In our repos the latest reclass we using is 1.4.1. The new version 1.5.2 is not compatible
-              # by syntax with 1.4.1 more details may be found here PROD-20425.
-              # Run rendering tests against version we using on customer side, until new version of reclass is
-              # packaged and placed to our repos, so we can do smooth transition to new syntax.
-              default: "reclass-1.4.1"
-              description: "Version (branch) of Reclass we will use"
+              default: 'stable'
+              description: |-
+                  "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
             MAX_CPU_PER_JOB:
               type: string
               default: "2"
diff --git a/jenkins/client/job/security/openscap.yml b/jenkins/client/job/security/openscap.yml
index 7bedf61..b98e497 100644
--- a/jenkins/client/job/security/openscap.yml
+++ b/jenkins/client/job/security/openscap.yml
@@ -21,6 +21,12 @@
             credentials: "gerrit"
             script: test-openscap-pipeline.groovy
           param:
+            OPENSCAP_TEST_TYPE:
+              type: choice
+              description: "Type of tests to run"
+              choices:
+                - xccdf
+                - oval
             DASHBOARD_API_URL:
               type: string
               default: ""
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index 4d661da..2500254 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -1,65 +1,2 @@
-parameters:
-  _param:
-    mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
-  jenkins:
-    client:
-      job_template:
-        test-pipelines:
-          name: test-{{name}}
-          jobs:
-            - name: mk-mk-pipelines
-              repo: mk/mk-pipelines
-            - name: mcp-ci-pipeline-library
-              repo: mcp-ci/pipeline-library
-            - name: oss-jenkins-pipelines
-              repo: oss/jenkins/pipelines
-            - name: map-map-pipelines
-              repo: map/map-pipelines
-          template:
-            discard:
-              build:
-                keep_num: 25
-              artifact:
-                keep_num: 25
-            type: workflow-scm
-            concurrent: true
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              branch: "${_param:jenkins_pipelines_branch}"
-              credentials: "gerrit"
-              script: test-groovy-pipeline.groovy
-            trigger:
-              gerrit:
-                project:
-                  "{{repo}}":
-                    branches:
-                      - master
-                      - compare_type: ANT
-                        name: release/*
-                event:
-                  patchset:
-                    - created:
-                        excludeDrafts: false
-                        excludeTrivialRebase: false
-                        excludeNoCodeChange: false
-                  comment:
-                    - addedContains:
-                        commentAddedCommentContains: '(recheck|reverify)'
-            param:
-              CREDENTIALS_ID:
-                type: string
-                default: "gerrit"
-              GRADLE_IMAGE:
-                type: string
-                default: "${_param:mcp_docker_registry}/mirantis/cicd/niaquinto_gradle"
-              GRADLE_CMD:
-                type: string
-                default: "check --info"
-              DEFAULT_GIT_URL:
-                  type: string
-                  description: "Run against alternate system reclass"
-                  default: "${_param:jenkins_gerrit_url}/{{repo}}"
-              DEFAULT_GIT_REF:
-                  type: string
-                  default: master
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index c0ebf40..03082ac 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -2,7 +2,6 @@
   _param:
     jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
     cvp_sanity_default_repo: "https://github.com/Mirantis/cvp-sanity-checks"
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
   jenkins:
     client:
       view:
@@ -198,6 +197,14 @@
             credentials: "gerrit"
             script: cvp-runner.groovy
           param:
+            DEBUG_MODE:
+              type: boolean
+              default: 'false'
+              description: Enable if you need to keep container after the test and debug
+            IMAGE:
+              type: string
+              default: 'cvp-sanity-checks'
+              description: Docker image with tests and all pip dependecies to use for testing
             SALT_MASTER_URL:
               type: string
               default: "${_param:jenkins_salt_api_url}"
@@ -255,7 +262,7 @@
               description: Credentials to the Salt API
             TEST_IMAGE:
               type: string
-              default: "xrally/xrally-openstack:0.9.2"
+              default: "xrally/xrally-openstack:0.10.1"
               description: Docker image to use for running Rally/Tempest
             TARGET_NODE:
               type: string
@@ -314,7 +321,7 @@
               description: Node where container with tempest will be run
             TEST_IMAGE:
               type: string
-              default: "xrally/xrally-openstack:0.9.2"
+              default: "xrally/xrally-openstack:0.10.1"
               description: Docker image to use for running Rally/Tempest
             TARGET_NODES:
               type: string
@@ -378,7 +385,7 @@
               description: Path to scenario file in container
             TEST_IMAGE:
               type: string
-              default: "xrally/xrally-openstack:0.9.2"
+              default: "xrally/xrally-openstack:0.10.1"
               description: Docker image to use for running Rally/Tempest
             SALT_MASTER_URL:
               type: string
@@ -415,7 +422,7 @@
             url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
             branch: "${_param:jenkins_pipelines_branch}"
             credentials: "gerrit"
-            script: cvp-runner.groovy
+            script: cvp-stacklight.groovy
           param:
             SALT_MASTER_URL:
               type: string
@@ -455,8 +462,16 @@
             url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
             branch: "${_param:jenkins_pipelines_branch}"
             credentials: "gerrit"
-            script: cvp-spt.groovy
+            script: cvp-runner.groovy
           param:
+            DEBUG_MODE:
+              type: boolean
+              default: 'false'
+              description: Enable if you need to keep container after the test and debug
+            IMAGE:
+              type: string
+              default: 'cvp-spt'
+              description: Docker image with tests and all pip dependecies to use for testing
             SALT_MASTER_URL:
               type: string
               default: "${_param:jenkins_salt_api_url}"
diff --git a/keystone/client/service/contrail.yml b/keystone/client/service/contrail.yml
new file mode 100644
index 0000000..91c925e
--- /dev/null
+++ b/keystone/client/service/contrail.yml
@@ -0,0 +1,28 @@
+classes:
+- system.keystone.client.v3.service.contrail
+parameters:
+  _param:
+    cluster_public_protocol: https
+    contrail_service_protocol: http
+  keystone:
+    client:
+      server:
+        identity:
+          service:
+            opencontrail:
+              type: contrail
+              description: OpenContrail API
+              endpoints:
+              - region: ${_param:openstack_region}
+                public_protocol: ${_param:cluster_public_protocol}
+                public_address: ${_param:cluster_public_host}
+                public_port: 8082
+                public_path: ''
+                internal_protocol: ${_param:contrail_service_protocol}
+                internal_address: ${_param:opencontrail_control_address}
+                internal_port: 8082
+                internal_path: ''
+                admin_protocol: ${_param:contrail_service_protocol}
+                admin_address: ${_param:opencontrail_control_address}
+                admin_port: 8082
+                admin_path: ''
\ No newline at end of file
diff --git a/keystone/client/v3/service/contrail.yml b/keystone/client/v3/service/contrail.yml
new file mode 100644
index 0000000..a43f222
--- /dev/null
+++ b/keystone/client/v3/service/contrail.yml
@@ -0,0 +1,24 @@
+parameters:
+  _param:
+    cluster_public_protocol: https
+    contrail_service_protocol: http
+  keystone:
+    client:
+      resources:
+        v3:
+          opencontrail:
+            type: contrail
+            description: OpenContrail API
+            endpoints:
+              contrail_public:
+                interface: 'public'
+                url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:8082
+                region: ${_param:openstack_region}
+              contrail_internal:
+                interface: 'internal'
+                url: ${_param:contrail_service_protocol}://${_param:opencontrail_control_address}:8082
+                region: ${_param:openstack_region}
+              contrail_admin:
+                interface: 'admin'
+                url: ${_param:contrail_service_protocol}://${_param:opencontrail_control_address}:8082
+                region: ${_param:openstack_region}
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index a42d3b6..f83b039 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -11,11 +11,6 @@
   _param:
     keystone_tokens_expiration: 3600
     openstack_node_role: primary
-    openstack_mysql_x509_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    galera_ssl_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index 10a5331..cbfeb40 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -13,11 +13,6 @@
     mysql_keystone_password: password
     keystone_tokens_expiration: 3600
     openstack_node_role: primary
-    openstack_mysql_x509_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    galera_ssl_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/kubernetes/common/addons/alertmanager.yml b/kubernetes/common/addons/alertmanager.yml
index c7483cf..dcc6702 100644
--- a/kubernetes/common/addons/alertmanager.yml
+++ b/kubernetes/common/addons/alertmanager.yml
@@ -2,17 +2,14 @@
 - system.prometheus.alertmanager.container
 parameters:
   _param:
-    kubernetes_alertmanager_enabled: false
+    kubernetes_alertmanager_enabled: true
     kubernetes_alertmanager_image: ${_param:mcp_docker_registry}/openstack-docker/alertmanager:2018.8.0
-    kubernetes_alertmanager_namespace: stacklight
-    kubernetes_alertmanager_node_port: 31993
   kubernetes:
     common:
       addons:
         alertmanager:
           enabled: ${_param:kubernetes_alertmanager_enabled}
           image: ${_param:kubernetes_alertmanager_image}
-          namespace: ${_param:kubernetes_alertmanager_namespace}
           dir:
             config: ${_param:prometheus_alertmanager_config_directory}
             data: ${_param:prometheus_alertmanager_data_directory}
@@ -21,4 +18,3 @@
           bind:
             address: ${prometheus:alertmanager:bind:address}
             port: ${prometheus:alertmanager:bind:port}
-            node_port: ${_param:kubernetes_alertmanager_node_port}
diff --git a/kubernetes/common/addons/fluentd.yml b/kubernetes/common/addons/fluentd.yml
index 16a6874..459892c 100644
--- a/kubernetes/common/addons/fluentd.yml
+++ b/kubernetes/common/addons/fluentd.yml
@@ -1,22 +1,19 @@
 parameters:
   _param:
      kubernetes_fluentd_aggregator_image: ${_param:mcp_docker_registry}/mirantis/external/fluentd-kubernetes-daemonset:stable
-     kubernetes_fluentd_enabled: false
-     kubernetes_fluentd_namespace: stacklight
-     kubernetes_fluentd_aggregator_resources_limits_memory: 500Mi
-     kubernetes_fluentd_aggregator_resources_requests_memory: 500Mi
-     kubernetes_fluentd_aggregator_bind_port: 24224
+     kubernetes_fluentd_enabled: true
+     kubernetes_fluentd_aggregator_resources_limits_memory: 512M
+     kubernetes_fluentd_aggregator_resources_requests_memory: 512M
      kubernetes_fluentd_aggregator_bind_host_port: 31950
      kubernetes_fluentd_aggregator_config_output_es_host: 127.0.0.1
      kubernetes_fluentd_aggregator_config_output_es_port: 9200
      kubernetes_fluentd_aggregator_config_output_es_scheme: http
-     kubernetes_fluentd_aggregator_config_dir: /fluentd/etc
+     kubernetes_fluentd_aggregator_config_output_es_log_level: info
   kubernetes:
     common:
       addons:
         fluentd:
           enabled: ${_param:kubernetes_fluentd_enabled}
-          namespace: ${_param:kubernetes_fluentd_namespace}
           aggregator:
             image: ${_param:kubernetes_fluentd_aggregator_image}
             resources:
@@ -25,12 +22,11 @@
               requests:
                 memory: ${_param:kubernetes_fluentd_aggregator_resources_requests_memory}
             bind:
-              port: ${_param:kubernetes_fluentd_aggregator_bind_port}
               host_port: ${_param:kubernetes_fluentd_aggregator_bind_host_port}
             config:
-              config_dir: ${_param:kubernetes_fluentd_aggregator_config_dir}
               output:
-                es:
+                elasticsearch:
                   host: ${_param:kubernetes_fluentd_aggregator_config_output_es_host}
                   port: ${_param:kubernetes_fluentd_aggregator_config_output_es_port}
                   scheme: ${_param:kubernetes_fluentd_aggregator_config_output_es_scheme}
+                  log_level: ${_param:kubernetes_fluentd_aggregator_config_output_es_log_level}
diff --git a/kubernetes/common/addons/prometheus.yml b/kubernetes/common/addons/prometheus.yml
index 5f5fcea..b7a0090 100644
--- a/kubernetes/common/addons/prometheus.yml
+++ b/kubernetes/common/addons/prometheus.yml
@@ -3,33 +3,24 @@
 parameters:
   _param:
     kubernetes_prometheus_image: ${_param:mcp_docker_registry}/openstack-docker/prometheus:2018.8.0
-    kubernetes_prometheus_enabled: false
-    kubernetes_prometheus_namespace: stacklight
-    kubernetes_prometheus_server_resources_limits_memory: 500M
-    kubernetes_prometheus_server_resources_requests_memory: 500M
-    kubernetes_prometheus_server_bind_host_port: 31990
-    kubernetes_prometheus_server_storage_local_engine: persisted
-    kubernetes_prometheus_server_use_static_datadir: true
+    kubernetes_prometheus_enabled: true
+    kubernetes_prometheus_server_resources_limits_memory: 1G
+    kubernetes_prometheus_server_resources_requests_memory: 1G
   kubernetes:
     common:
       addons:
         prometheus:
           enabled:  ${_param:kubernetes_prometheus_enabled}
-          image: ${_param:kubernetes_prometheus_image}
-          namespace: ${_param:kubernetes_prometheus_namespace}
           server:
+            image: ${_param:kubernetes_prometheus_image}
             bind:
               port: ${prometheus:server:bind:port}
               host: ${prometheus:server:bind:address}
-              host_port: ${_param:kubernetes_prometheus_server_bind_host_port}
             config:
               config_dir: ${prometheus:server:dir:config_in_container}
               host_config_dir: ${prometheus:server:dir:config}
               data_dir: ${_param:prometheus_server_data_directory}
               host_data_dir: ${prometheus:server:dir:data}
-              storage_local_engine: ${_param:kubernetes_prometheus_server_storage_local_engine}
-              storage_local_retention: ${prometheus:server:storage:local:retention}
-              use_static_datadir: ${_param:kubernetes_prometheus_server_use_static_datadir}
             resources:
               limits:
                 memory: ${_param:kubernetes_prometheus_server_resources_limits_memory}
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 1ecec2d..8028f51 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     kubernetes_calico_calicoctl_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
     kubernetes_calico_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
     kubernetes_calico_cni_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
@@ -22,6 +21,7 @@
     kubernetes_coredns_repo: ${_param:mcp_docker_registry}/mirantis/coredns
     kubernetes_ingressnginx_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes-ingress-nginx
     kubernetes_corends_etcd_operator_repo: quay.io/coreos
+    kubernetes_containerd_repo: https://github.com/kubernetes-sigs/cri-tools/releases/download
 
     # component docker images
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
@@ -57,6 +57,8 @@
     kubernetes_coredns_image: ${_param:kubernetes_coredns_repo}/coredns:v1.2.2-12
     kubernetes_ingressnginx_controller_image: ${_param:kubernetes_ingressnginx_repo}/nginx-ingress-controller-amd64:nginx-0.19.0-1
     kubernetes_corends_etcd_operator_image: ${_param:kubernetes_corends_etcd_operator_repo}/etcd-operator:v0.9.2
+    kubernetes_containerd_source: ${_param:kubernetes_containerd_repo}/v1.12.0/crictl-v1.12.0-linux-amd64.tar.gz
+    kubernetes_containerd_source_hash: md5=ff60b9ddfa5617f7ed14b3f3b6a60056
 
     kubelet_fail_on_swap: true
     kubernetes_dashboard_enabled: true
@@ -75,6 +77,7 @@
     kubernetes_sriov_enabled: false
     kubernetes_telegraf_enabled: false
     kubernetes_ingressnginx_enabled: false
+    kubernetes_containerd_enabled: false
 
     kubernetes_ingressnginx_controller_replicas: 1
 
@@ -106,6 +109,11 @@
 
   kubernetes:
     common:
+      containerd:
+        enabled: ${_param:kubernetes_containerd_enabled}
+        crictl:
+          source: ${_param:kubernetes_containerd_source}
+          hash: ${_param:kubernetes_containerd_source_hash}
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
         pause_image: ${_param:kubernetes_pause_image}
diff --git a/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml b/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
index 9b08546..d0c9368 100644
--- a/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
+++ b/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
@@ -1,11 +1,42 @@
 parameters:
   _param:
-    # pub   2048R/4C5289EF 2018-07-25
+    # pub   2048R/1FA22B08 2015-07-21
+    # pub   2048R/4C5289EF 2018-07-25 - pike +
     # https://mirror.mirantis.com
     linux_system_repo_mirror_mirantis_key: |-
         -----BEGIN PGP PUBLIC KEY BLOCK-----
         Version: GnuPG v1
 
+        mQENBFWt8ogBCACtT/j4WMGuhEI486Vv9zVV0GWGefHE5hBlgJSjSgrExLFqQ2Fo
+        ScaABCfvzUeuXHNoh/c2eLjx3YE6oFrdiw5tam0NFlZMM+PSufciTxQz8vrXHGx7
+        VB5rg2TXKoqOv9cW690FsRAeOtKTtBxZvYVTLEPn2GJW09Xy9CBa+n23XBHTBvKs
+        j3hxkn25Oy70Wgxk/BJqpynXGno+NzuAnIbb+f+X7i6fiXwrvtp5zOYOJeUwS+fU
+        IM/mXbetOd/sHtJqc9NUYpTip4nElEqAYRCsXDTbuMNdzSr8VlSMM8b61mBGelLH
+        XJe+EPP+Logc5KXO8adoGgWhqlbD6n7w+ynHABEBAAG0LmZ1ZWwtaW5mcmEgKEV4
+        YW1wbGUga2V5KSA8ZGV2b3BzQG1pcmFudGlzLmNvbT6JATgEEwECACIFAlWt8ogC
+        GwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJELzlzEYfoisIkuQIAJl0cFJ5
+        BSKMXHhRYf0BeDzhdh3pmcOXs/jSznTIxB4OE5OdwrMgKyoIkSIP8AEttvB+BuOv
+        BHmhTL7kvRhP5xiKdbCwmDtoERoaqxhRRbZJcJ+pHvl7mkEu8Gj2KZe2lfE4Z6ZF
+        6q00Gx9HYfse1+VgUR5ymh41nZCvRTNEnYBp1RQcPogiLy2rYvZbxYnUtg4jaD7D
+        vuuEQwrfEHdKFUlWBCIVbl+e3K6ZSniOcqqyHK72/HI0SYuZpGfCzzw5deODcjWm
+        Gz4nZr41cB3eHXkfmG3ngdhmb2MpVr83u+JebOovjzusf71oIdZBTFNYsZNSVKrn
+        l0rrRuDIMHbQMuS5AQ0EVa3yiAEIALZqdLGXSGZAgUXl7zhPH5wnIQtdo6iMIovZ
+        zQNW95RDT2nm/3YddiRy6FuOTbaHXw07D4ZUl4dGVHzEwBllhULxcHV3OOdQ3gVp
+        4mBAZ8kv0EelzqPfDQWR2Cq0hi7IJ4Q4ePpZhQFiasz8qbV7D7CYbZdDAmQKxqAk
+        0XYOjbB3jzB2r6MHflAKmJzTp3+NAE9bDLAwXa0ot2THDbpPdB4R6pxpD6Y3jweW
+        uLUCnIfvyIBwhHobaU28pw/BA+0dkC9jnLnoO+TrzB9YD5839Lc3ctrdPBLiFPMG
+        wdfAVRCyfgLjOyULqjTudx1Mo+Dgz9+xrcTFoehI7UYoZnraEKkAEQEAAYkBHwQY
+        AQIACQUCVa3yiAIbDAAKCRC85cxGH6IrCPH5B/0Uc+OhMSCkRos1Yv5tA4bsEcjt
+        8+sJ2S6pUqCbZxmXpzKspKpnjp3DJjmQKDB2q4UPDVElVDMMdBlstTx1RRZDf8yk
+        nDvRBSzawk7Xhfloro8N2Lxv6gWhhMvHUYItyO6KMbAZuZ2M1I1/OFHG/f//7oPM
+        0QpNbihf+GqE/dWRz9ZDz+xlSFli6AR/3ldq7N6gkCsEFdi3j6ZDf0qLsZpazPUI
+        wiCC/aAYLkRDtTJV1G6EsWijmOTNNlCEFS/XDLQ3N2Ev/1sgAO0AlBMdXqSnqUI1
+        1h/eSKCiGmkwFWlCf/4HnJVP7QpSeRPLyw785Fvt3p9vT+64isZ0ZK6cpcj8
+        =0aQD
+        -----END PGP PUBLIC KEY BLOCK-----
+        -----BEGIN PGP PUBLIC KEY BLOCK-----
+        Version: GnuPG v1
+
         mQENBFtYVY8BCAC3oli93husG0ZVtv/L8I4/bcW60LFCyB0DuwEznGlSaj1fjOQu
         C7QX9wvGRq8mRZ8mfZ6sbxGmgs0LnV5QIBle1l5I3B+AMGksf6UGEWgoN/vq86g+
         0Jg6kJP/D0sjGXvdlfy+bgAqjsx2bWOLjQGtHSIxhe4cE9HPBfMiYsFwGQua3XN3
diff --git a/linux/system/repo/mcp/apt_mirantis/openstack.yml b/linux/system/repo/mcp/apt_mirantis/openstack.yml
index ae259af..c1483ac 100644
--- a/linux/system/repo/mcp/apt_mirantis/openstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/openstack.yml
@@ -1,24 +1,38 @@
 classes:
 - system.linux.system.repo.keystorage.mirantis_com
 parameters:
-  _param:
-    linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
   linux:
     system:
       repo:
         mirantis_openstack:
-          source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/openstack/${_param:openstack_version} ${_param:linux_system_repo_mk_openstack_version} main"
-          architectures: amd64
-          key: ${_param:linux_system_repo_apt_mirantis_key}
+          source: "deb ${_param:linux_system_repo_mirantis_openstack_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mirror_mirantis_key}
+          architectures: ${_param:linux_system_architecture}
+          clean_file: true
           pin:
-          - pin: 'release l=${_param:openstack_version}'
+          - pin: 'release o=Mirantis'
             priority: 1100
             package: '*'
-        mk_openstack:
-          source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
-          architectures: amd64
-          key: ${_param:linux_system_repo_apt_mirantis_key}
-          pin:
-          - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
-            priority: 1100
-            package: '*'
+# DEPRECATED since 2018.10+ release.
+#parameters:
+#  _param:
+#    linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+#  linux:
+#    system:
+#      repo:
+#        mirantis_openstack:
+#          source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/openstack/${_param:openstack_version} ${_param:linux_system_repo_mk_openstack_version} main"
+#          architectures: amd64
+#          key: ${_param:linux_system_repo_apt_mirantis_key}
+#          pin:
+#          - pin: 'release l=${_param:openstack_version}'
+#            priority: 1100
+#            package: '*'
+#        mk_openstack:
+#          source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
+#          architectures: amd64
+#          key: ${_param:linux_system_repo_apt_mirantis_key}
+#          pin:
+#          - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
+#            priority: 1100
+#            package: '*'
diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml
deleted file mode 100644
index 8a9a3a7..0000000
--- a/linux/system/repo/mcp/mirror/v1/openstack.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-classes:
-- system.linux.system.repo.keystorage.mirantis_com
-parameters:
-  linux:
-    system:
-      repo:
-        mirantis_openstack:
-          source: "deb ${_param:linux_system_repo_mirantis_openstack_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
-          key: ${_param:linux_system_repo_mirror_mirantis_key}
-          architectures: ${_param:linux_system_architecture}
-          clean_file: true
-          pin:
-          - pin: 'release o=Mirantis'
-            priority: 1100
-            package: '*'
diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml
new file mode 120000
index 0000000..d53dbf7
--- /dev/null
+++ b/linux/system/repo/mcp/mirror/v1/openstack.yml
@@ -0,0 +1 @@
+../../apt_mirantis/openstack.yml
\ No newline at end of file
diff --git a/linux/system/users/cinder.yml b/linux/system/users/cinder.yml
new file mode 100644
index 0000000..0e915a3
--- /dev/null
+++ b/linux/system/users/cinder.yml
@@ -0,0 +1,18 @@
+parameters:
+  linux:
+    system:
+      user:
+        cinder:
+          enabled: true
+          name: cinder
+          home: /var/lib/cinder
+          uid: 304
+          gid: 304
+          shell: /bin/false
+          system: True
+      group:
+        cinder:
+          enabled: true
+          name: cinder
+          gid: 304
+          system: True
diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index ad1254b..71d848d 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -4,12 +4,7 @@
 - system.salt.minion.cert.rabbitmq.clients.openstack.manila
 parameters:
   _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
     manila_cluster_vip_address: ${_param:cluster_vip_address}
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
     cluster_internal_protocol: 'http'
   manila:
     common:
diff --git a/manila/common/single.yml b/manila/common/single.yml
index c5a6f97..2ff514b 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -4,11 +4,6 @@
 - system.salt.minion.cert.rabbitmq.clients.openstack.manila
 parameters:
   _param:
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
     cluster_internal_protocol: 'http'
   manila:
     common:
diff --git a/neutron/client/service/ironic.yml b/neutron/client/service/ironic.yml
index 6c5744a..e0814cd 100644
--- a/neutron/client/service/ironic.yml
+++ b/neutron/client/service/ironic.yml
@@ -1,11 +1,6 @@
 classes:
 - service.neutron.client
 parameters:
-  _param:
-     # TODO Remove below variables with typo in next release
-     openstack_baremetal_neutron_subnet_cidr: ${_param:openstack_baremeta_neutron_subnet_cidr}
-     openstack_baremetal_neutron_subnet_allocation_start: ${_param:openstack_baremeta_neutron_subnet_allocation_start}
-     openstack_baremetal_neutron_subnet_allocation_end: ${_param:openstack_baremeta_neutron_subnet_allocation_end}
   neutron:
     client:
       server:
diff --git a/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
index 92e3a2e..a9cf9c1 100644
--- a/neutron/compute/cluster.yml
+++ b/neutron/compute/cluster.yml
@@ -7,9 +7,6 @@
     neutron_enable_vlan_aware_vms: False
     neutron_enable_bgp_vpn: False
     neutron_bgp_vpn_driver: bagpipe
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index ceaed1d..52a91ea 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -9,11 +9,6 @@
 parameters:
   _param:
     cluster_internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    galera_ssl_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 27d16e1..40bdea3 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -6,11 +6,6 @@
 parameters:
   _param:
     internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    galera_ssl_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index 03ab583..8f84fa1 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -5,9 +5,6 @@
   _param:
     neutron_enable_qos: False
     neutron_enable_vlan_aware_vms: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       kernel:
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index b281f4d..3a1314d 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -37,9 +37,6 @@
       SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
       -----END RSA PRIVATE KEY-----
     cluster_internal_protocol: 'http'
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   openssh:
     client:
       enabled: True
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index 32d5087..aff1bd3 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -37,9 +37,6 @@
       SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
       -----END RSA PRIVATE KEY-----
     cluster_internal_protocol: 'http'
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   openssh:
     client:
       enabled: True
diff --git a/nova/compute/volume/nfs.yml b/nova/compute/volume/nfs.yml
new file mode 100644
index 0000000..8ff7266
--- /dev/null
+++ b/nova/compute/volume/nfs.yml
@@ -0,0 +1,13 @@
+# (ohryhorov): the class is created to be included in favour of creating
+# user cinder and add user nova to group cinder in all nova-compute nodes
+# if nfs backend is used.
+# PROD-22772
+classes:
+- system.linux.system.users.cinder
+parameters:
+  nova:
+    compute:
+      user:
+        groups:
+          - cinder
+          - libvirtd
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 3f0a644..31f2d6e 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -14,11 +14,6 @@
     nova_disk_allocation_ratio: 1.0
     metadata_password: metadataPass
     cluster_internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 2a28cc7..07c8dc2 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -5,11 +5,6 @@
 parameters:
   _param:
     cluster_internal_protocol: 'http'
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
-    openstack_rabbitmq_x509_enabled: False
-    rabbitmq_ssl_enabled: False
-    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
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/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index b779aed..bfdbadb 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -6,7 +6,6 @@
 - system.haproxy.proxy.listen.opencontrail.analytics
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     opencontrail_kafka_log_cleanup_mtime: '+7'
     opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
     opencontrail_version: 4.0
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index c97196f..381a0d2 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -2,11 +2,10 @@
 - service.haproxy.proxy.single
 - service.keepalived.cluster.single
 - service.opencontrail.control.cluster
-- system.haproxy.proxy.listen.opencontrail.control
+- system.haproxy.proxy.listen.opencontrail.control4_0
 - system.haproxy.proxy.listen.opencontrail.analytics
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     opencontrail_kafka_log_cleanup_mtime: '+7'
     opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
     opencontrail_version: 4.0
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 123392c..8572553 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -2,10 +2,9 @@
 - service.docker.host
 - service.keepalived.cluster.single
 - service.opencontrail.control.control
-- system.haproxy.proxy.listen.opencontrail.control
+- system.haproxy.proxy.listen.opencontrail.control4_0
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     opencontrail_version: 4.0
     linux_repo_contrail_component: oc40
     opencontrail_image_tag: latest
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 9826b28..779d8d0 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -4,7 +4,6 @@
 - service.haproxy.proxy.single
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     opencontrail_kafka_log_cleanup_mtime: '+7'
     opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
     opencontrail_version: 4.0
@@ -46,17 +45,6 @@
             host: ${_param:single_address}
             port: 9100
             params: check inter 2000 rise 2 fall 3
-        contrail_discovery:
-          type: contrail-api
-          service_name: contrail
-          binds:
-          - address: ${_param:single_address}
-            port: 5998
-          servers:
-          - name: ctl01
-            host: ${_param:single_address}
-            port: 9110
-            params: check inter 2000 rise 2 fall 3
         contrail_config_stats:
           type: contrail-config
           service_name: contrail
diff --git a/openscap/server/init.yml b/openscap/server/init.yml
index 0f2a76f..7964aea 100644
--- a/openscap/server/init.yml
+++ b/openscap/server/init.yml
@@ -1,2 +1,8 @@
 classes:
 - service.openscap.cis
+parameters:
+  _param:
+    openscap_enabled: true
+  openscap:
+    service:
+      enabled: ${_param:openscap_enabled}
diff --git a/openssh/server/team/all.yml b/openssh/server/team/all.yml
index ce5270b..e8e25c4 100644
--- a/openssh/server/team/all.yml
+++ b/openssh/server/team/all.yml
@@ -7,6 +7,7 @@
 - system.openssh.server.team.presales
 - system.openssh.server.team.services
 - system.openssh.server.team.stacklight
+- system.openssh.server.team.storage
 - system.openssh.server.team.networking
 - system.openssh.server.team.security
 - system.openssh.server.team.oss_team
diff --git a/openssh/server/team/drivetrain.yml b/openssh/server/team/drivetrain.yml
index 65117cd..7096eb9 100644
--- a/openssh/server/team/drivetrain.yml
+++ b/openssh/server/team/drivetrain.yml
@@ -2,6 +2,7 @@
 - system.openssh.server.team.members.azvyagintsev
 - system.openssh.server.team.members.degorenko
 - system.openssh.server.team.members.iberezovskiy
+- system.openssh.server.team.members.mpolreich
 parameters:
   _param:
     linux_system_user_sudo: true
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/mcp_qa.yml b/openssh/server/team/mcp_qa.yml
index e97e755..634771f 100644
--- a/openssh/server/team/mcp_qa.yml
+++ b/openssh/server/team/mcp_qa.yml
@@ -2,313 +2,34 @@
 - system.linux.system.sudo
 - system.openssh.server.team.members.mshalamov
 - system.openssh.server.team.members.sandriichenko
+- system.openssh.server.team.members.abaraniuk
 - system.openssh.server.team.members.aminasyan
 - system.openssh.server.team.members.imenkov
+- system.openssh.server.team.members.aheczko
+- system.openssh.server.team.members.ddmitriev
+- system.openssh.server.team.members.dkalashnik
+- system.openssh.server.team.members.dtyzhnenko
+- system.openssh.server.team.members.ekhomyakova
+- system.openssh.server.team.members.obutenko
+- system.openssh.server.team.members.sgudz
+- system.openssh.server.team.members.snovikov
+- system.openssh.server.team.members.tleontovich
+- system.openssh.server.team.members.vgusev
+- system.openssh.server.team.members.vnaumov
+- system.openssh.server.team.members.vryzhenkin
+- system.openssh.server.team.members.ylobankov
+# Deprecated users
+- system.openssh.server.team.members.deprecated.ababich
+- system.openssh.server.team.members.deprecated.akalach
+- system.openssh.server.team.members.deprecated.dderyabin
+- system.openssh.server.team.members.deprecated.esikachev
+- system.openssh.server.team.members.deprecated.okosse
+- system.openssh.server.team.members.deprecated.rkhozinov
+- system.openssh.server.team.members.deprecated.rpromyshlennikov
+- system.openssh.server.team.members.deprecated.schipiga
+- system.openssh.server.team.members.deprecated.ssokolov
+- system.openssh.server.team.members.deprecated.yshapovalov
+
 parameters:
   _param:
     linux_system_user_sudo: true
-  linux:
-    system:
-      user:
-        ddmitriev:
-          enabled: true
-          name: ddmitriev
-          sudo: true
-          full_name: Denys Dmytriiev
-          home: /home/ddmitriev
-        dtyzhnenko:
-          enabled: true
-          name: dtyzhnenko
-          sudo: true
-          full_name: Dmitry Tyzhnenko
-          home: /home/dtyzhnenko
-        tleontovich:
-          enabled: true
-          name: tleontovich
-          sudo: true
-          full_name: Tatyanka Leontovich
-          home: /home/tleontovich
-        okosse:
-          enabled: true
-          name: okosse
-          sudo: true
-          full_name: Oleksandr Kosse
-          home: /home/okosse
-        yshapovalov:
-          enabled: true
-          name: yshapovalov
-          sudo: true
-          full_name: Yevgeniy Shapovalov
-          home: /home/yshapovalov
-        dderyabin:
-          enabled: true
-          name: dderyabin
-          sudo: true
-          full_name: Denis Deryabin
-          home: /home/dderyabin
-        ababich:
-          enabled: true
-          name: ababich
-          sudo: true
-          full_name: Anna Babich
-          home: /home/ababich
-        esikachev:
-          enabled: true
-          name: esikachev
-          sudo: true
-          full_name: Evgeny Sikachev
-          home: /home/esikachev
-        akalach:
-          enabled: true
-          name: akalach
-          sudo: true
-          full_name: Andrew Kalach
-          home: /home/akalach
-        aheczko:
-          enabled: true
-          name: aheczko
-          sudo: true
-          full_name: Adam Heczko
-          home: /home/aheczko
-        ssokolov:
-          enabled: true
-          name: ssokolov
-          sudo: true
-          full_name: Sergey Sokolov
-          home: /home/ssokolov
-        schipiga:
-          enabled: true
-          name: schipiga
-          sudo: true
-          full_name: Sergey Chipiga
-          home: /home/schipiga
-        obutenko:
-          enabled: true
-          name: obutenko
-          sudo: true
-          full_name: Oleksii Butenko
-          home: /home/obutenko
-        ylobankov:
-          enabled: true
-          name: ylobankov
-          sudo: true
-          full_name: Yaroslav Lobankov
-          home: /home/ylobankov
-        vryzhenkin:
-          enabled: true
-          name: vryzhenkin
-          sudo: true
-          full_name: Victor Ryzhenkin
-          home: /home/vryzhenkin
-        dkalashnik:
-          enabled: true
-          name: dkalashnik
-          sudo: true
-          full_name: Dmitry Kalashnik
-          home: /home/dkalashnik
-          email: dkalashnik@mirantis.com
-        rpromyshlennikov:
-          enabled: true
-          name: rpromyshlennikov
-          sudo: true
-          full_name: Rodion Promyshlennikov
-          home: /home/rpromyshlennikov
-          email: rpromyshlennikov@mirantis.com
-        vgusev:
-          enabled: true
-          name: vgusev
-          sudo: true
-          full_name: Vitaly Gusev
-          home: /home/vgusev
-          email: vgusev@mirantis.com
-        rkhozinov:
-          enabled: true
-          name: rkhozinov
-          sudo: true
-          full_name: Ruslan Khozinov
-          home: /home/rkhozinov
-          email: rkhozinov@mirantis.com
-        vnaumov:
-          enabled: true
-          name: vnaumov
-          sudo: true
-          full_name: Vlad Naumov
-          home: /home/vnaumov
-          email: vnaumov@mirantis.com
-        ekhomyakova:
-          enabled: true
-          name: ekhomyakova
-          sudo: true
-          full_name: Ekaterina Khomyakova
-          home: /home/ekhomyakova
-          email: ekhomyakova@mirantis.com
-        snovikov:
-          enabled: true
-          name: snovikov
-          sudo: true
-          full_name: Sergey Novikov
-          home: /home/snovikov
-          email: snovikov@mirantis.com
-      group:
-        libvirtd:
-          enabled: true
-          name: libvirtd
-  openssh:
-    server:
-      enabled: true
-      user:
-        ddmitriev:
-          enabled: true
-          public_keys:
-          - ${public_keys:ddmitriev}
-          user: ${linux:system:user:ddmitriev}
-        dtyzhnenko:
-          enabled: true
-          public_keys:
-          - ${public_keys:dtyzhnenko}
-          user: ${linux:system:user:dtyzhnenko}
-        tleontovich:
-          enabled: true
-          public_keys:
-          - ${public_keys:tleontovich}
-          user: ${linux:system:user:tleontovich}
-        okosse:
-          enabled: true
-          public_keys:
-          - ${public_keys:okosse}
-          user: ${linux:system:user:okosse}
-        yshapovalov:
-          enabled: true
-          public_keys:
-          - ${public_keys:yshapovalov}
-          user: ${linux:system:user:yshapovalov}
-        dderyabin:
-          enabled: true
-          public_keys:
-          - ${public_keys:dderyabin}
-          user: ${linux:system:user:dderyabin}
-        ababich:
-          enabled: true
-          public_keys:
-          - ${public_keys:ababich}
-          user: ${linux:system:user:ababich}
-        esikachev:
-          enabled: true
-          public_keys:
-          - ${public_keys:esikachev}
-          user: ${linux:system:user:esikachev}
-        akalach:
-          enabled: true
-          public_keys:
-          - ${public_keys:akalach}
-          user: ${linux:system:user:akalach}
-        aheczko:
-          enabled: true
-          public_keys:
-          - ${public_keys:aheczko}
-          user: ${linux:system:user:aheczko}
-        ssokolov:
-          enabled: true
-          public_keys:
-          - ${public_keys:ssokolov}
-          user: ${linux:system:user:ssokolov}
-        schipiga:
-          enabled: true
-          public_keys:
-          - ${public_keys:schipiga}
-          user: ${linux:system:user:schipiga}
-        obutenko:
-          enabled: true
-          public_keys:
-          - ${public_keys:obutenko}
-          user: ${linux:system:user:obutenko}
-        ylobankov:
-          enabled: true
-          public_keys:
-          - ${public_keys:ylobankov}
-          user: ${linux:system:user:ylobankov}
-        vryzhenkin:
-          enabled: true
-          public_keys:
-          - ${public_keys:vryzhenkin}
-          user: ${linux:system:user:vryzhenkin}
-        dkalashnik:
-          enable: true
-          public_keys:
-          - ${public_keys:dkalashnik}
-          user: ${linux:system:user:dkalashnik}
-        rpromyshlennikov:
-          enable: true
-          public_keys:
-          - ${public_keys:rpromyshlennikov}
-          user: ${linux:system:user:rpromyshlennikov}
-        vgusev:
-          enable: true
-          public_keys:
-          - ${public_keys:vgusev}
-          user: ${linux:system:user:vgusev}
-        rkhozinov:
-          enable: true
-          public_keys:
-          - ${public_keys:rkhozinov}
-          user: ${linux:system:user:rkhozinov}
-        vnaumov:
-          enable: true
-          public_keys:
-          - ${public_keys:vnaumov}
-          user: ${linux:system:user:vnaumov}
-        ekhomyakova:
-          enable: true
-          public_keys:
-          - ${public_keys:ekhomyakova}
-          user: ${linux:system:user:ekhomyakova}
-        snovikov:
-          enable: true
-          public_keys:
-          - ${public_keys:snovikov}
-          user: ${linux:system:user:snovikov}
-  public_keys:
-    ddmitriev:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuD4wJ8hzkchQ0pfgdwWukQyps1xYRfHOsjosmDu/mmgaXVud5mnpwb2q35E2YYTox2mx+ulJqyS+099gz6MPg4P8D5qdMuRbAsJqbceLaaIGQhdT8qgSo7ESrl5pwvYnfWzKLKF0z5s7nrW0nvArC40zhV9o9XpvzzzSFByepWfkwA8ReldGUYVvTKp8YXaCrqEdMZrU42adPM2nl+fYBbGF+h4/Ka247aVjPeER0blV3znFXbv2Kf38G+i/TEGaktgpBdtGGDi1tX2loMypmTJeqZRJnM0Eoly0BnynB7CSxn11eoIXBUe1mVYNqmQd1hw6uh59iymhK5j939v9J ddmitriev@dis_xcom
-    dtyzhnenko:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhf5ysfuTmOO1975vUCag59tL+lQwfmWSQglZvKnMLnhO1P39VXDHCMla0Uh2IXI5abSrsq4xVXNfD3R5cnzPW8rG1h3528tSpszwZp28LSMkMfEZReEWVq2XoseRfzd7b3AaWN283NbQGPL6NRwyg9hLRG5dipdRxnDSutvDg/J4gbzeuS+QjXP6ymIs9vBhrpvHlQ6POI7Zedp2FOmqbGf3OK9wuBkD1Dhf+hTXvFSq1PFxmKB7w5CWvAOGGuapb+IYspPlDwd8lVWbvp+D3DchkhyL36gQyl2In/NKG2NR4z6dETX8JON5OMe0UipeKAsXInoVbyZfs3uZgdKDB dtyzhnenko
-    tleontovich:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLtOIkzqNA3wdLQyQxLRaRwi4oXnRCPCsrn8oaAyxDXHhU3+ATGvXBdbkA6xU3d4hAohru5DwxGzyikzAAtrv79GWA9/ryXPcplmxBiJcN36GyfW6eX89hI1VIJMKMG3cUs0ONf2D+hENhbaO0pu4hNAb5HFcHAuqecQNOFFrJ3RqnWM8RWgJPY3iF1A9JnXwVrUgME962VPlydYvlL5mLk+h+4DgHuPipw/Qana5a2JfdErsPYeAdDwG8frCdA9wvMzVVZv78s0lA6BritQdd0SyZejbOlT9KVHhSOhqnWdCtd8+nZXzXgjV7GAiv7H9yE4Ee6QYSHUQHwJxZs3ZT tleontovich@tleontovich-pc
-    okosse:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmb5FWl6dgK09TmxVYuvmfLyy6G9x2ed6dvXf0kfpMaaP37CST7t0UZ2m23qGF4T0ZGYbCkIdr+6zWG+a5ozuJiqoJwE3dLun8pnCwAjkmUxRyVIi9M6f3us4z+ooBZTBGWTGe7/ryqePpzyAjlw4om23pDTt09YQq5WDirdrFBNJ9ZlTwubbEWMTtHW5XMEui7s1IiggYmHI4cVh0lg7k/neoAk/5ZD9LI9+p2sISCOpD/f7C/BkgVd/4iCFNxXsPmMwRadBVYo8diB0OOekM6qsW5rfPCczCi9oavxjy62Z2XZ6wHPZ3HgeK8MhVJaRGge6zMTnB98aYh9LWfXFv okosse@okosse-pc
-    yshapovalov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWvKNMfHlugrEUMtDDJzZb3T1UzThOp/UtvQvyFTf1rlKN/i14b1cCVmbPaSKR6W4bqZ4YLnRfb5Z66ktEACL02RdC4FkCiGa8yFDAGXLbM2WJhHyA3ksu91z3wK2QRuKJuZuvjmelds1shTK1a31LgTqa7CNPfkfE9h+CsAizZfAhHg1yVqg0/CGKP8+iV8owR5MP9t8+JXTC40G6Qkjzrf/vuA13bT1X+JSWzLoI2OefezZ+X128fLkssPkr4IS1Jg+cbRvSRmGTVjvtk4dnDo3QxF5lUl6JZAUjPslMCxaqDvRFXn86UZ74g6iJ5dZjrU0vn6X+Ov+KVYmZ5znd yshapovalov@ys-pc
-    dderyabin:
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQCljOKDvsoOsQFOsabL68kVTlzZOObP9d13Oqc7Lafew1MJx0uaCjabpfcaSOrLrqYu42akkpnHQ0ypQbzRWDREYWKciKmE1TKzRUTXZIF1FNNoFrDT7FfjrKVP42alk4isB0Yj9mvA6AhJGFM7pAy55dVEII30Rc0wKW6XCBAX8fIq3rHDnDYq7KuaSAtxkqj6u/C9eUcGBB+JIQ0NRhTVyIZlqjNeojXoM7py8pGDnGj54bIbpFtYiLU1hbowKfVVcJgHIE+17KsNvR7HwwZZ5lbUxzrOiOnoBq1JKF15JHQ3el358aKw3Ee7rqmVrHszohEBLfxRbWbACoTUem75 denis@usvbox
-    ababich:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDo2CJRAQeUeZbjDLdcE7GxQM82kL41YIyuOpNbpzFXphK4gljSMoKH9TJRdlx5S/AGDJltosDym9lY7gi3DqW4z/+k9pHBLQSdr4yDp0iCJcZc8LG3KUbZkZwwCYjf8FTz5tAWgS9z8IKNRMcfReJCkeaFI29p0PVgPqchNaQHUG40iiIl51uLsF4pCF2GbF/10drBCubENlWLoGv/+OwiNzeOvGANeX8jBivevfus2hZbTh1Zf8HsXqd5HLTMRn/BJOJRbLFd74BauAY/J/wOM9SJOaFZU201A2eYgMsamXT159O8e1Q5GMtL4uhseXZzQgKwF9tW/EFBDPwXvC+n ababich@ababich-pc
-    esikachev:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9zHSDorWIKSB5QH4y8bcdzsx0yE7cA/Eg3M98+qPkZPAJl1FgFXYo8XcMod52tVDsfap/mLg1k0pwmmocUGSoESAUs7Wdo5wKhRdsEo+SYxjfL3QVIlKpocho7DmBgudkRLk9mjzcjNBdWyuw9dH6/hy+FK77i5xUqIwJR0koc1WcvzyzZcacMZLYG26rxO0CMC9aTWIZcEFrv4hk7CSb+KFNfbvRN0vHjdp31GuEWDVZ6oSv8V5ipGCJS/HCuTzb/Wqjxgwh5OAqZoepdBaiqNhEmLbFBqQ0vtBwTjWixDRLry06s4J5WWFSGu6GrRbgHnd08752o2TiB28Af4F/ esikachev@Evgenys-MacBook-Pro.local
-    akalach:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOGQ6j4Fy1Lm00UihYbmJ88ctLGaVXlSPys8lk1gUsT8lR2oOZvERl8FIsSlN47Z2wbvcTCq3aOlxvuV/UyT8+r8LEGM5Wk1XSsDMRsvc92qfeRQhAJDp8f+2pUkNfc8rXaPKUDkz0iI6iwANOIR+P7Xx11w//0itDBBKX7sEBsxJbSjm6DLyfs1yn6tT5S4kqAcq5jpX3YMH0MqhcWPS0tK1W6QW13KDt317CIWmoVQMvdmzF/QenXIbV6PZjBy2DvkFVOThdH+OZDMgo4mggGqnsokjy6ZjT0LzKAptKrFKd/xRQUUelWY5XvXtH8RxVtg92Xqh2CjdA4OfYPn6x
-    aheczko:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGRD/zStceB/CAJu8bnsWs9VPWY8W1F6fz2AvX2BiyEXCE2W4uMY11In+qHQtIaWeyWVR/XmoCw0mZxk7emTz91Y1FioinEgumkhpNPLY0fPdDHzwu3atCjAc7B3ZCCXusiUC6k99aCa9YXIZ0/0/75kqilRmIcxGeneL9S2+iuFn/HSpNR7IZN03AEzWgIfXEhB4lyNs9n3RHf+XXy2wxAKkcKpMyocEO9gc3uLY5OdUhGFHRKhEZwgz3K6ysDOCIOTkiiJ8KXMM07FIDLjs5pjUjnVkZ1kWq+virLMbhhyCbMR8zrPvWMjP5oYGm9U9aEeUMA5iMCa7K+qs2AM3 adamheczko@Adams-MacBook-Pro.local
-    ssokolov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHuIo/dLh5qt+8jV4UUPqDo6ktJc12HVFg10S3hinjJUlAOxq8554l0LMvxmiZSrIjxGE/qUr8PlRgjLi4x4zQDggBdNGC/S4zcYNEiTQ7HaOFOjEJ0si6ODZfssQsr/A/bXdNOZE/nIZTUhTddJG+3nKUvuPnTeOQLqEOp4IFJwwvwnD2Wo4I1nc6+yDSJLuG8ANLtLlStzpMKr8wHvPWCUcB9B1oeeOVtw9+vEKxuUBkheXnXMh7shiyt4vmaFVbcgcHGPg8DjP8alKeAbIk0AYhiuNHV/rFzL+/kfImS94gU93A8vt0U2vCj8golqt2huxJblKDr4Abq1lDXLwn ssm@n104309
-    schipiga:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDamKTbqCQCGW1JLo+4PgntC1TkRrwbDOELyRVHxAlc56CcJE9QjrNnCOTqvgRoAmIC+P86nzUQxwSREMd0qgVCefAxKQVFVQ38oym9G90TF0nx4fFT3hUhEQwjMBjHhR2Vo+uUwbT2Hg51U1gBPx/WFa0U5Cf7V6+XNJ3r22W4XG8OrbuAoapwl4WN1346HEj3d0U6Z8Unsqjx9pRpZ1eYCeng4emLZ1UOhvLBfw22vSTkujjjRdfY6g52Gv4hRsgsS+JWulO+z/qd1GFcUp9j+yIvur+eeTWHelAbXq4kRNQfQjAs6nMM8Hp8gPa5jLYqMz2GgD96p8wOQCdK2nyL schipiga@mirantis.com
-    obutenko:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1AfAmTtaBkg+8osdkG37KSHGc1r7k0ZWIgTR+COgPBnGGySRFrL3paG8PJ+JaEtZwj0git/Kufr+Mlcdln3x21kI3V4Jol0bgfx3d+AVZ2niyjwEHEl1vN6ffevzJUPVvLlUWlykKrEnGp1+RXKT3MEaoDcexzRLRgZB/FLaX79i1tE/AqB35rH5MZLBGCRYJdisUrpj70UHwIsqgikwr3P/JNr5gJzYTewPM8ls9Y9BtFNbFHmU8L9b8jFjmhOnCJmXXJPoLxQYRX+MQbcov7r2omZ95xulRnJsvY6xY2BSe8FAVmT8UzXnkWi3CrXwqPBdutu9GUCsQmH934vdJ obutenko@obutenko-pc
-    ylobankov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDiBwStgCHjvPFYOAJgFXAFSFZaf57fJoSJV2Ijeg3uC3owsfQCgp6xd0aqSAUPYwnyV88IiDhNESeltJc3HmrA7kHWzziKCe4H7HEIg3IPGUKcnG7HF9izkmVTxqI/sXoyPvFoel5mJhtSes3A8Nk8IfWOexTy8NBfh2Te4PWqsYqEmHn2AdJ4oVBBrRDoxH8jac8vimOCZ742qMvF9lRWtItWatuEA8+moOyzAxLc0k1e7E8Myp37jE7LeXdoCE97rNp3OX7JHnfCYsthbRytA3Xjh8WLTdAaI1RCj0GqnVS3jdPS/Qzreit1gh7c74HWH/h/aj/U2wjHK1X63fJx/ZhzyqCwHjJ3spDPcIZ0tujZhw0ZjD/MiVxRze1EpmVJ3Zt0S6sgrOFXPSeC+3BEW6LD+jVIb33kS5y3bN1CXikv18WdCaLYjOGHolYF18Z5VgrxQh6hq94cSuJCYTDnbhkbww8XXCPiB2JKVF6KlD3MwfqlGKD+pyUWXKF0ZC8J4IO+keMnGGuausOFoRxg0vmpJ0fb0HODGofNIcwqnXSGmTYucBxWVs1Y4vs7NQPNJyzTcXcM8NyPpsG2uy1pwvDo+rTZ/nWFdu1mvW11hfInkNXTXjWljlNwhJCfRyNFvoUbahfRaNaBRIhy4GlGYjAHaMfkdYTYm0Dqt00YjQ== ylobankov@ylobankov
-    vryzhenkin:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDwqFlEKeZDHKPSwIRXN7Bprc9G8HRvuq2ht+XPFixkX3H/GLrsy781PkE9CM3ZVhz7h68Rmyt3n6B1d0ewvcCHj2m/rixJj8rayNOuQN7v8yflTB/iKFZW7BZ9yxu3OSkQScrjQ6YRcifDYBMDFTkMrKsrIkfMBasvOGcK6BoPx1s3diupG8gN0fpGZ/BPIia+mGz+3jRk6aFBI9n5G1bbFikUPonhjlEoHoQv2ngKGvmDr8FWoItuvzQ7HH9mEwRTqVMzCNdeVxvNNNTLJ72ikig1FaCyAxGViVCa2Xidug9iRHE6dUWsqvaxNtXIrGX4E5lvNXHiJYi/mVcQR+Dx freerunner@pegasus
-    dkalashnik:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAyz5ovMK/rRxlhiy7x4dVwFkUqN/hhdVIpsQRQoGgTOjVhH6Y+eTE3si0RRq/HKZMwkcClJIqzMgjoajT5eQQphQrAAn2pwuCyZj0mXJJ1RSXQm+nSnhoqyB1r7Nl3keopgxrDlBLWyvyS3dJM9RJy4TimIwhuSA3qdhmfeqRm5M=
-    rpromyshlennikov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3dCFNCYVxHQQD+/X1JJ9auAzpj15AkEl6yO4lJ1XL43ljxJbzWXXl3RN9vAjiBE1tvxEfuPEIxF7kO2sc1xPKtkw40RIwXrDIGfjlVCaBLtnxCPnCQX349UMSJl/AXpkHqKGVeAW+AO4zbeI8XnS9aDNMuX6ncgrLRMxWCxETL3J/IIE1LZ5v0QvyQBHuJc5jbyODVb4onff296SbjzYm96elJZcRFo4FzFaIcKtis+Sm4+6OAGCNDIXxfB9e5TK579x+L+ci/W1k83Fcz6NpQU/OM1R1CZVMap/Xet424aRMFPmA8sTF4hdYvWd6adBihco2isaW51b1Gkc+K9N9wELiEBMpdKQtqkPOvm98UhoRk7Wp+8+zSamj1uEs/7m6VCGFebq8V3xqTexWH2dCUznxZ5+KS6WLBh+3f4P6wG8VuWfgFjIUf7jjYKjidBXfSXFDxRkhf/LV8V0jLv+Ma1mjKBUX+rk7IFxm0X/PkjqNhVFlg3rH4Wre0+9WdsTCyzWS0HEaTxIKdPtwwULLEiwClO1LLebdlVjx9yhen0czXxMAHONbZeTvxN8ULfei+b7c07oYm16T8T9JAdiWn5nGxiT8TAUrCPBJMpbE4xQJLztYhAbMpfhFSdkKfTotFxTK9AKpTg4TZFY0NYOktFtV2R9ZnzP7hHZDSIg2Bw== rpromyshlennikov@mirantis.com
-    vgusev:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrCyaZjs8hiwx38LfpeQ2z9n9ptwQ7gFrhq2z5sK9q/LQMCubbnp5xhyF0SMY1jmQUewBOKXhnq3QSX+DmtNsnhitnZBw2BE5PBXllCBWMMiWULfAYvB0of728Q3EEjrtyfHkt7o2E+CvreVJcVI4kBwjKh5WpVBZ8mmkW/sexLGMuYu0bUWjCddu6ZlhUa+y14VZKOKp44auemza1VL/UzqOVZkBAfR2gPV2pBG3Im+SlnOlDRxKPEXQbsn3u/sNeZq0wSY++khY86AU7jAKfL2NiNsoA7CyB0jTEKwYO3vOWOhECifZuHwY/TNWyRFWM2ImW3mT9aO7nE4w4jXXJ vgusev@vgusev
-    rkhozinov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCti9e5kyNEtX3MEns+eehUCzaxZmI8FWkWrLeRQY3jLUGzI3+N12tA7gKffczGIDP/ttnDg1hl98Yw28mkrIfYYMwRMqsBkGmYZyu6EXccyde6/5U/dgKVFGYLjWmbAAcaIaO2YoxqUJKvIanfLNHTRI29KwgxpaMCtjB7+jHiw/V0MF2xKi8yJgajZgh8iXPiv50BGjICx1BuqgqZb5jjxouV0FpU28mBOobqtaphOHeFPHk1Uool9MBt+2ocAjLbFhozmx0xryBVG4FGreovK60Zz4PuGCUL98rSTt8fbebfVokqkCG+sjykTcEQ8h5/0BUR4sPXw5mxATHD/AOv rkhozinov@rkhw
-    vnaumov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDno7VX9jiveRCF7d1C/FK24WLZwCArdrBBOQ1uHqpkUfUYtG6vrYgt/K2n2FXoX55lbeoJAwuNC9HviaY+vQAekCI4W2s02iD+j/GRUwitpv+lJZXSmt/q2PgLz3OFUIsJV0EwyNl+bexM4+2jYTmHeDMrXAsHL4I2GUv5sFycA11UhxZ/Qm2QMKlRZhje/IJieX9u2BhgYuPYffASVl4AhwtDagYdqquwUXrfu/dQRt/U9w0Di9alApcyPqiW9LbXUgwha1G9+ScQnxmp8WvmaV8YR+nf2OFxQHvOZPYjCzniRnYpaQUMeUAkJKxDwqR1dAKYnaQY5TfXtFwfzsjN vnaumov@vnaumov
-    ekhomyakova:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEaWwPVtsj39s0A2efRQ1ejL5B7ZetFPmXJDi/8W/gTWIIII3xP750H8QWZfvbjiJ+KBCxOndDL8aL3SHC/iRCvmzrVkgXBgf5J9vTu8uas7BNGf7oiDBuB75fryDtkg57Pam/A47IlgxJTCwYz+ofUGHb6WrWwQ+MUTEWAk9PB+RPyxjwNC4XxEwtULkKQMgFmg52kauESpx0R0ni8/LLKUJucdse7NCcUTvEcafppnXsxdZ640G0K82ADS1neg1CDwdtCPKLG57GZYs4iL3sPcOhQxnVUoONXsRpBD8kQTKOMl5R6hTDJHBd3oimUPEXlPqeb/XeGKatVraRA6nJ ekhomyakova@ekhomyakova
-    snovikov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYj97WGfiL550eVPyQmFyrgpTw61tfins1CpgrZewWqAWJMgYklRdMYl4OReE5UO2po7ag0f/QsOtGU8aQbnxnWUYPZyS3Qk+Bg8OOSBmewPxmT7WH97KdGKBdC9b3xUNFOUXEUOMmOe3jq9YET+xebUnfsA5qwYU5dL9Cb5UAPzVxYI8z5RiaNTo8dtwZr7lbJJRy8YfSWCtiD59vewc6BE2NTUyDjsfmKd9K/IkyKboGU9AC5mLYDsjvWwiGcNdfigRyaYWKmoo7Xhe1W2Og4dpI5pozOwVg7hISW9NRgLXrZP/9me1rFBH7EQjpjO3+Pto1//R3Nx9QLsB59yuj snovikov@snovikov
diff --git a/openssh/server/team/members/abaraniuk.yml b/openssh/server/team/members/abaraniuk.yml
new file mode 100644
index 0000000..a1976fd
--- /dev/null
+++ b/openssh/server/team/members/abaraniuk.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        abaraniuk:
+          email: abaraniuk@mirantis.com
+          enabled: true
+          full_name: Andrew Baraniuk
+          home: /home/abaraniuk
+          name: abaraniuk
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        abaraniuk:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDp/aRUpGHYWbnI57FhMzsLaEM32PkTe20fUbCvo5jOauFTX5pUndZd1v0lSEFOkTEpQ6T/CZWhYU+D5gGzmQPJXt2eOpk5h6KQ7R/koTyjH4Cvc4Q4fLNjltGHcWco3JHhz1ZZ1jGvUGLtoV8+LmYMflN+zwTnugowOE7N7Y+tG73/3gvv/yhNUWlxI4ntUUNGhoppn67AuE0ZUOCbaHHAEmXoRoml3KeAHAVPXq4zXwlN7VVTgcrn1+rRLQZ/Q4KQRid5z0ce3lzGISELQL0qiIV9SrvpYhjSKHqbCWCDejacGzkmjlWG9gqPFXLN6y6xNe24oiZ/OuNcvAONck+x abaraniuk@ab-ub-64-xenial
+          user: ${linux:system:user:abaraniuk}
diff --git a/openssh/server/team/members/achuprin.yml b/openssh/server/team/members/achuprin.yml
index 08edc89..62a3984 100644
--- a/openssh/server/team/members/achuprin.yml
+++ b/openssh/server/team/members/achuprin.yml
@@ -3,18 +3,17 @@
     system:
       user:
         achuprin:
+          email: achuprin@mirantis.com
           enabled: true
-          name: achuprin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Alexey Chuprin
           home: /home/achuprin
-          email: achuprin@mirantis.com
+          name: achuprin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         achuprin:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDho9gTE/kal/lx/edEa073OgsS5Fa+G3ffGUuhPKpqdXp3TfCKchAK1J13TsqW9lLpPLtnDo2OhgJSUwdr0pfNwVEBPldw0KblW/JQIImR/9nojU+IvribDdusRTOJh6i9hSzcLLFtrF8pkZ7S7oyGsOpD7pHoy+qNiDBO1eJ1fkOxkxztpqSjFFg6BaFtA40zLULsqgKIM0EsSgn3vFAQ2zsDWaGynnm/+tQvBj3ogrxblo94uZ+uUK6Z6v+jkZJKA5Nz+w76HAd51A646X3gF05i2LdyPpkWBp0Oqr5PVW66IGfyc+sY0ID35k+wT9tzv/aW4KOFtig5zf/Xv3nDbX0SlIrV5AMzk3pql2aCSE03JSkHb/Gujf1gqQ6ZqqbVFl7CSj2nIZ1DpWhGqw1lF6YH1pf/xbmg7qRAmDCelf/gCZaj9Pe6nA1a6CP5NJt5l3W20blaT5hYxHDqiBPOfTh8YGI16P1p7pV6VfBiQYZk5KGmOqVjIUfQH9axZcOgZjVmrFW8zZCg1VIA4qhYvVfFokL12ty3AiYkdIcDek3GH83LnLrkTX4D6PPzl6lF5f8bAiUfSjH5Yr2EmRxFWizi3LGiNe7QIxVQgB+B71luHG0ymy1Z080XJqZKMs/wosGxOJUiEvjd1i/jkImCNqlta3sBxnjJQRuzX3mUiQ== achuprin@mirantis.com
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDho9gTE/kal/lx/edEa073OgsS5Fa+G3ffGUuhPKpqdXp3TfCKchAK1J13TsqW9lLpPLtnDo2OhgJSUwdr0pfNwVEBPldw0KblW/JQIImR/9nojU+IvribDdusRTOJh6i9hSzcLLFtrF8pkZ7S7oyGsOpD7pHoy+qNiDBO1eJ1fkOxkxztpqSjFFg6BaFtA40zLULsqgKIM0EsSgn3vFAQ2zsDWaGynnm/+tQvBj3ogrxblo94uZ+uUK6Z6v+jkZJKA5Nz+w76HAd51A646X3gF05i2LdyPpkWBp0Oqr5PVW66IGfyc+sY0ID35k+wT9tzv/aW4KOFtig5zf/Xv3nDbX0SlIrV5AMzk3pql2aCSE03JSkHb/Gujf1gqQ6ZqqbVFl7CSj2nIZ1DpWhGqw1lF6YH1pf/xbmg7qRAmDCelf/gCZaj9Pe6nA1a6CP5NJt5l3W20blaT5hYxHDqiBPOfTh8YGI16P1p7pV6VfBiQYZk5KGmOqVjIUfQH9axZcOgZjVmrFW8zZCg1VIA4qhYvVfFokL12ty3AiYkdIcDek3GH83LnLrkTX4D6PPzl6lF5f8bAiUfSjH5Yr2EmRxFWizi3LGiNe7QIxVQgB+B71luHG0ymy1Z080XJqZKMs/wosGxOJUiEvjd1i/jkImCNqlta3sBxnjJQRuzX3mUiQ== achuprin@mirantis.com
           user: ${linux:system:user:achuprin}
diff --git a/openssh/server/team/members/aepifanov.yml b/openssh/server/team/members/aepifanov.yml
index be825bc..902d48f 100644
--- a/openssh/server/team/members/aepifanov.yml
+++ b/openssh/server/team/members/aepifanov.yml
@@ -3,15 +3,14 @@
     system:
       user:
         aepifanov:
+          email: aepifanov@mirantis.com
           enabled: true
-          name: aepifanov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Andrey Epifanov
           home: /home/aepifanov
-          email: aepifanov@mirantis.com
+          name: aepifanov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         aepifanov:
           enabled: true
diff --git a/openssh/server/team/members/ahecko.yml b/openssh/server/team/members/ahecko.yml
index 9b5c6d8..71821ea 100644
--- a/openssh/server/team/members/ahecko.yml
+++ b/openssh/server/team/members/ahecko.yml
@@ -3,18 +3,17 @@
     system:
       user:
         ahecko:
+          email: ahecko@mirantis.com
           enabled: true
-          name: ahecko
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Adam Hecko
           home: /home/ahecko
-          email: ahecko@mirantis.com
+          name: ahecko
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         ahecko:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGRD/zStceB/CAJu8bnsWs9VPWY8W1F6fz2AvX2BiyEXCE2W4uMY11In+qHQtIaWeyWVR/XmoCw0mZxk7emTz91Y1FioinEgumkhpNPLY0fPdDHzwu3atCjAc7B3ZCCXusiUC6k99aCa9YXIZ0/0/75kqilRmIcxGeneL9S2+iuFn/HSpNR7IZN03AEzWgIfXEhB4lyNs9n3RHf+XXy2wxAKkcKpMyocEO9gc3uLY5OdUhGFHRKhEZwgz3K6ysDOCIOTkiiJ8KXMM07FIDLjs5pjUjnVkZ1kWq+virLMbhhyCbMR8zrPvWMjP5oYGm9U9aEeUMA5iMCa7K+qs2AM3 adamheczko@mirantis
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGRD/zStceB/CAJu8bnsWs9VPWY8W1F6fz2AvX2BiyEXCE2W4uMY11In+qHQtIaWeyWVR/XmoCw0mZxk7emTz91Y1FioinEgumkhpNPLY0fPdDHzwu3atCjAc7B3ZCCXusiUC6k99aCa9YXIZ0/0/75kqilRmIcxGeneL9S2+iuFn/HSpNR7IZN03AEzWgIfXEhB4lyNs9n3RHf+XXy2wxAKkcKpMyocEO9gc3uLY5OdUhGFHRKhEZwgz3K6ysDOCIOTkiiJ8KXMM07FIDLjs5pjUjnVkZ1kWq+virLMbhhyCbMR8zrPvWMjP5oYGm9U9aEeUMA5iMCa7K+qs2AM3 adamheczko@mirantis
           user: ${linux:system:user:ahecko}
diff --git a/openssh/server/team/members/aheczko.yml b/openssh/server/team/members/aheczko.yml
new file mode 100644
index 0000000..c1a4741
--- /dev/null
+++ b/openssh/server/team/members/aheczko.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        aheczko:
+          email: aheczko@mirantis.com
+          enabled: true
+          full_name: Adam Heczko
+          home: /home/aheczko
+          name: aheczko
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        aheczko:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGRD/zStceB/CAJu8bnsWs9VPWY8W1F6fz2AvX2BiyEXCE2W4uMY11In+qHQtIaWeyWVR/XmoCw0mZxk7emTz91Y1FioinEgumkhpNPLY0fPdDHzwu3atCjAc7B3ZCCXusiUC6k99aCa9YXIZ0/0/75kqilRmIcxGeneL9S2+iuFn/HSpNR7IZN03AEzWgIfXEhB4lyNs9n3RHf+XXy2wxAKkcKpMyocEO9gc3uLY5OdUhGFHRKhEZwgz3K6ysDOCIOTkiiJ8KXMM07FIDLjs5pjUjnVkZ1kWq+virLMbhhyCbMR8zrPvWMjP5oYGm9U9aEeUMA5iMCa7K+qs2AM3 adamheczko@Adams-MacBook-Pro.local
+          user: ${linux:system:user:aheczko}
diff --git a/openssh/server/team/members/akiseleva.yml b/openssh/server/team/members/akiseleva.yml
index d7e8db0..3f606c6 100644
--- a/openssh/server/team/members/akiseleva.yml
+++ b/openssh/server/team/members/akiseleva.yml
@@ -3,18 +3,17 @@
     system:
       user:
         akiseleva:
+          email: akiseleva@mirantis.com
           enabled: true
-          name: akiseleva
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Alena Kiseleva
           home: /home/akiseleva
-          email: akiseleva@mirantis.com
+          name: akiseleva
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         akiseleva:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyxzlFKlCcfwagnnmCg1r9SUVfAgy/IdPSxsnpELjCRaz3FI66sYa1F1RdZngoXmYxe5qlmkiRQ0rCjIYk12I08du5FJGYQvMttJEgmVeHtFKW0o3uGBIKNJ5nCni3lR8idPTRXqhwdXYeA4A9+COQO4MGcaJZrqHgEviZt4jQrYy90WdqbKTD4meBRy4MC9+TOUs719kTxK54tmMHBq2l/ukmv3FwgtLz2xMeNW7htiS/1rzA9CEerjkvpc0mOxc4DCY4bH8sR2Ts3Y33Rx6aUN8shTij2aX2v8UvUay2JPqQTJicY+IsYl4D8w/XPx00Oj/3b54f6kTLlzzoNDq5 alena@alena-Lenovo-V580c
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyxzlFKlCcfwagnnmCg1r9SUVfAgy/IdPSxsnpELjCRaz3FI66sYa1F1RdZngoXmYxe5qlmkiRQ0rCjIYk12I08du5FJGYQvMttJEgmVeHtFKW0o3uGBIKNJ5nCni3lR8idPTRXqhwdXYeA4A9+COQO4MGcaJZrqHgEviZt4jQrYy90WdqbKTD4meBRy4MC9+TOUs719kTxK54tmMHBq2l/ukmv3FwgtLz2xMeNW7htiS/1rzA9CEerjkvpc0mOxc4DCY4bH8sR2Ts3Y33Rx6aUN8shTij2aX2v8UvUay2JPqQTJicY+IsYl4D8w/XPx00Oj/3b54f6kTLlzzoNDq5 alena@alena-Lenovo-V580c
           user: ${linux:system:user:akiseleva}
diff --git a/openssh/server/team/members/akurenyshev.yml b/openssh/server/team/members/akurenyshev.yml
new file mode 100644
index 0000000..f075d11
--- /dev/null
+++ b/openssh/server/team/members/akurenyshev.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        akurenyshev:
+          enabled: true
+          name: akurenyshev
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Alexander Kurenyshev
+          home: /home/akurenyshev
+          email: akurenyshev@mirantis.com
+  openssh:
+    server:
+      user:
+        akurenyshev:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDss1dA5rxJdgySDys0lJybCeIBT9mMUAV/KN0egSYRMIzAQKuy0Dg/e/HHwjLCeZn6Fjcb/W3+y+FMSmPnbbCLCJ59F4chivyU82iKnSs36BMdlUJH2tw2Bca88PibbE5oG620Qd8WZWZ/q8oN5G7onIx2pGv0SEwLHcGjex6bVPsNAXucn0VZE2SPlmEjWvTVpEWFpTQL1DjF4ARsD+hWm7z49JluG2cr+sfGa3b9M/ci9nMiRXJqMey5pD5xI/npVbwYEwUE7DcxedqmjEuxqZhjvcIAnHHeWz0+vtR/Ng4l1wDEqwJA8OfoXeuGnXEEgjJ9uJe0n8sNVb3dIDED akurenyshev@alex-pc
+          user: ${linux:system:user:akurenyshev}
diff --git a/openssh/server/team/members/aleksandrdobdin.yml b/openssh/server/team/members/aleksandrdobdin.yml
index 34abcf4..4204fc0 100644
--- a/openssh/server/team/members/aleksandrdobdin.yml
+++ b/openssh/server/team/members/aleksandrdobdin.yml
@@ -3,21 +3,17 @@
     system:
       user:
         adobdin:
+          email: adobdin@mirantis.com
           enabled: true
-          name: adobdin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Aleksandr Dobdin
           home: /home/adobdin
-          email: adobdin@mirantis.com
+          name: adobdin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         adobdin:
           enabled: true
-          public_keys: ${public_keys:adobdin}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYuMN95aiH6BDEvPPS2vD7/2/bE0hG6KvfJL4TD3TBs/BGtyeFWUyz25obYxYdyMfzVZIrpv8+Ib1ClREEHiLxOepANvFbw9s2B5SzVoDW8lI0l9hM6jByg4zheoZOOZf4kXQeygoa9fsJi0nB+kLP3oqIiNtKBa/xB2gmBC1O/V3I0lE9lY6Rx9xs6N5+yr+2t1ngIqLMxQRDcahTDp+kMvJeobzsQiQvL7dc6qxeqglGmUwvCXEvZad6Avp6EwEvRl+f7Yy7fTyI5uiOA/SieDRFc//VwzgAy6aXYDVzfdWMFRCDXiV3+p63G23YsnhJXeZM0lb15RKST5E7I5yP
           user: ${linux:system:user:adobdin}
-  public_keys:
-    adobdin:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYuMN95aiH6BDEvPPS2vD7/2/bE0hG6KvfJL4TD3TBs/BGtyeFWUyz25obYxYdyMfzVZIrpv8+Ib1ClREEHiLxOepANvFbw9s2B5SzVoDW8lI0l9hM6jByg4zheoZOOZf4kXQeygoa9fsJi0nB+kLP3oqIiNtKBa/xB2gmBC1O/V3I0lE9lY6Rx9xs6N5+yr+2t1ngIqLMxQRDcahTDp+kMvJeobzsQiQvL7dc6qxeqglGmUwvCXEvZad6Avp6EwEvRl+f7Yy7fTyI5uiOA/SieDRFc//VwzgAy6aXYDVzfdWMFRCDXiV3+p63G23YsnhJXeZM0lb15RKST5E7I5yP
-
diff --git a/openssh/server/team/members/aleksandrrubtsov.yml b/openssh/server/team/members/aleksandrrubtsov.yml
index 93d26df..2d77629 100644
--- a/openssh/server/team/members/aleksandrrubtsov.yml
+++ b/openssh/server/team/members/aleksandrrubtsov.yml
@@ -3,21 +3,17 @@
     system:
       user:
         arubtsov:
+          email: arubtsov@mirantis.com
           enabled: true
-          name: arubtsov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Aleksandr Rubtsov
           home: /home/arubtsov
-          email: arubtsov@mirantis.com
+          name: arubtsov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         arubtsov:
           enabled: true
-          public_keys: ${public_keys:arubtsov}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDceCojbryph3bYRePvIrnS05jyukYkP/ZAgTSuIqn8Lzm7speEnKvoPXz28uc1UklxI125vXwAnrxf/Ogtw0qASJd1NGTk+0Qal+jFdRSamszHvlvEmL0Eh0yFIpDGJQRStXrTdryRumr3g7xF+vFgoh9nlb7vHNj/14PWBWrDNSVCtH2/gskYRVSrydgxpHSi4CA7bRpC0FD3X7fLSnAzDRFld/XPkPxM6Tpg+Dajlk62DzP2cLfM0OAR6PoTu31kT4W4fwnhYwoT0uNwJNQ28uiyHutUwioX3evb0Dys2tSK3w7i7bHpn0PdPClHz/xgg6PB8HdxpMApq/Z56FZx
           user: ${linux:system:user:arubtsov}
-  public_keys:
-    arubtsov:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDceCojbryph3bYRePvIrnS05jyukYkP/ZAgTSuIqn8Lzm7speEnKvoPXz28uc1UklxI125vXwAnrxf/Ogtw0qASJd1NGTk+0Qal+jFdRSamszHvlvEmL0Eh0yFIpDGJQRStXrTdryRumr3g7xF+vFgoh9nlb7vHNj/14PWBWrDNSVCtH2/gskYRVSrydgxpHSi4CA7bRpC0FD3X7fLSnAzDRFld/XPkPxM6Tpg+Dajlk62DzP2cLfM0OAR6PoTu31kT4W4fwnhYwoT0uNwJNQ28uiyHutUwioX3evb0Dys2tSK3w7i7bHpn0PdPClHz/xgg6PB8HdxpMApq/Z56FZx
-
diff --git a/openssh/server/team/members/aminasyan.yml b/openssh/server/team/members/aminasyan.yml
index bf417de..0e189fc 100644
--- a/openssh/server/team/members/aminasyan.yml
+++ b/openssh/server/team/members/aminasyan.yml
@@ -3,19 +3,17 @@
     system:
       user:
         aminasyan:
+          email: aminasyan@mirantis.com
           enabled: true
-          name: aminasyan
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Artem Minasyan
           home: /home/aminasyan
-          email: aminasyan@mirantis.com
+          name: aminasyan
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         aminasyan:
           enabled: true
           public_keys:
-            - 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
+          - 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}
-
diff --git a/openssh/server/team/members/anatoliineliubin.yml b/openssh/server/team/members/anatoliineliubin.yml
index 9d21eb3..23dfe59 100644
--- a/openssh/server/team/members/anatoliineliubin.yml
+++ b/openssh/server/team/members/anatoliineliubin.yml
@@ -3,20 +3,17 @@
     system:
       user:
         aneliubin:
+          email: aneliuubin@mirantis.com
           enabled: true
-          name: aneliubin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Anatolii Neliubin
           home: /home/aneliubin
-          email: aneliuubin@mirantis.com
+          name: aneliubin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         aneliubin:
           enabled: true
-          public_keys: ${public_keys:aneliubin}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCSj7OItCm3z4PerRp+KIh50YpYMzE2QV6xq+PnqrK4otDqjrXWRSEXiimsyWM7s3a9XsgGC9Tc1SUPX2r1ZLsKZUVpP0V8Amz1YTKAw9dJ43rhTMQEIPCsr5Bk3/b/criaWSWly7jsRDonqGor+EJAfQg/mEyYpa04wRZ2TYQKhM0o2mx7BKDV/Xc2QqskT4Vqimp91F/OXwDsLUP+NDSPtyG/AalNBez0p7PDPV1J/S8MipgPUGvQLddvvJ8VYxH66WpNt4IJVrc5YBp0ty8lj+WPFFxgaQ0yWHvjmlatGeAI70F8M/szdbIyn3ph9t7aXaGhOnWumqZkwqSWvY0F aneliuubin@mirantis.com
           user: ${linux:system:user:aneliubin}
-  public_keys:
-    aneliubin:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCSj7OItCm3z4PerRp+KIh50YpYMzE2QV6xq+PnqrK4otDqjrXWRSEXiimsyWM7s3a9XsgGC9Tc1SUPX2r1ZLsKZUVpP0V8Amz1YTKAw9dJ43rhTMQEIPCsr5Bk3/b/criaWSWly7jsRDonqGor+EJAfQg/mEyYpa04wRZ2TYQKhM0o2mx7BKDV/Xc2QqskT4Vqimp91F/OXwDsLUP+NDSPtyG/AalNBez0p7PDPV1J/S8MipgPUGvQLddvvJ8VYxH66WpNt4IJVrc5YBp0ty8lj+WPFFxgaQ0yWHvjmlatGeAI70F8M/szdbIyn3ph9t7aXaGhOnWumqZkwqSWvY0F aneliuubin@mirantis.com
diff --git a/openssh/server/team/members/antonrodionov.yml b/openssh/server/team/members/antonrodionov.yml
index 3be1f17..6357a32 100644
--- a/openssh/server/team/members/antonrodionov.yml
+++ b/openssh/server/team/members/antonrodionov.yml
@@ -3,21 +3,17 @@
     system:
       user:
         arodionov:
+          email: arodionov@mirantis.com
           enabled: true
-          name: arodionov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Anton Rodionov
           home: /home/arodionov
-          email: arodionov@mirantis.com
+          name: arodionov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         arodionov:
           enabled: true
-          public_keys: ${public_keys:arodionov}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDR4n6F0zmhsB3SutXA74bWANA5DZVekZKB50UVuT5aBXDpAiTPWHq+OUmF1Ptmh+T7jSJClHeaPQTcWnN7Z0knKqGNynMsL560Cp6z3cHh40FLodVSCcoHyqPiFS9kGjOsgM5+VsKAUDy9Dgh7lg8YJBVUSnpRu2f3PnLiKTh656oe2+xBHmYWCZEKTS2Qu60e4cDtBvpWbvsB+89FKM5oNArJyd7SQzpuIj071qbQoRla/nG8J2mOZUVCfXGNl6+JsbDxh6C1aeEgyjm5yy3ODpeY2eKMwlaIKoYtzolwshkcJw240q49PKE8OI2gIAt95rVXRuYpC9gm61Wlf91Z
           user: ${linux:system:user:arodionov}
-  public_keys:
-    arodionov:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDR4n6F0zmhsB3SutXA74bWANA5DZVekZKB50UVuT5aBXDpAiTPWHq+OUmF1Ptmh+T7jSJClHeaPQTcWnN7Z0knKqGNynMsL560Cp6z3cHh40FLodVSCcoHyqPiFS9kGjOsgM5+VsKAUDy9Dgh7lg8YJBVUSnpRu2f3PnLiKTh656oe2+xBHmYWCZEKTS2Qu60e4cDtBvpWbvsB+89FKM5oNArJyd7SQzpuIj071qbQoRla/nG8J2mOZUVCfXGNl6+JsbDxh6C1aeEgyjm5yy3ODpeY2eKMwlaIKoYtzolwshkcJw240q49PKE8OI2gIAt95rVXRuYpC9gm61Wlf91Z
-
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/ashestakov.yml b/openssh/server/team/members/ashestakov.yml
index e00e839..f487353 100644
--- a/openssh/server/team/members/ashestakov.yml
+++ b/openssh/server/team/members/ashestakov.yml
@@ -3,18 +3,17 @@
     system:
       user:
         ashestakov:
+          email: ashestakov@mirantis.com
           enabled: true
-          name: ashestakov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Andrey Shestakov
           home: /home/ashestakov
-          email: ashestakov@mirantis.com
+          name: ashestakov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         ashestakov:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClIwlkr2nH8tCa2VnDgYpsVccJ4pX44mEdjt4oYqSdvEzXKaLhkC2vRzZ/DJo+1GjHC1cy6oPq26bo186MZ2/6PBh2gyVR5rRWyOFoNocAUaaEnBxu8TtNewIzrZ9k+telbmzz/PcoXkELLsHjrTPPxGlpI6qmk3WL/vJlXumvlZlv/FUbI8RlMxTuOK3TF5AQBGd3+1UkF+qFcAFGAAVFO0Td69MMQcsIhLCzJ68d7YM60+3z37At0x/URNlRwgf5Wt8NLPUQwo1dCDCK4GSZtqAHzj7IKVyk77twiN0SLQR12eTqUkyEjm6zR6QpZ6mpIbAjRVVFV5W55WTZXpIz
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClIwlkr2nH8tCa2VnDgYpsVccJ4pX44mEdjt4oYqSdvEzXKaLhkC2vRzZ/DJo+1GjHC1cy6oPq26bo186MZ2/6PBh2gyVR5rRWyOFoNocAUaaEnBxu8TtNewIzrZ9k+telbmzz/PcoXkELLsHjrTPPxGlpI6qmk3WL/vJlXumvlZlv/FUbI8RlMxTuOK3TF5AQBGd3+1UkF+qFcAFGAAVFO0Td69MMQcsIhLCzJ68d7YM60+3z37At0x/URNlRwgf5Wt8NLPUQwo1dCDCK4GSZtqAHzj7IKVyk77twiN0SLQR12eTqUkyEjm6zR6QpZ6mpIbAjRVVFV5W55WTZXpIz
           user: ${linux:system:user:ashestakov}
diff --git a/openssh/server/team/members/atengler.yml b/openssh/server/team/members/atengler.yml
index 34ef793..8de0485 100644
--- a/openssh/server/team/members/atengler.yml
+++ b/openssh/server/team/members/atengler.yml
@@ -3,18 +3,17 @@
     system:
       user:
         tux:
+          email: atengler@mirantis.com
           enabled: true
-          name: tux
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Adam Tengler
           home: /home/tux
-          email: atengler@mirantis.com
+          name: tux
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         tux:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXEN5qmte4oMYFCMZtuNzWiu5M32Dp0OsfR1pSz5gMMQF1Sw3xEDXEATEWhyvJTuVtFQasWVcMCYzEPev8H54UK97dLlxHxEDD9PQYY2O+xu/Rq+p/jryJ/T3mO7LDjUUXtHkUnsDZ51G+sFAWktE+FifwrEDmAEnRucLqOzVhehelG73S3uqfxVsPTsW2CcVIZICKtvdODbgAVyCf1LRR0LJv4fXqcyebCbzIrk4NWJhc474TH88niC7PH5VfxSfXZdKoi3yKVMgqdGSUxGhkx3D5CwCR9K+kUnP0rE5GNIqoCiS8iNbWl6POfMPSxH/ckqZN1h8El6SEoPJzVNp9 tux@tux-workbook
-          user: ${linux:system:user:tux}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXEN5qmte4oMYFCMZtuNzWiu5M32Dp0OsfR1pSz5gMMQF1Sw3xEDXEATEWhyvJTuVtFQasWVcMCYzEPev8H54UK97dLlxHxEDD9PQYY2O+xu/Rq+p/jryJ/T3mO7LDjUUXtHkUnsDZ51G+sFAWktE+FifwrEDmAEnRucLqOzVhehelG73S3uqfxVsPTsW2CcVIZICKtvdODbgAVyCf1LRR0LJv4fXqcyebCbzIrk4NWJhc474TH88niC7PH5VfxSfXZdKoi3yKVMgqdGSUxGhkx3D5CwCR9K+kUnP0rE5GNIqoCiS8iNbWl6POfMPSxH/ckqZN1h8El6SEoPJzVNp9 tux@tux-workbook
+          user: ${linux:system:user:tux}
diff --git a/openssh/server/team/members/azvyagintsev.yml b/openssh/server/team/members/azvyagintsev.yml
index c6c62a0..b56b666 100644
--- a/openssh/server/team/members/azvyagintsev.yml
+++ b/openssh/server/team/members/azvyagintsev.yml
@@ -3,18 +3,17 @@
     system:
       user:
         azvyagintsev:
+          email: azvyagintsev@mirantis.com
           enabled: true
-          name: azvyagintsev
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Aleksey Zvyagintsev
           home: /home/azvyagintsev
-          email: azvyagintsev@mirantis.com
+          name: azvyagintsev
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         azvyagintsev:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGmNI+xV2sgIZX6tr5i4eQcxM4rkNoMiFbUuxtZYw5rKci9cSp9C/NC11VnJzpLG3lf11vLwTztlaM7hjdYlKoynpfDhfRhg1p5w/Pd/uoh6bO7KP/r2QuSpVsc6NGAHD2f0qxmrFX81xMG6zq0MCHXc+BGMZTKWAW7dMGsjJUnIa/wv24J25DOILoEBhclGQHx5r7R5ysqSOTdBEgN304KL8XPP+bAwDFTNJIwtfBdNt8jSv6yR2CyfB7t8pqXf93DvwaGBJfuu1r4gljj5ozCyvGExEtRTzvAC+oLq2NIfDOCC3iRWXrls3iDLZYxwm7VLcQSre4Yp6jfp+WuRI7 azvyagintsev@mirantis.com
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGmNI+xV2sgIZX6tr5i4eQcxM4rkNoMiFbUuxtZYw5rKci9cSp9C/NC11VnJzpLG3lf11vLwTztlaM7hjdYlKoynpfDhfRhg1p5w/Pd/uoh6bO7KP/r2QuSpVsc6NGAHD2f0qxmrFX81xMG6zq0MCHXc+BGMZTKWAW7dMGsjJUnIa/wv24J25DOILoEBhclGQHx5r7R5ysqSOTdBEgN304KL8XPP+bAwDFTNJIwtfBdNt8jSv6yR2CyfB7t8pqXf93DvwaGBJfuu1r4gljj5ozCyvGExEtRTzvAC+oLq2NIfDOCC3iRWXrls3iDLZYxwm7VLcQSre4Yp6jfp+WuRI7 azvyagintsev@mirantis.com
           user: ${linux:system:user:azvyagintsev}
diff --git a/openssh/server/team/members/crh.yml b/openssh/server/team/members/crh.yml
index 8179415..39623e6 100644
--- a/openssh/server/team/members/crh.yml
+++ b/openssh/server/team/members/crh.yml
@@ -3,18 +3,17 @@
     system:
       user:
         crh:
+          email: chuebner@mirantis.com
           enabled: true
-          name: crh
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Christian Huebner
           home: /home/crh
-          email: chuebner@mirantis.com
+          name: crh
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         crh:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjW4PSMoILjoZWDM8RnbiW6HXHBFntnDd6jgAlokJhTpYIjzUHpoh/OqphraKbNFnPbzL2nkIbaKZqKj+uuvbsitHnApmdFgSpOmBRGeaSExA30GqweYrIMKN5JAQTbONZWLSm+LD689CXRv2s6Th/YMELYfoi2W0pkvwiBdr+/0NxpdRvJydCn36SE6wOigu4uJXIXeNqIjTD+x4sW6GB54Ugbg+SMmI9D5ONlmfEj8K/ZmG1THdPGOLlquy/VLiuOBuwNoJCBV9shsGEmdg8NiOu8NPupQlsbmClZDbBAklJ0AF6ElAwKSiqCOhbaa7hu4qJFrCKC+XAgYxS9t7r
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjW4PSMoILjoZWDM8RnbiW6HXHBFntnDd6jgAlokJhTpYIjzUHpoh/OqphraKbNFnPbzL2nkIbaKZqKj+uuvbsitHnApmdFgSpOmBRGeaSExA30GqweYrIMKN5JAQTbONZWLSm+LD689CXRv2s6Th/YMELYfoi2W0pkvwiBdr+/0NxpdRvJydCn36SE6wOigu4uJXIXeNqIjTD+x4sW6GB54Ugbg+SMmI9D5ONlmfEj8K/ZmG1THdPGOLlquy/VLiuOBuwNoJCBV9shsGEmdg8NiOu8NPupQlsbmClZDbBAklJ0AF6ElAwKSiqCOhbaa7hu4qJFrCKC+XAgYxS9t7r
           user: ${linux:system:user:crh}
diff --git a/openssh/server/team/members/danilakhmetov.yml b/openssh/server/team/members/danilakhmetov.yml
index 47e38d6..31c07c7 100644
--- a/openssh/server/team/members/danilakhmetov.yml
+++ b/openssh/server/team/members/danilakhmetov.yml
@@ -3,21 +3,17 @@
     system:
       user:
         dakhmetov:
+          email: dakhmetov@mirantis.com
           enabled: true
-          name: dakhmetov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Danil Akhmetov
           home: /home/dakhmetov
-          email: dakhmetov@mirantis.com
+          name: dakhmetov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         dakhmetov:
           enabled: true
-          public_keys: ${public_keys:dakhmetov}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO//KNaUfZIWgwJBQg8us0uFNoiy9xA5DBlhD9r0ZkRyXSBaOLPpcWwOcfV0+W9d7bp5pchbRNjf2Nrajy+zady4qWBSMqonP8PiDfSVPymxjv8d/KwIhnao2Noe1F4fviHU5TBTWwRiBf53NzNd/uO99hXMUshQ6a3GymfVLsMkrymzyOw7UA9Irdf3K/KRQTbmYyu7Kp6EoIh/Mz8/9wHuFHPmj8e9ynw3T/0050BttgTjAlS5e6CJMq585OsbZvW+YA8H3avR7qXMSb6uRsJs3ZOijDtdj0cWVMvseKgfghq7Q57e0TtApbge1R1apz+zmipkMxVrr40cVRcKvB
           user: ${linux:system:user:dakhmetov}
-  public_keys:
-    dakhmetov:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO//KNaUfZIWgwJBQg8us0uFNoiy9xA5DBlhD9r0ZkRyXSBaOLPpcWwOcfV0+W9d7bp5pchbRNjf2Nrajy+zady4qWBSMqonP8PiDfSVPymxjv8d/KwIhnao2Noe1F4fviHU5TBTWwRiBf53NzNd/uO99hXMUshQ6a3GymfVLsMkrymzyOw7UA9Irdf3K/KRQTbmYyu7Kp6EoIh/Mz8/9wHuFHPmj8e9ynw3T/0050BttgTjAlS5e6CJMq585OsbZvW+YA8H3avR7qXMSb6uRsJs3ZOijDtdj0cWVMvseKgfghq7Q57e0TtApbge1R1apz+zmipkMxVrr40cVRcKvB
-
diff --git a/openssh/server/team/members/dcech.yml b/openssh/server/team/members/dcech.yml
index 2d29118..e60e8b0 100644
--- a/openssh/server/team/members/dcech.yml
+++ b/openssh/server/team/members/dcech.yml
@@ -3,18 +3,17 @@
     system:
       user:
         dcech:
+          email: dcech@mirantis.com
           enabled: true
-          name: dcech
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Daniel Cech
           home: /home/dcech
-          email: dcech@mirantis.com
+          name: dcech
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         dcech:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8A26XMLUnXkxv4e/vByD4W4PQ0ZdgGZz5Tg6G/fQKuSa+9zRucG6IlOchJPikwrDyTrojHTGAClHPuyr2bPIRrjFy4oUTZNdjiDptV99Zv/kHRStYzPyZ4KabnFLJVKNtyKKagk6Z3wpzEjFjRHWJK7A5bIzHfd7Amx/frdLKRo9YZjGbLnZRw6mWGqZYyp2/5a/5rKqH1BhMQggDGkAwFGWYQByZzk2F81nDnkt3CY3bi24gX90w4mgFjP8B0m0QCEhcGqpfOKsQTnIyBCtztEHBiUplzBN+RHS4dDOIEs9SWrXLiMFakWu1Vr6bUa7v5xGaNN8XAWjd3xdsy4hvJjJHU5HPaMY9MGH+N6W0UUZxIF0MuxDNP03MDM1uA5mRWTdwffARaDySYaEUrUEYJmzFAtk700Jv/Aav7QixLoIeKU9SAKYvVb7XNlMWgiswQdRPoiMpXPXPw+bMhjpimHJa4n0KFGAUO/cRD1dpJKybqxDe2ip57JzpFkm5PxuNht5qmEreKcS5dWQqm0fDE9wv8cCUMnWQv36f0IDeVpftmeDREatqXSeUjES7NFQOgIQW5C5Pl+8ZHTXw46c/uh89gUILJT2tS/mOXaU4mELox1Qv8vc/laoGAec+TGD0flf75LfiuLOK6JOYX0QVW13ko1wc3CyJzHOi1sFEAw== daniel.cech@tcpcloud.eu
-          user: ${linux:system:user:dcech}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8A26XMLUnXkxv4e/vByD4W4PQ0ZdgGZz5Tg6G/fQKuSa+9zRucG6IlOchJPikwrDyTrojHTGAClHPuyr2bPIRrjFy4oUTZNdjiDptV99Zv/kHRStYzPyZ4KabnFLJVKNtyKKagk6Z3wpzEjFjRHWJK7A5bIzHfd7Amx/frdLKRo9YZjGbLnZRw6mWGqZYyp2/5a/5rKqH1BhMQggDGkAwFGWYQByZzk2F81nDnkt3CY3bi24gX90w4mgFjP8B0m0QCEhcGqpfOKsQTnIyBCtztEHBiUplzBN+RHS4dDOIEs9SWrXLiMFakWu1Vr6bUa7v5xGaNN8XAWjd3xdsy4hvJjJHU5HPaMY9MGH+N6W0UUZxIF0MuxDNP03MDM1uA5mRWTdwffARaDySYaEUrUEYJmzFAtk700Jv/Aav7QixLoIeKU9SAKYvVb7XNlMWgiswQdRPoiMpXPXPw+bMhjpimHJa4n0KFGAUO/cRD1dpJKybqxDe2ip57JzpFkm5PxuNht5qmEreKcS5dWQqm0fDE9wv8cCUMnWQv36f0IDeVpftmeDREatqXSeUjES7NFQOgIQW5C5Pl+8ZHTXw46c/uh89gUILJT2tS/mOXaU4mELox1Qv8vc/laoGAec+TGD0flf75LfiuLOK6JOYX0QVW13ko1wc3CyJzHOi1sFEAw== daniel.cech@tcpcloud.eu
+          user: ${linux:system:user:dcech}
diff --git a/openssh/server/team/members/ddmitriev.yml b/openssh/server/team/members/ddmitriev.yml
new file mode 100644
index 0000000..cc76abd
--- /dev/null
+++ b/openssh/server/team/members/ddmitriev.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        ddmitriev:
+          email: ddmitriev@mirantis.com
+          enabled: true
+          full_name: Denys Dmytriiev
+          home: /home/ddmitriev
+          name: ddmitriev
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        ddmitriev:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuD4wJ8hzkchQ0pfgdwWukQyps1xYRfHOsjosmDu/mmgaXVud5mnpwb2q35E2YYTox2mx+ulJqyS+099gz6MPg4P8D5qdMuRbAsJqbceLaaIGQhdT8qgSo7ESrl5pwvYnfWzKLKF0z5s7nrW0nvArC40zhV9o9XpvzzzSFByepWfkwA8ReldGUYVvTKp8YXaCrqEdMZrU42adPM2nl+fYBbGF+h4/Ka247aVjPeER0blV3znFXbv2Kf38G+i/TEGaktgpBdtGGDi1tX2loMypmTJeqZRJnM0Eoly0BnynB7CSxn11eoIXBUe1mVYNqmQd1hw6uh59iymhK5j939v9J ddmitriev@dis_xcom
+          user: ${linux:system:user:ddmitriev}
diff --git a/openssh/server/team/members/degorenko.yml b/openssh/server/team/members/degorenko.yml
index 2f0d09e..4168cee 100644
--- a/openssh/server/team/members/degorenko.yml
+++ b/openssh/server/team/members/degorenko.yml
@@ -3,18 +3,17 @@
     system:
       user:
         degorenko:
+          email: degorenko@mirantis.com
           enabled: true
-          name: degorenko
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Denis Egorenko
           home: /home/degorenko
-          email: degorenko@mirantis.com
+          name: degorenko
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         degorenko:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBUclrfSgL1AGw8gjjAcfD2XP9beQVRcP+FMTsuro/2UXjNN7fQ9oXm0TbIk5u+hgILrgjOkbxb1K7bYzdS7+zF3cFoK5B8GKaQog/frEZ2Y4NdkyK3nm5RX1NfxguND3pzEhr5tar/gi+C59uNWA70FF6lqi2yzqA6cWsBM4lP8ZVCOoKJpJNbXe8HXNDmHbVLP+kXzG7k0j/ifAHaF4Rsp+r9B7NupA28N0VhOaXooDRt8TrbqVPZRKuk2XIvitiw73b7ZoiErfOarkkAR6vI2pMrJLFiXm1J2kZHf1CLCl2EdVuS2ba7LtQo77Qw++YeYM4zdGQ5Xr+yjztgxXX degorenko
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBUclrfSgL1AGw8gjjAcfD2XP9beQVRcP+FMTsuro/2UXjNN7fQ9oXm0TbIk5u+hgILrgjOkbxb1K7bYzdS7+zF3cFoK5B8GKaQog/frEZ2Y4NdkyK3nm5RX1NfxguND3pzEhr5tar/gi+C59uNWA70FF6lqi2yzqA6cWsBM4lP8ZVCOoKJpJNbXe8HXNDmHbVLP+kXzG7k0j/ifAHaF4Rsp+r9B7NupA28N0VhOaXooDRt8TrbqVPZRKuk2XIvitiw73b7ZoiErfOarkkAR6vI2pMrJLFiXm1J2kZHf1CLCl2EdVuS2ba7LtQo77Qw++YeYM4zdGQ5Xr+yjztgxXX degorenko
           user: ${linux:system:user:degorenko}
diff --git a/openssh/server/team/members/deniskostriukov.yml b/openssh/server/team/members/deniskostriukov.yml
index 26170dc..c564da8 100644
--- a/openssh/server/team/members/deniskostriukov.yml
+++ b/openssh/server/team/members/deniskostriukov.yml
@@ -3,21 +3,17 @@
     system:
       user:
         dkostriukov:
+          email: dkostryukov@mirantis.com
           enabled: true
-          name: dkostriukov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Denis Kostriukov
           home: /home/dkostriukov
-          email: dkostryukov@mirantis.com
+          name: dkostriukov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         dkostriukov:
           enabled: true
-          public_keys: ${public_keys:dkostriukov}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFjDsPP7Y3cvYo6zI/IG3b9qvFK4b1ehoKk16VooobM9gsuD/goKo9sOVt8+kscxzXuynhwDfn9+7r9SAGnhZ2Bp39KjSPzR9LCk4fkByXlusZZLhHK3wVkjA2QOFqGvECTHZp79KBQWkU9VM3N7xNwEHbfz/5iZM7MK2VpsRG/JjJed8ckJQjL0n3gNKDkMvum0MyDz4/YIIlYy7mG2FV55j8HNJidzedlYATfd9j2OtL73lxN7H7gcf6acw76PXOyYU9V/zLd82AIVuR7LgntVt2GxNmaJzaV0ffaJgoTLqPm3KwsCrxlhgOIikARBt+Oc8O0dEucYsPU3dWXNJH
           user: ${linux:system:user:dkostriukov}
-  public_keys:
-    dkostriukov:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFjDsPP7Y3cvYo6zI/IG3b9qvFK4b1ehoKk16VooobM9gsuD/goKo9sOVt8+kscxzXuynhwDfn9+7r9SAGnhZ2Bp39KjSPzR9LCk4fkByXlusZZLhHK3wVkjA2QOFqGvECTHZp79KBQWkU9VM3N7xNwEHbfz/5iZM7MK2VpsRG/JjJed8ckJQjL0n3gNKDkMvum0MyDz4/YIIlYy7mG2FV55j8HNJidzedlYATfd9j2OtL73lxN7H7gcf6acw76PXOyYU9V/zLd82AIVuR7LgntVt2GxNmaJzaV0ffaJgoTLqPm3KwsCrxlhgOIikARBt+Oc8O0dEucYsPU3dWXNJH
-
diff --git a/openssh/server/team/members/deprecated/ababich.yml b/openssh/server/team/members/deprecated/ababich.yml
new file mode 100644
index 0000000..506afbf
--- /dev/null
+++ b/openssh/server/team/members/deprecated/ababich.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        ababich:
+          email: deprecated@mirantis.dep
+          enabled: true
+          full_name: Anna Babich
+          home: /home/ababich
+          name: ababich
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        ababich:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDo2CJRAQeUeZbjDLdcE7GxQM82kL41YIyuOpNbpzFXphK4gljSMoKH9TJRdlx5S/AGDJltosDym9lY7gi3DqW4z/+k9pHBLQSdr4yDp0iCJcZc8LG3KUbZkZwwCYjf8FTz5tAWgS9z8IKNRMcfReJCkeaFI29p0PVgPqchNaQHUG40iiIl51uLsF4pCF2GbF/10drBCubENlWLoGv/+OwiNzeOvGANeX8jBivevfus2hZbTh1Zf8HsXqd5HLTMRn/BJOJRbLFd74BauAY/J/wOM9SJOaFZU201A2eYgMsamXT159O8e1Q5GMtL4uhseXZzQgKwF9tW/EFBDPwXvC+n ababich@ababich-pc
+          user: ${linux:system:user:ababich}
diff --git a/openssh/server/team/members/deprecated/akalach.yml b/openssh/server/team/members/deprecated/akalach.yml
new file mode 100644
index 0000000..413c1ac
--- /dev/null
+++ b/openssh/server/team/members/deprecated/akalach.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        akalach:
+          email: deprecated@mirantis.dep
+          enabled: true
+          full_name: Andrew Kalach
+          home: /home/akalach
+          name: akalach
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        akalach:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOGQ6j4Fy1Lm00UihYbmJ88ctLGaVXlSPys8lk1gUsT8lR2oOZvERl8FIsSlN47Z2wbvcTCq3aOlxvuV/UyT8+r8LEGM5Wk1XSsDMRsvc92qfeRQhAJDp8f+2pUkNfc8rXaPKUDkz0iI6iwANOIR+P7Xx11w//0itDBBKX7sEBsxJbSjm6DLyfs1yn6tT5S4kqAcq5jpX3YMH0MqhcWPS0tK1W6QW13KDt317CIWmoVQMvdmzF/QenXIbV6PZjBy2DvkFVOThdH+OZDMgo4mggGqnsokjy6ZjT0LzKAptKrFKd/xRQUUelWY5XvXtH8RxVtg92Xqh2CjdA4OfYPn6x
+          user: ${linux:system:user:akalach}
diff --git a/openssh/server/team/members/deprecated/akholkin.yml b/openssh/server/team/members/deprecated/akholkin.yml
new file mode 100644
index 0000000..bb2650b
--- /dev/null
+++ b/openssh/server/team/members/deprecated/akholkin.yml
@@ -0,0 +1,17 @@
+parameters:
+  linux:
+    system:
+      user:
+        akholkin:
+          enabled: false
+          name: akholkin
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: disabled
+          home: /home/akholkin
+          email: disabled
+  openssh:
+    server:
+      user:
+        akholkin:
+          enabled: false
+          user: ${linux:system:user:akholkin}
diff --git a/openssh/server/team/members/deprecated/bkupidura.yml b/openssh/server/team/members/deprecated/bkupidura.yml
new file mode 100644
index 0000000..d1a20db
--- /dev/null
+++ b/openssh/server/team/members/deprecated/bkupidura.yml
@@ -0,0 +1,17 @@
+parameters:
+  linux:
+    system:
+      user:
+        bkupidura:
+          enabled: false
+          name: bkupidura
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: disabled
+          home: /home/bkupidura
+          email: disabled
+  openssh:
+    server:
+      user:
+        bkupidura:
+          enabled: false
+          user: ${linux:system:user:bkupidura}
diff --git a/openssh/server/team/members/deprecated/dderyabin.yml b/openssh/server/team/members/deprecated/dderyabin.yml
new file mode 100644
index 0000000..5706cc4
--- /dev/null
+++ b/openssh/server/team/members/deprecated/dderyabin.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        dderyabin:
+          email: deprecated@mirantis.dep
+          enabled: true
+          full_name: Denis Deryabin
+          home: /home/dderyabin
+          name: dderyabin
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        dderyabin:
+          enabled: true
+          public_keys:
+          - key: AAAAB3NzaC1yc2EAAAADAQABAAABAQCljOKDvsoOsQFOsabL68kVTlzZOObP9d13Oqc7Lafew1MJx0uaCjabpfcaSOrLrqYu42akkpnHQ0ypQbzRWDREYWKciKmE1TKzRUTXZIF1FNNoFrDT7FfjrKVP42alk4isB0Yj9mvA6AhJGFM7pAy55dVEII30Rc0wKW6XCBAX8fIq3rHDnDYq7KuaSAtxkqj6u/C9eUcGBB+JIQ0NRhTVyIZlqjNeojXoM7py8pGDnGj54bIbpFtYiLU1hbowKfVVcJgHIE+17KsNvR7HwwZZ5lbUxzrOiOnoBq1JKF15JHQ3el358aKw3Ee7rqmVrHszohEBLfxRbWbACoTUem75 denis@usvbox
+          user: ${linux:system:user:dderyabin}
diff --git a/openssh/server/team/members/deprecated/esikachev.yml b/openssh/server/team/members/deprecated/esikachev.yml
new file mode 100644
index 0000000..c0a638b
--- /dev/null
+++ b/openssh/server/team/members/deprecated/esikachev.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        esikachev:
+          email: deprecated@mirantis.dep
+          enabled: true
+          full_name: Evgeny Sikachev
+          home: /home/esikachev
+          name: esikachev
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        esikachev:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9zHSDorWIKSB5QH4y8bcdzsx0yE7cA/Eg3M98+qPkZPAJl1FgFXYo8XcMod52tVDsfap/mLg1k0pwmmocUGSoESAUs7Wdo5wKhRdsEo+SYxjfL3QVIlKpocho7DmBgudkRLk9mjzcjNBdWyuw9dH6/hy+FK77i5xUqIwJR0koc1WcvzyzZcacMZLYG26rxO0CMC9aTWIZcEFrv4hk7CSb+KFNfbvRN0vHjdp31GuEWDVZ6oSv8V5ipGCJS/HCuTzb/Wqjxgwh5OAqZoepdBaiqNhEmLbFBqQ0vtBwTjWixDRLry06s4J5WWFSGu6GrRbgHnd08752o2TiB28Af4F/ esikachev@Evgenys-MacBook-Pro.local
+          user: ${linux:system:user:esikachev}
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/kszukielojc.yml b/openssh/server/team/members/deprecated/kszukielojc.yml
new file mode 100644
index 0000000..3b90674
--- /dev/null
+++ b/openssh/server/team/members/deprecated/kszukielojc.yml
@@ -0,0 +1,17 @@
+parameters:
+  linux:
+    system:
+      user:
+        kszukielojc:
+          enabled: false
+          name: kszukielojc
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: disabled
+          home: /home/kszukielojc
+          email: disabled
+  openssh:
+    server:
+      user:
+        kszukielojc:
+          enabled: false
+          user: ${linux:system:user:kszukielojc}
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/nzaporozhets.yml b/openssh/server/team/members/deprecated/nzaporozhets.yml
new file mode 100644
index 0000000..b4abf5b
--- /dev/null
+++ b/openssh/server/team/members/deprecated/nzaporozhets.yml
@@ -0,0 +1,17 @@
+parameters:
+  linux:
+    system:
+      user:
+        nzaporozhets:
+          enabled: false
+          name: nzaporozhets
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: disabled
+          home: /home/nzaporozhets
+          email: disabled
+  openssh:
+    server:
+      user:
+        nzaporozhets:
+          enabled: false
+          user: ${linux:system:user:nzaporozhets}
diff --git a/openssh/server/team/members/deprecated/obourdon.yml b/openssh/server/team/members/deprecated/obourdon.yml
new file mode 100644
index 0000000..98d5b60
--- /dev/null
+++ b/openssh/server/team/members/deprecated/obourdon.yml
@@ -0,0 +1,17 @@
+parameters:
+  linux:
+    system:
+      user:
+        obourdon:
+          enabled: false
+          name: obourdon
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: disabled
+          home: /home/obourdon
+          email: disabled
+  openssh:
+    server:
+      user:
+        obourdon:
+          enabled: false
+          user: ${linux:system:user:obourdon}
diff --git a/openssh/server/team/members/deprecated/okosse.yml b/openssh/server/team/members/deprecated/okosse.yml
new file mode 100644
index 0000000..f8f1963
--- /dev/null
+++ b/openssh/server/team/members/deprecated/okosse.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        okosse:
+          email: deprecated@mirantis.dep
+          enabled: true
+          full_name: Oleksandr Kosse
+          home: /home/okosse
+          name: okosse
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        okosse:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmb5FWl6dgK09TmxVYuvmfLyy6G9x2ed6dvXf0kfpMaaP37CST7t0UZ2m23qGF4T0ZGYbCkIdr+6zWG+a5ozuJiqoJwE3dLun8pnCwAjkmUxRyVIi9M6f3us4z+ooBZTBGWTGe7/ryqePpzyAjlw4om23pDTt09YQq5WDirdrFBNJ9ZlTwubbEWMTtHW5XMEui7s1IiggYmHI4cVh0lg7k/neoAk/5ZD9LI9+p2sISCOpD/f7C/BkgVd/4iCFNxXsPmMwRadBVYo8diB0OOekM6qsW5rfPCczCi9oavxjy62Z2XZ6wHPZ3HgeK8MhVJaRGge6zMTnB98aYh9LWfXFv okosse@okosse-pc
+          user: ${linux:system:user:okosse}
diff --git a/openssh/server/team/members/deprecated/rkhozinov.yml b/openssh/server/team/members/deprecated/rkhozinov.yml
new file mode 100644
index 0000000..feb546d
--- /dev/null
+++ b/openssh/server/team/members/deprecated/rkhozinov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        rkhozinov:
+          email: rkhozinov@mirantis.com
+          enabled: true
+          full_name: Ruslan Khozinov
+          home: /home/rkhozinov
+          name: rkhozinov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        rkhozinov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCti9e5kyNEtX3MEns+eehUCzaxZmI8FWkWrLeRQY3jLUGzI3+N12tA7gKffczGIDP/ttnDg1hl98Yw28mkrIfYYMwRMqsBkGmYZyu6EXccyde6/5U/dgKVFGYLjWmbAAcaIaO2YoxqUJKvIanfLNHTRI29KwgxpaMCtjB7+jHiw/V0MF2xKi8yJgajZgh8iXPiv50BGjICx1BuqgqZb5jjxouV0FpU28mBOobqtaphOHeFPHk1Uool9MBt+2ocAjLbFhozmx0xryBVG4FGreovK60Zz4PuGCUL98rSTt8fbebfVokqkCG+sjykTcEQ8h5/0BUR4sPXw5mxATHD/AOv rkhozinov@rkhw
+          user: ${linux:system:user:rkhozinov}
diff --git a/openssh/server/team/members/deprecated/rpromyshlennikov.yml b/openssh/server/team/members/deprecated/rpromyshlennikov.yml
new file mode 100644
index 0000000..93c9a1c
--- /dev/null
+++ b/openssh/server/team/members/deprecated/rpromyshlennikov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        rpromyshlennikov:
+          email: rpromyshlennikov@mirantis.com
+          enabled: true
+          full_name: Rodion Promyshlennikov
+          home: /home/rpromyshlennikov
+          name: rpromyshlennikov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        rpromyshlennikov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3dCFNCYVxHQQD+/X1JJ9auAzpj15AkEl6yO4lJ1XL43ljxJbzWXXl3RN9vAjiBE1tvxEfuPEIxF7kO2sc1xPKtkw40RIwXrDIGfjlVCaBLtnxCPnCQX349UMSJl/AXpkHqKGVeAW+AO4zbeI8XnS9aDNMuX6ncgrLRMxWCxETL3J/IIE1LZ5v0QvyQBHuJc5jbyODVb4onff296SbjzYm96elJZcRFo4FzFaIcKtis+Sm4+6OAGCNDIXxfB9e5TK579x+L+ci/W1k83Fcz6NpQU/OM1R1CZVMap/Xet424aRMFPmA8sTF4hdYvWd6adBihco2isaW51b1Gkc+K9N9wELiEBMpdKQtqkPOvm98UhoRk7Wp+8+zSamj1uEs/7m6VCGFebq8V3xqTexWH2dCUznxZ5+KS6WLBh+3f4P6wG8VuWfgFjIUf7jjYKjidBXfSXFDxRkhf/LV8V0jLv+Ma1mjKBUX+rk7IFxm0X/PkjqNhVFlg3rH4Wre0+9WdsTCyzWS0HEaTxIKdPtwwULLEiwClO1LLebdlVjx9yhen0czXxMAHONbZeTvxN8ULfei+b7c07oYm16T8T9JAdiWn5nGxiT8TAUrCPBJMpbE4xQJLztYhAbMpfhFSdkKfTotFxTK9AKpTg4TZFY0NYOktFtV2R9ZnzP7hHZDSIg2Bw== rpromyshlennikov@mirantis.com
+          user: ${linux:system:user:rpromyshlennikov}
diff --git a/openssh/server/team/members/deprecated/schipiga.yml b/openssh/server/team/members/deprecated/schipiga.yml
new file mode 100644
index 0000000..9665cc7
--- /dev/null
+++ b/openssh/server/team/members/deprecated/schipiga.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        schipiga:
+          email: deprecated@mirantis.dep
+          enabled: true
+          full_name: Sergey Chipiga
+          home: /home/schipiga
+          name: schipiga
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        schipiga:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDamKTbqCQCGW1JLo+4PgntC1TkRrwbDOELyRVHxAlc56CcJE9QjrNnCOTqvgRoAmIC+P86nzUQxwSREMd0qgVCefAxKQVFVQ38oym9G90TF0nx4fFT3hUhEQwjMBjHhR2Vo+uUwbT2Hg51U1gBPx/WFa0U5Cf7V6+XNJ3r22W4XG8OrbuAoapwl4WN1346HEj3d0U6Z8Unsqjx9pRpZ1eYCeng4emLZ1UOhvLBfw22vSTkujjjRdfY6g52Gv4hRsgsS+JWulO+z/qd1GFcUp9j+yIvur+eeTWHelAbXq4kRNQfQjAs6nMM8Hp8gPa5jLYqMz2GgD96p8wOQCdK2nyL schipiga@mirantis.com
+          user: ${linux:system:user:schipiga}
diff --git a/openssh/server/team/members/deprecated/spasquier.yml b/openssh/server/team/members/deprecated/spasquier.yml
new file mode 100644
index 0000000..bd64ee0
--- /dev/null
+++ b/openssh/server/team/members/deprecated/spasquier.yml
@@ -0,0 +1,17 @@
+parameters:
+  linux:
+    system:
+      user:
+        spasquier:
+          enabled: false
+          name: spasquier
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: disabled
+          home: /home/spasquier
+          email: disabled
+  openssh:
+    server:
+      user:
+        spasquier:
+          enabled: false
+          user: ${linux:system:user:spasquier}
diff --git a/openssh/server/team/members/deprecated/ssokolov.yml b/openssh/server/team/members/deprecated/ssokolov.yml
new file mode 100644
index 0000000..68f9dd1
--- /dev/null
+++ b/openssh/server/team/members/deprecated/ssokolov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        ssokolov:
+          email: deprecated@mirantis.dep
+          enabled: true
+          full_name: Sergey Sokolov
+          home: /home/ssokolov
+          name: ssokolov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        ssokolov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHuIo/dLh5qt+8jV4UUPqDo6ktJc12HVFg10S3hinjJUlAOxq8554l0LMvxmiZSrIjxGE/qUr8PlRgjLi4x4zQDggBdNGC/S4zcYNEiTQ7HaOFOjEJ0si6ODZfssQsr/A/bXdNOZE/nIZTUhTddJG+3nKUvuPnTeOQLqEOp4IFJwwvwnD2Wo4I1nc6+yDSJLuG8ANLtLlStzpMKr8wHvPWCUcB9B1oeeOVtw9+vEKxuUBkheXnXMh7shiyt4vmaFVbcgcHGPg8DjP8alKeAbIk0AYhiuNHV/rFzL+/kfImS94gU93A8vt0U2vCj8golqt2huxJblKDr4Abq1lDXLwn ssm@n104309
+          user: ${linux:system:user:ssokolov}
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/deprecated/yshapovalov.yml b/openssh/server/team/members/deprecated/yshapovalov.yml
new file mode 100644
index 0000000..82c84d1
--- /dev/null
+++ b/openssh/server/team/members/deprecated/yshapovalov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        yshapovalov:
+          email: ylobankov@mirantis.com
+          enabled: true
+          full_name: Yevgeniy Shapovalov
+          home: /home/yshapovalov
+          name: yshapovalov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        yshapovalov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWvKNMfHlugrEUMtDDJzZb3T1UzThOp/UtvQvyFTf1rlKN/i14b1cCVmbPaSKR6W4bqZ4YLnRfb5Z66ktEACL02RdC4FkCiGa8yFDAGXLbM2WJhHyA3ksu91z3wK2QRuKJuZuvjmelds1shTK1a31LgTqa7CNPfkfE9h+CsAizZfAhHg1yVqg0/CGKP8+iV8owR5MP9t8+JXTC40G6Qkjzrf/vuA13bT1X+JSWzLoI2OefezZ+X128fLkssPkr4IS1Jg+cbRvSRmGTVjvtk4dnDo3QxF5lUl6JZAUjPslMCxaqDvRFXn86UZ74g6iJ5dZjrU0vn6X+Ov+KVYmZ5znd yshapovalov@ys-pc
+          user: ${linux:system:user:yshapovalov}
diff --git a/openssh/server/team/members/dkalashnik.yml b/openssh/server/team/members/dkalashnik.yml
index 52a2a69..e301723 100644
--- a/openssh/server/team/members/dkalashnik.yml
+++ b/openssh/server/team/members/dkalashnik.yml
@@ -3,18 +3,17 @@
     system:
       user:
         dkalashnik:
+          email: dkalashnik@mirantis.com
           enabled: true
-          name: dkalashnik
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Dmitry Kalashnik
           home: /home/dkalashnik
-          email: dkalashnik@mirantis.com
+          name: dkalashnik
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         dkalashnik:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAyz5ovMK/rRxlhiy7x4dVwFkUqN/hhdVIpsQRQoGgTOjVhH6Y+eTE3si0RRq/HKZMwkcClJIqzMgjoajT5eQQphQrAAn2pwuCyZj0mXJJ1RSXQm+nSnhoqyB1r7Nl3keopgxrDlBLWyvyS3dJM9RJy4TimIwhuSA3qdhmfeqRm5M=
-          user: ${linux:system:user:dkalashnik}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAyz5ovMK/rRxlhiy7x4dVwFkUqN/hhdVIpsQRQoGgTOjVhH6Y+eTE3si0RRq/HKZMwkcClJIqzMgjoajT5eQQphQrAAn2pwuCyZj0mXJJ1RSXQm+nSnhoqyB1r7Nl3keopgxrDlBLWyvyS3dJM9RJy4TimIwhuSA3qdhmfeqRm5M=
+          user: ${linux:system:user:dkalashnik}
diff --git a/openssh/server/team/members/dklepikov.yml b/openssh/server/team/members/dklepikov.yml
index fc7b81a..7db4a2b 100644
--- a/openssh/server/team/members/dklepikov.yml
+++ b/openssh/server/team/members/dklepikov.yml
@@ -3,15 +3,14 @@
     system:
       user:
         dklepikov:
+          email: dklepikov@mirantis.com
           enabled: true
-          name: dklepikov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Denys Klepikov
           home: /home/dklepikov
-          email: dklepikov@mirantis.com
+          name: dklepikov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         dklepikov:
           enabled: true
diff --git a/openssh/server/team/members/dmeltsaykin.yml b/openssh/server/team/members/dmeltsaykin.yml
index 1b5ff2e..60ba7f9 100644
--- a/openssh/server/team/members/dmeltsaykin.yml
+++ b/openssh/server/team/members/dmeltsaykin.yml
@@ -3,18 +3,17 @@
     system:
       user:
         dmeltsaykin:
+          email: dmeltsaykin@mirantis.com
           enabled: true
-          name: dmeltsaykin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Denis Meltsaykin
           home: /home/dmeltsaykin
-          email: dmeltsaykin@mirantis.com
+          name: dmeltsaykin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         dmeltsaykin:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqfNIy3WuxzRzOY/GBNGOnP5UrCFWZ8uMzW6hEl4wgIEYYIcv8o+C1/hvrfHimG/I/rAwYRS6Dx0bZ7m49zATNxe+EVer3BV63ru34Hzel/XxxyD34ULmrDgvP3olaAKFI17gVOFQ7hCBzDRp3s4YN3ojQspPyeiO+Jt8OwVomxJWgLauAHhl7Z/XPVHpT/fssJGG/eC4oOz4RZ4jAk0BH3Yl8s63grfwrgB79H/+nr0UvBdTkBn3T5WiC4gxnm+jQQwci7/BLQsg1Z3OykfTuyftIexNyVVy/SmdsGi37RJGFKRMMovoZx+261JgaHWBoHqBJa5UpV2usi9z3Py2z avgoor@MacBook-Pro-Denis.local
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqfNIy3WuxzRzOY/GBNGOnP5UrCFWZ8uMzW6hEl4wgIEYYIcv8o+C1/hvrfHimG/I/rAwYRS6Dx0bZ7m49zATNxe+EVer3BV63ru34Hzel/XxxyD34ULmrDgvP3olaAKFI17gVOFQ7hCBzDRp3s4YN3ojQspPyeiO+Jt8OwVomxJWgLauAHhl7Z/XPVHpT/fssJGG/eC4oOz4RZ4jAk0BH3Yl8s63grfwrgB79H/+nr0UvBdTkBn3T5WiC4gxnm+jQQwci7/BLQsg1Z3OykfTuyftIexNyVVy/SmdsGi37RJGFKRMMovoZx+261JgaHWBoHqBJa5UpV2usi9z3Py2z avgoor@MacBook-Pro-Denis.local
           user: ${linux:system:user:dmeltsaykin}
diff --git a/openssh/server/team/members/dstremkouski.yml b/openssh/server/team/members/dstremkouski.yml
index d283c07..d98b938 100644
--- a/openssh/server/team/members/dstremkouski.yml
+++ b/openssh/server/team/members/dstremkouski.yml
@@ -3,15 +3,14 @@
     system:
       user:
         dstremkouski:
+          email: dstremkouski@mirantis.com
           enabled: true
-          name: dstremkouski
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Dzmitry Stremkouski
           home: /home/dstremkouski
-          email: dstremkouski@mirantis.com
+          name: dstremkouski
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         dstremkouski:
           enabled: true
diff --git a/openssh/server/team/members/dsutyagin.yml b/openssh/server/team/members/dsutyagin.yml
index 1315772..937fbaf 100644
--- a/openssh/server/team/members/dsutyagin.yml
+++ b/openssh/server/team/members/dsutyagin.yml
@@ -3,15 +3,14 @@
     system:
       user:
         dsutyagin:
+          email: dsutyagin@mirantis.com
           enabled: true
-          name: dsutyagin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Dmitry Sutyagin
           home: /home/dsutyagin
-          email: dsutyagin@mirantis.com
+          name: dsutyagin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         dsutyagin:
           enabled: true
diff --git a/openssh/server/team/members/dteselkin.yml b/openssh/server/team/members/dteselkin.yml
index 3ddc751..d276ae6 100644
--- a/openssh/server/team/members/dteselkin.yml
+++ b/openssh/server/team/members/dteselkin.yml
@@ -3,18 +3,17 @@
     system:
       user:
         dteselkin:
+          email: dteselkin@mirantis.com
           enabled: true
-          name: dteselkin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Dmitry Teselkin
           home: /home/dteselkin
-          email: dteselkin@mirantis.com
+          name: dteselkin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         dteselkin:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxE+TvswmBZP8xIz4DRlyrQV6CEk1ZDCc8vXT8yYB2VgW7PpYt6ukuV+UjUp18/51JBKbxJIGplF4i1rgEvKX/kfi/FWM3uiqPq9ivLzuykIGiRccsU3kzIntIec7WDDcJeo/P4r5eXWhI+idMvcfLcxCLbN1OKZfBllhagv8oUrWLVCPaPvcWXxUQ8gvylP3Mk+G/OtaTJSk0udG2S4vh1Rg+TU7x8RHV0q8P8LPz19pvWQu5yWbeKd4FbKGUNx9eBqdGR6+nsfpjJZWeeSkUT9C77ihkMtIGJ7EacNYbgYhtIKZeBrfJcw+M1JTXdd8quwVPSA46D4xldQZ7aM7t
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxE+TvswmBZP8xIz4DRlyrQV6CEk1ZDCc8vXT8yYB2VgW7PpYt6ukuV+UjUp18/51JBKbxJIGplF4i1rgEvKX/kfi/FWM3uiqPq9ivLzuykIGiRccsU3kzIntIec7WDDcJeo/P4r5eXWhI+idMvcfLcxCLbN1OKZfBllhagv8oUrWLVCPaPvcWXxUQ8gvylP3Mk+G/OtaTJSk0udG2S4vh1Rg+TU7x8RHV0q8P8LPz19pvWQu5yWbeKd4FbKGUNx9eBqdGR6+nsfpjJZWeeSkUT9C77ihkMtIGJ7EacNYbgYhtIKZeBrfJcw+M1JTXdd8quwVPSA46D4xldQZ7aM7t
           user: ${linux:system:user:dteselkin}
diff --git a/openssh/server/team/members/dtsapikov.yml b/openssh/server/team/members/dtsapikov.yml
index 82b3526..f8c602f 100644
--- a/openssh/server/team/members/dtsapikov.yml
+++ b/openssh/server/team/members/dtsapikov.yml
@@ -3,18 +3,17 @@
     system:
       user:
         dtsapikov:
+          email: dtsapikov@mirantis.com
           enabled: true
-          name: dtsapikov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Dmitry Tsapikov
           home: /home/dtsapikov
-          email: dtsapikov@mirantis.com
+          name: dtsapikov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         dtsapikov:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqcQyBOTEtVB82WmUSOpFN2e3/38BxaX3+Gq0lIsBatGK4WlTeSlrnquq9ANenAUzf6yphPy5sQFiegf8mVJ2jD7a8N7MH2K1zVsQUIM2d84SA4f8YxUOyBsAL32nesmxrsFvGQiV2U1XRIuuNqTqjrX5gsTUznkVqYZWvmvoEVT/GsoFKH7aPb7w88/3EAXysSkfJBTEINjWV14+jpv5u/hWv/K/UU/gptx9aEUw9bYUaH5rW8lW9nyIp+BPT0z5BvHTtk+KIDjqS2SEAYVnV/qWoHIU1rGDXbAXcNgN0iFVdOfLhvenxhkyXV/9+UFoAibLBzBTrXxbnoK5AkTyF dtsapikov@Dmitrys-MacBook-Pro.local
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqcQyBOTEtVB82WmUSOpFN2e3/38BxaX3+Gq0lIsBatGK4WlTeSlrnquq9ANenAUzf6yphPy5sQFiegf8mVJ2jD7a8N7MH2K1zVsQUIM2d84SA4f8YxUOyBsAL32nesmxrsFvGQiV2U1XRIuuNqTqjrX5gsTUznkVqYZWvmvoEVT/GsoFKH7aPb7w88/3EAXysSkfJBTEINjWV14+jpv5u/hWv/K/UU/gptx9aEUw9bYUaH5rW8lW9nyIp+BPT0z5BvHTtk+KIDjqS2SEAYVnV/qWoHIU1rGDXbAXcNgN0iFVdOfLhvenxhkyXV/9+UFoAibLBzBTrXxbnoK5AkTyF dtsapikov@Dmitrys-MacBook-Pro.local
           user: ${linux:system:user:dtsapikov}
diff --git a/openssh/server/team/members/dtyzhnenko.yml b/openssh/server/team/members/dtyzhnenko.yml
new file mode 100644
index 0000000..046ee31
--- /dev/null
+++ b/openssh/server/team/members/dtyzhnenko.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        dtyzhnenko:
+          email: dtyzhnenko@mirantis.com
+          enabled: true
+          full_name: Dmitry Tyzhnenko
+          home: /home/dtyzhnenko
+          name: dtyzhnenko
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        dtyzhnenko:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhf5ysfuTmOO1975vUCag59tL+lQwfmWSQglZvKnMLnhO1P39VXDHCMla0Uh2IXI5abSrsq4xVXNfD3R5cnzPW8rG1h3528tSpszwZp28LSMkMfEZReEWVq2XoseRfzd7b3AaWN283NbQGPL6NRwyg9hLRG5dipdRxnDSutvDg/J4gbzeuS+QjXP6ymIs9vBhrpvHlQ6POI7Zedp2FOmqbGf3OK9wuBkD1Dhf+hTXvFSq1PFxmKB7w5CWvAOGGuapb+IYspPlDwd8lVWbvp+D3DchkhyL36gQyl2In/NKG2NR4z6dETX8JON5OMe0UipeKAsXInoVbyZfs3uZgdKDB dtyzhnenko
+          user: ${linux:system:user:dtyzhnenko}
diff --git a/openssh/server/team/members/ekhomyakova.yml b/openssh/server/team/members/ekhomyakova.yml
new file mode 100644
index 0000000..1cb0533
--- /dev/null
+++ b/openssh/server/team/members/ekhomyakova.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        ekhomyakova:
+          email: ekhomyakova@mirantis.com
+          enabled: true
+          full_name: Ekaterina Khomyakova
+          home: /home/ekhomyakova
+          name: ekhomyakova
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        ekhomyakova:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEaWwPVtsj39s0A2efRQ1ejL5B7ZetFPmXJDi/8W/gTWIIII3xP750H8QWZfvbjiJ+KBCxOndDL8aL3SHC/iRCvmzrVkgXBgf5J9vTu8uas7BNGf7oiDBuB75fryDtkg57Pam/A47IlgxJTCwYz+ofUGHb6WrWwQ+MUTEWAk9PB+RPyxjwNC4XxEwtULkKQMgFmg52kauESpx0R0ni8/LLKUJucdse7NCcUTvEcafppnXsxdZ640G0K82ADS1neg1CDwdtCPKLG57GZYs4iL3sPcOhQxnVUoONXsRpBD8kQTKOMl5R6hTDJHBd3oimUPEXlPqeb/XeGKatVraRA6nJ ekhomyakova@ekhomyakova
+          user: ${linux:system:user:ekhomyakova}
diff --git a/openssh/server/team/members/enikanorov.yml b/openssh/server/team/members/enikanorov.yml
index 2ea5abc..c8fbb26 100644
--- a/openssh/server/team/members/enikanorov.yml
+++ b/openssh/server/team/members/enikanorov.yml
@@ -3,15 +3,14 @@
     system:
       user:
         enikanorov:
+          email: enikanorov@mirantis.com
           enabled: true
-          name: enikanorov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Eugene Nikanorov
           home: /home/enikanorov
-          email: enikanorov@mirantis.com
+          name: enikanorov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         enikanorov:
           enabled: true
diff --git a/openssh/server/team/members/gzimin.yml b/openssh/server/team/members/gzimin.yml
index 2052f21..0c5e51a 100644
--- a/openssh/server/team/members/gzimin.yml
+++ b/openssh/server/team/members/gzimin.yml
@@ -3,18 +3,17 @@
     system:
       user:
         gzimin:
+          email: gzimin@mirantis.com
           enabled: true
-          name: gzimin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Gleb Zimin
           home: /home/gzimin
-          email: gzimin@mirantis.com
+          name: gzimin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         gzimin:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDitupT4OHwP9EsJTDu10Y3XslxjbvyTxC/EMjgxwDM1LxooJK7AO+WkgdCP0o5nkiPi3y50pw66yKGYDlzNu8JkTIWGRvzfBWK8aU55m0F2wmxNkoT7eiCCrhwThwKfNI44MV0ZZ7plf3eeIthAonsyc5rkC+7ZseF7xmErjKcwfApS3AWn44KXs3iSdp8uJbZ3GARGDtzjfcyEzYQK8c8J4AHeXtGStWQnk146UN7m9F8AztOEkmtzkQXLWR+DQgPkFsS+KfSacqCriYCHJPN3C9tcMSCfCdwN4/P1HoYoAGz8WE9YulRGnmb9JSCmo+Lu/f2liC63llhhcr5eJsj gzimin@Glebs-MacBook-Pro.local 
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDitupT4OHwP9EsJTDu10Y3XslxjbvyTxC/EMjgxwDM1LxooJK7AO+WkgdCP0o5nkiPi3y50pw66yKGYDlzNu8JkTIWGRvzfBWK8aU55m0F2wmxNkoT7eiCCrhwThwKfNI44MV0ZZ7plf3eeIthAonsyc5rkC+7ZseF7xmErjKcwfApS3AWn44KXs3iSdp8uJbZ3GARGDtzjfcyEzYQK8c8J4AHeXtGStWQnk146UN7m9F8AztOEkmtzkQXLWR+DQgPkFsS+KfSacqCriYCHJPN3C9tcMSCfCdwN4/P1HoYoAGz8WE9YulRGnmb9JSCmo+Lu/f2liC63llhhcr5eJsj gzimin@Glebs-MacBook-Pro.local
           user: ${linux:system:user:gzimin}
diff --git a/openssh/server/team/members/iberezovskiy.yml b/openssh/server/team/members/iberezovskiy.yml
index 14e868f..dde71f9 100644
--- a/openssh/server/team/members/iberezovskiy.yml
+++ b/openssh/server/team/members/iberezovskiy.yml
@@ -3,18 +3,17 @@
     system:
       user:
         iberezovskiy:
+          email: iberezovskiy@mirantis.com
           enabled: true
-          name: iberezovskiy
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Ivan Berezovskiy
           home: /home/iberezovskiy
-          email: iberezovskiy@mirantis.com
+          name: iberezovskiy
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         iberezovskiy:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnn18VJ7z3CIBaQmIRfYltyh/BogwBq4B9KVUZ0Gl1EWd5AutuR00xCOYdFeU7okaURYILC+8W2A7a9qkML9G99sX+KD+7CDsKm33XeCP4YJ9QhOwA+OYPS84lLExvK+9AoVPnB06sEK8CvPdU6byQE/EX1VA9gFFCraOH1D0eABaC01csHI+GaiIA5qSjDMH+ieii1Rv5Zb6NHyYRktaCSHB2asu5Y7VxmL2srweFJonpk4Z80+TWlc2ESRLc9EFMefRt/MixIyFjBgvcsE++eCO6MModCAoP5V1Tmgd+cztcvm/tlQqJirve/64SFLvDbjYLE9QxQ8bY4/d4MjcX iberezovskiy@tests-MacBook-Pro.local
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnn18VJ7z3CIBaQmIRfYltyh/BogwBq4B9KVUZ0Gl1EWd5AutuR00xCOYdFeU7okaURYILC+8W2A7a9qkML9G99sX+KD+7CDsKm33XeCP4YJ9QhOwA+OYPS84lLExvK+9AoVPnB06sEK8CvPdU6byQE/EX1VA9gFFCraOH1D0eABaC01csHI+GaiIA5qSjDMH+ieii1Rv5Zb6NHyYRktaCSHB2asu5Y7VxmL2srweFJonpk4Z80+TWlc2ESRLc9EFMefRt/MixIyFjBgvcsE++eCO6MModCAoP5V1Tmgd+cztcvm/tlQqJirve/64SFLvDbjYLE9QxQ8bY4/d4MjcX iberezovskiy@tests-MacBook-Pro.local
           user: ${linux:system:user:iberezovskiy}
diff --git a/openssh/server/team/members/ikolodyazhny.yml b/openssh/server/team/members/ikolodyazhny.yml
index 1d9a40e..697f97a 100644
--- a/openssh/server/team/members/ikolodyazhny.yml
+++ b/openssh/server/team/members/ikolodyazhny.yml
@@ -3,18 +3,17 @@
     system:
       user:
         ikolodyazhny:
+          email: ikolodyazhny@mirantis.com
           enabled: true
-          name: ikolodyazhny
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Ivan Kolodyazhny
           home: /home/ikolodyazhny
-          email: ikolodyazhny@mirantis.com
+          name: ikolodyazhny
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         ikolodyazhny:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyzhJRhNTqFXr6i21Jel+AFEM4bp6ExFkydkTQfF6OPBQBzDhUjxHac/6wrsmG906gMszjym0riJDh4EWQ0pj162hXBz5hdcmyKxBPC6NbhJU4NjsSpwcPB7fx/OsyWXGcvWUYMUuRv86QS5hwLleY+Z2KoJlnAwe+h6pMT5IG/JvwHg6A1Z6l24DZdpkXqhdeupM6Ot+ODRAsPvMKgy9DxVfs+DaFGtQn0dPYHGa24qoNf56kRQ2DLSJQe9n6LkW41NXYgvO21fSml7vsGAHTAjDj3ZqwlNZX28ti9Bkd0iXe1UPYkoMuLWxhAq25XMvPdyOBYYnyfHyamJqSHGz/Q==
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyzhJRhNTqFXr6i21Jel+AFEM4bp6ExFkydkTQfF6OPBQBzDhUjxHac/6wrsmG906gMszjym0riJDh4EWQ0pj162hXBz5hdcmyKxBPC6NbhJU4NjsSpwcPB7fx/OsyWXGcvWUYMUuRv86QS5hwLleY+Z2KoJlnAwe+h6pMT5IG/JvwHg6A1Z6l24DZdpkXqhdeupM6Ot+ODRAsPvMKgy9DxVfs+DaFGtQn0dPYHGa24qoNf56kRQ2DLSJQe9n6LkW41NXYgvO21fSml7vsGAHTAjDj3ZqwlNZX28ti9Bkd0iXe1UPYkoMuLWxhAq25XMvPdyOBYYnyfHyamJqSHGz/Q==
           user: ${linux:system:user:ikolodyazhny}
diff --git a/openssh/server/team/members/imenkov.yml b/openssh/server/team/members/imenkov.yml
index b2ae055..a10109d 100644
--- a/openssh/server/team/members/imenkov.yml
+++ b/openssh/server/team/members/imenkov.yml
@@ -3,18 +3,17 @@
     system:
       user:
         imenkov:
+          email: imenkov@mirantis.com
           enabled: true
-          name: imenkov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Ilya Menkov
           home: /home/imenkov
-          email: imenkov@mirantis.com
+          name: imenkov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         imenkov:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSWoSuHV1FNRuooS3d0nVkTRCwC+Tc585Z1cPcMQns7H1ogLIya//T3gMfxINxCjlF1eek18vI9B5QszZZUL2P7prFxe5EJlt6iM8jD61umkncaTbx6oc8r8xu5ufH9RDxfKHvQX1mhhID5JK+/GoRDIW5Zs7wFSHCrANYV2dtmOfmRSc/qpgh87Z9X10UDymp5MLjpQZzjM+qZCtz6yV14m835j4eiEN7+QZ2XZ/Wtzer7VVdhtjbw8gESSyuPIVf66keuLVUixk0CXosQYrqWDPWpT0Rhh63lnUacgplh74TU+bb+vYRjIHxCgOY2Ex6Pk5jrsroi0YoWtI4SErD imenkov@atopilin-nb-wifi.srt.mirantis.net
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSWoSuHV1FNRuooS3d0nVkTRCwC+Tc585Z1cPcMQns7H1ogLIya//T3gMfxINxCjlF1eek18vI9B5QszZZUL2P7prFxe5EJlt6iM8jD61umkncaTbx6oc8r8xu5ufH9RDxfKHvQX1mhhID5JK+/GoRDIW5Zs7wFSHCrANYV2dtmOfmRSc/qpgh87Z9X10UDymp5MLjpQZzjM+qZCtz6yV14m835j4eiEN7+QZ2XZ/Wtzer7VVdhtjbw8gESSyuPIVf66keuLVUixk0CXosQYrqWDPWpT0Rhh63lnUacgplh74TU+bb+vYRjIHxCgOY2Ex6Pk5jrsroi0YoWtI4SErD imenkov@atopilin-nb-wifi.srt.mirantis.net
           user: ${linux:system:user:imenkov}
diff --git a/openssh/server/team/members/isvetlov.yml b/openssh/server/team/members/isvetlov.yml
new file mode 100644
index 0000000..16512c8
--- /dev/null
+++ b/openssh/server/team/members/isvetlov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        isvetlov:
+          email: isvetlov@mirantis.com
+          enabled: true
+          full_name: Ildar Svetlov
+          home: /home/isvetlov
+          name: isvetlov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        isvetlov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9lvegjKq6OP7cgF9YU9mPOk1/mfJbov3YnYnhiW1Ks0hrWZyAo+0TV3O7LgWZ8jqD9abbYaOiWCt4d9ABkLUJfCLNAqOJRapJ+tybPAxJKx4eV8pptJ7UF0EdItasTdd+gqJJ4Krk869rwmqVQ4hethdykjhKyWu3bG+uVtFUF5xUj9zaT9NThA6/Xhz0idAiTO8ArmLng4W8ne45gANaHIWXpIsklo6GLUSZwl4z6j2z4joxNJsB1hrw0msT56F26ctkDo6thNMAzPMyZsLjYJBJIRYhdC1d4Up9114nVcY4pzYw76+zXU9zED2XNRLdyAaxFlwXvumAs3iMLI8Z isvetlov@isvetlov-mac.local
+          user: ${linux:system:user:isvetlov}
diff --git a/openssh/server/team/members/isviridov.yml b/openssh/server/team/members/isviridov.yml
new file mode 100644
index 0000000..98d0660
--- /dev/null
+++ b/openssh/server/team/members/isviridov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        isviridov:
+          email: isviridov@mirantis.com
+          enabled: true
+          full_name: Illia Svyrydov
+          home: /home/isviridov
+          name: isviridov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        isviridov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGNZxzOm7OsZi/q6Qk71fnvjCfWk4BfxpZ5hDig6N1f9D0iAMaINyNmlF2PxstSLW0Mjdq2tXTUvVWlYpGrw+YLHQmVk8dckmLdUAxe2Z0oEvtWhiQC64927ibBTgQ2Tjfkao+PFYPbdjiO4FgRymS1/FpGKhvpdyPDCcOLrxsMSK9YpPi4kbkd4GmlGMercuaEzP3JOOzJioOOLtEw3LOLWG5mAIzXjGFxuCNdTI4gqxQm/iw/tOpb9PcsY10EapZsS4Pd8j58vuhJlwdoTxI3gzySJcTlWm0tcphex0g8X0tEUI+zVjemJcrYkZgUpb6x5/mUjNxC4nv+4A4yMTP
+          user: ${linux:system:user:isviridov}
diff --git a/openssh/server/team/members/iudovichenko.yml b/openssh/server/team/members/iudovichenko.yml
index d7e611d..9487525 100644
--- a/openssh/server/team/members/iudovichenko.yml
+++ b/openssh/server/team/members/iudovichenko.yml
@@ -3,18 +3,17 @@
     system:
       user:
         iudovichenko:
+          email: iudovichenko@mirantis.com
           enabled: true
-          name: iudovichenko
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Ivan Udovichenko
           home: /home/iudovichenko
-          email: iudovichenko@mirantis.com
+          name: iudovichenko
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         iudovichenko:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1Dxt3m6w1jZjDxLJEWi2X5uXYZwpJVmfcOoXayofmxvdRyXe5OAEFZpdiPeCgwwcKZGvLjJ0/KXsoBuQw++XhdzZnE1+zaAjpB7fzkTQq4QRvEOMr3z16/AdJdYlqcZH4n3USUhahGdfhpCVDAo1YyYGDTzUH3r1DtYPAGbNiNgb7xu8H3iwp9UiI2t6kH3tx7db2wbVJ6HpnIlA1/Yj4W5j4Cz8f8MnG5oTnmZwT0hXwX/TCPyW56bHOGCAVpHINM+ZU4jUoHMUxjwd4mjMw4TIjID5b+ks91MdBhe/9IDRDrIUK2sK4h+S4ciuD6IAT637DD8/n8P6Vj8qDR0rP
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1Dxt3m6w1jZjDxLJEWi2X5uXYZwpJVmfcOoXayofmxvdRyXe5OAEFZpdiPeCgwwcKZGvLjJ0/KXsoBuQw++XhdzZnE1+zaAjpB7fzkTQq4QRvEOMr3z16/AdJdYlqcZH4n3USUhahGdfhpCVDAo1YyYGDTzUH3r1DtYPAGbNiNgb7xu8H3iwp9UiI2t6kH3tx7db2wbVJ6HpnIlA1/Yj4W5j4Cz8f8MnG5oTnmZwT0hXwX/TCPyW56bHOGCAVpHINM+ZU4jUoHMUxjwd4mjMw4TIjID5b+ks91MdBhe/9IDRDrIUK2sK4h+S4ciuD6IAT637DD8/n8P6Vj8qDR0rP
           user: ${linux:system:user:iudovichenko}
diff --git a/openssh/server/team/members/javierdiaz.yml b/openssh/server/team/members/javierdiaz.yml
index 8b04645..2de968b 100644
--- a/openssh/server/team/members/javierdiaz.yml
+++ b/openssh/server/team/members/javierdiaz.yml
@@ -3,21 +3,17 @@
     system:
       user:
         jdiaz:
+          email: jdiaz@mirantis.com
           enabled: true
-          name: jdiaz
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Javier Diaz
           home: /home/jdiaz
-          email: jdiaz@mirantis.com
+          name: jdiaz
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         jdiaz:
           enabled: true
-          public_keys: ${public_keys:jdiaz}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/2Kwi/+MO2AowwwQ5S4x3tif+6L8bCHKDV+BNfxezn55j0CMGUNMXSH6p384Zu5DuCWhU8AmdZ+rczGgc9vsdgb8Kukdi19C7vaXLIkjw1ztEkB8xgpXwDrx6O6GNtCmNq2FF1LTHTgs+r6VTKxl3yDGPd01m/fuf7Kq/hb+5out7soXC0eePKwYgFtIngxaFEiGA5sNNETrp8wys4EI2u1Az7C37cchR2qAUILRz01zt7Mp2ma+LNaZx3/bbIHI34EKypCYCFFQq+fodMDiwG15xhsdU8FEVj1NREN1kSOO2xr9IujalNskIfaXsIu7tE/6B4rI0Sl7W/PVw+cFr
           user: ${linux:system:user:jdiaz}
-  public_keys:
-    jdiaz:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/2Kwi/+MO2AowwwQ5S4x3tif+6L8bCHKDV+BNfxezn55j0CMGUNMXSH6p384Zu5DuCWhU8AmdZ+rczGgc9vsdgb8Kukdi19C7vaXLIkjw1ztEkB8xgpXwDrx6O6GNtCmNq2FF1LTHTgs+r6VTKxl3yDGPd01m/fuf7Kq/hb+5out7soXC0eePKwYgFtIngxaFEiGA5sNNETrp8wys4EI2u1Az7C37cchR2qAUILRz01zt7Mp2ma+LNaZx3/bbIHI34EKypCYCFFQq+fodMDiwG15xhsdU8FEVj1NREN1kSOO2xr9IujalNskIfaXsIu7tE/6B4rI0Sl7W/PVw+cFr
-
diff --git a/openssh/server/team/members/jcach.yml b/openssh/server/team/members/jcach.yml
index a9e7e6d..d427d46 100644
--- a/openssh/server/team/members/jcach.yml
+++ b/openssh/server/team/members/jcach.yml
@@ -3,18 +3,17 @@
     system:
       user:
         jcach:
+          email: jcach@mirantis.com
           enabled: true
-          name: jcach
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Jan Cach
           home: /home/jcach
-          email: jcach@mirantis.com
+          name: jcach
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         jcach:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwAqWUvMAPTh4euvGwhLU3GjlAHVzKvlclKdg1VqmWAZI1Nd+GjKhop5kS3hMk+HCg4bgfE5nAEsp3mF78c+XXDZot1T1Sxsd0SfatkMycXgeK4l1U6QtouNR//7wEv4gPA5la7T5ktgwk7hfjnc9Jl84yS8xA1d5gsgOhQw4wHYQquyOcOA5rN8ylh7P+tEfJSx4PWlfsu9M8IZU9WvftPxNbmUfVF+GuwPcNgbAtMi3Oz2Zg9+6W4gnwfJiufXU+onDa2e5tL8ZsGqEbTQXIx13sg0ilMIT6WpbTtbCe81oZYokAMGY2hlbubhtHgGSQhBI4/qgE7/CsD4TNtuOFTAy8Y6lzvoDsTzR51ApUFHHQEjlsf7AfQFJF3Mb5/fy84K0PF2chz4XwXeO9ZbUGOvY9P349gqyJRIV29V6b8m2aqKYIHO/CRxYk52H1UY9SlCsJq9G+7qjHbugV+35+Za1/RFc0l+80Ei/GnfkYYNxpxHNM6r4sM2mte00lWTQwaSreFIVz/fRlKiaok1hHwwUNxgifdtcdIm+7RGnBgV9MoNGYN4AESKTnj7tr6OIOSLaZm8YbPJDW3VmpSmwGfHpOfI00lfymbKsR5ytn6nTLVHOkfU6pI4+LpUc0Jb9+Szrn+5QA8bGp6yn2DTCzHNW/mR5rrHYUY6o9m8/W4w== casek@casek14NB
-          user: ${linux:system:user:jcach}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwAqWUvMAPTh4euvGwhLU3GjlAHVzKvlclKdg1VqmWAZI1Nd+GjKhop5kS3hMk+HCg4bgfE5nAEsp3mF78c+XXDZot1T1Sxsd0SfatkMycXgeK4l1U6QtouNR//7wEv4gPA5la7T5ktgwk7hfjnc9Jl84yS8xA1d5gsgOhQw4wHYQquyOcOA5rN8ylh7P+tEfJSx4PWlfsu9M8IZU9WvftPxNbmUfVF+GuwPcNgbAtMi3Oz2Zg9+6W4gnwfJiufXU+onDa2e5tL8ZsGqEbTQXIx13sg0ilMIT6WpbTtbCe81oZYokAMGY2hlbubhtHgGSQhBI4/qgE7/CsD4TNtuOFTAy8Y6lzvoDsTzR51ApUFHHQEjlsf7AfQFJF3Mb5/fy84K0PF2chz4XwXeO9ZbUGOvY9P349gqyJRIV29V6b8m2aqKYIHO/CRxYk52H1UY9SlCsJq9G+7qjHbugV+35+Za1/RFc0l+80Ei/GnfkYYNxpxHNM6r4sM2mte00lWTQwaSreFIVz/fRlKiaok1hHwwUNxgifdtcdIm+7RGnBgV9MoNGYN4AESKTnj7tr6OIOSLaZm8YbPJDW3VmpSmwGfHpOfI00lfymbKsR5ytn6nTLVHOkfU6pI4+LpUc0Jb9+Szrn+5QA8bGp6yn2DTCzHNW/mR5rrHYUY6o9m8/W4w== casek@casek14NB
+          user: ${linux:system:user:jcach}
diff --git a/openssh/server/team/members/jmosher.yml b/openssh/server/team/members/jmosher.yml
index f30c92f..3b52d11 100644
--- a/openssh/server/team/members/jmosher.yml
+++ b/openssh/server/team/members/jmosher.yml
@@ -3,18 +3,17 @@
     system:
       user:
         jmosher:
+          email: jmosher@mirantis.com
           enabled: true
-          name: jmosher
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Jaymes Mosher
           home: /home/jmosher
-          email: jmosher@mirantis.com
+          name: jmosher
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         jmosher:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQClNkHapODxW9iiYKG/anZO3+Ca01pXSAohWqB8fIxHJ3l2SPV6tHsHNAiUQNcG7i9hNHNOC7moa9fL6et+3rphxHfpHqxzTEwEOyzR6GiyWMNdkrXJApAiGNNoeMY1t2rxPhjQGLCqjNdGgSMcyb+/Rw5zRHRkJbRP6l0z2/VwAqhW31qEp/S6sPdZvuCgsKN2g2y2qHq7oMSh0WIcaJsDbOkcxzypOk+0J/Gu0RMu1JpjVSaWu996XB3LmdtP6ll9EAJ+OYcMbtT8/XWc4UGraka8BWbt20qS6Q6GxAkY+96Iir+NvS4KEzkaryFgct8+eN5soJeKf8eoN1ecPX99nvuyG08DsKdyowDzr8PDZrt7mRQd/k2nnPGo1oVJPtCKV/UeAEUJcwecq9GE7HmSQ6WyQ4cdIrBw/IWZI/pJ/H+9QnOKldJpUP0g3dru5TJFbR5iGrqdikXrMG/7w5+3H94ardCysEH2e7Nbhb4dHm3YM3h3HT7I9qpojvzlxe6OhO4xEX0KfjuVz/HaqD1tC+FaGL/JD2yLPpRTGykDjuUuEQdzvTUCg5tMmSGMB2LpwvWPVCpkr6jczzPCpeMQptXz8k/9ljKVKvAGBnFPQUTip3qHQpBpOTNvTHJNQEF9wsRIs36hxbZE6yY7H/mX0SDeOS+v4ub3PvugGzvglw==
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQClNkHapODxW9iiYKG/anZO3+Ca01pXSAohWqB8fIxHJ3l2SPV6tHsHNAiUQNcG7i9hNHNOC7moa9fL6et+3rphxHfpHqxzTEwEOyzR6GiyWMNdkrXJApAiGNNoeMY1t2rxPhjQGLCqjNdGgSMcyb+/Rw5zRHRkJbRP6l0z2/VwAqhW31qEp/S6sPdZvuCgsKN2g2y2qHq7oMSh0WIcaJsDbOkcxzypOk+0J/Gu0RMu1JpjVSaWu996XB3LmdtP6ll9EAJ+OYcMbtT8/XWc4UGraka8BWbt20qS6Q6GxAkY+96Iir+NvS4KEzkaryFgct8+eN5soJeKf8eoN1ecPX99nvuyG08DsKdyowDzr8PDZrt7mRQd/k2nnPGo1oVJPtCKV/UeAEUJcwecq9GE7HmSQ6WyQ4cdIrBw/IWZI/pJ/H+9QnOKldJpUP0g3dru5TJFbR5iGrqdikXrMG/7w5+3H94ardCysEH2e7Nbhb4dHm3YM3h3HT7I9qpojvzlxe6OhO4xEX0KfjuVz/HaqD1tC+FaGL/JD2yLPpRTGykDjuUuEQdzvTUCg5tMmSGMB2LpwvWPVCpkr6jczzPCpeMQptXz8k/9ljKVKvAGBnFPQUTip3qHQpBpOTNvTHJNQEF9wsRIs36hxbZE6yY7H/mX0SDeOS+v4ub3PvugGzvglw==
           user: ${linux:system:user:jmosher}
diff --git a/openssh/server/team/members/jorgesorondo.yml b/openssh/server/team/members/jorgesorondo.yml
index 9ffbb4c..c21a8df 100644
--- a/openssh/server/team/members/jorgesorondo.yml
+++ b/openssh/server/team/members/jorgesorondo.yml
@@ -3,18 +3,17 @@
     system:
       user:
         jsorondo:
+          email: jsorondo@mirantis.com
           enabled: true
-          name: jsorondo
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Jorge Sorondo
           home: /home/jsorondo
-          email: jsorondo@mirantis.com
+          name: jsorondo
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         jsorondo:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYN/Y6PeKVaW+ouilurh9jyi2k+PDn097LPXxi82ODgPJ+p/qzr6oBYIWDNtudMhNTWA1uV2ZnMbbl67REWAc8V++NFQWtAX9lmtQ4S5w/CvWutgGqrUr7gjJJoq/ySMMFE1F3sekdPM90y2JS4K1L300de5UviAwgPMo48wq292MaESqq6/X7CV3VHDy5srA1VFI1oZMv66NpOO2mHzElKMtVISTHF8/W4yg1P7LvjlcH2vB2clfO6UtOZfcDaAibAyE+bClUYzK6YSRejni5hWaRYFOvza3PyIF6YvjznPxtTU4aclmiZrtMm5gLZB/euvkijXuBOPFO0xgDw6Q9
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYN/Y6PeKVaW+ouilurh9jyi2k+PDn097LPXxi82ODgPJ+p/qzr6oBYIWDNtudMhNTWA1uV2ZnMbbl67REWAc8V++NFQWtAX9lmtQ4S5w/CvWutgGqrUr7gjJJoq/ySMMFE1F3sekdPM90y2JS4K1L300de5UviAwgPMo48wq292MaESqq6/X7CV3VHDy5srA1VFI1oZMv66NpOO2mHzElKMtVISTHF8/W4yg1P7LvjlcH2vB2clfO6UtOZfcDaAibAyE+bClUYzK6YSRejni5hWaRYFOvza3PyIF6YvjznPxtTU4aclmiZrtMm5gLZB/euvkijXuBOPFO0xgDw6Q9
           user: ${linux:system:user:jsorondo}
diff --git a/openssh/server/team/members/josuepalmerin.yml b/openssh/server/team/members/josuepalmerin.yml
index 3e0d528..184ef75 100644
--- a/openssh/server/team/members/josuepalmerin.yml
+++ b/openssh/server/team/members/josuepalmerin.yml
@@ -3,21 +3,17 @@
     system:
       user:
         jpalmerin:
+          email: jpalmerin@mirantis.com
           enabled: true
-          name: jpalmerin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Josue Palmerin
           home: /home/jpalmerin
-          email: jpalmerin@mirantis.com
+          name: jpalmerin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         jpalmerin:
           enabled: true
-          public_keys: ${public_keys:jpalmerin}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKW9yFRdSTlpg2oVDYrg69yPzeG14CoLFvJeU9I4ZHv/d0SkiU12y+zkljWLEaa2aj+Zs8IbJZy+3Av1/uZ/s5UX0KkGJP1oCjH5LYPNbeXpdaCl/1w5uHf43DIebrj6q5XE0ziXLC79lEyXs1rQFV7B5D2rxnjrRPLnCckT4D2G1WoW5bylPezXqoO2YIua5IG/O0EOeV2gSQJAYEVQceJg+Hr6mtjL1AwSADecG5QiY+WV/XdX3OFiafJ5gnS2OpqH5MdNcnqegiXEdaEe07tW99E2j3EXY9nOvorzgB8xO+m3EKM0jAxAbA5LALAijn6ax/cuSMMKD4lkQbTc4b
           user: ${linux:system:user:jpalmerin}
-  public_keys:
-    jpalmerin:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKW9yFRdSTlpg2oVDYrg69yPzeG14CoLFvJeU9I4ZHv/d0SkiU12y+zkljWLEaa2aj+Zs8IbJZy+3Av1/uZ/s5UX0KkGJP1oCjH5LYPNbeXpdaCl/1w5uHf43DIebrj6q5XE0ziXLC79lEyXs1rQFV7B5D2rxnjrRPLnCckT4D2G1WoW5bylPezXqoO2YIua5IG/O0EOeV2gSQJAYEVQceJg+Hr6mtjL1AwSADecG5QiY+WV/XdX3OFiafJ5gnS2OpqH5MdNcnqegiXEdaEe07tW99E2j3EXY9nOvorzgB8xO+m3EKM0jAxAbA5LALAijn6ax/cuSMMKD4lkQbTc4b
-
diff --git a/openssh/server/team/members/listomin.yml b/openssh/server/team/members/listomin.yml
index 0871423..0a02e2b 100644
--- a/openssh/server/team/members/listomin.yml
+++ b/openssh/server/team/members/listomin.yml
@@ -3,18 +3,17 @@
     system:
       user:
         listomin:
+          email: listomin@mirantis.com
           enabled: true
-          name: listomin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Leontii Istomin
           home: /home/listomin
-          email: listomin@mirantis.com
+          name: listomin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         listomin:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxYzWudGTO2HNris63l1DWv3Q8gl9Rc09nrzogWy/tzXsoQohClhs3QVSSGb3ztRx1uRH7llQ3dq7Z05zxYjv5nBzU6SRkpQzSYXGx2xl0tJPWiNo1sY1xZzwlGHRJjI9DRJYmXAO6GO/n5zeYQ1kf47tSaP6MEV9HD4Ns1zWJ97Izi4EzaYQrosTSfGBfQKC6Vr4CiXfIVev1EQwUYIkrcLp5lcbOOLpfBfU9aRx1YU8V3MzYjGAiWlGeqZeKwyJc6H2JAGX8HEWDkwdMAdIjqsL5wH1KjeXd9V/gWUPaemj/XL0MLCPu0uBbdjWKGGcbTys+mr/gVGP/rwQOwYKl listomin@listomin-laptop.local
-          user: ${linux:system:user:listomin}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxYzWudGTO2HNris63l1DWv3Q8gl9Rc09nrzogWy/tzXsoQohClhs3QVSSGb3ztRx1uRH7llQ3dq7Z05zxYjv5nBzU6SRkpQzSYXGx2xl0tJPWiNo1sY1xZzwlGHRJjI9DRJYmXAO6GO/n5zeYQ1kf47tSaP6MEV9HD4Ns1zWJ97Izi4EzaYQrosTSfGBfQKC6Vr4CiXfIVev1EQwUYIkrcLp5lcbOOLpfBfU9aRx1YU8V3MzYjGAiWlGeqZeKwyJc6H2JAGX8HEWDkwdMAdIjqsL5wH1KjeXd9V/gWUPaemj/XL0MLCPu0uBbdjWKGGcbTys+mr/gVGP/rwQOwYKl listomin@listomin-laptop.local
+          user: ${linux:system:user:listomin}
diff --git a/openssh/server/team/members/lmercl.yml b/openssh/server/team/members/lmercl.yml
index 04be2f5..756966d 100644
--- a/openssh/server/team/members/lmercl.yml
+++ b/openssh/server/team/members/lmercl.yml
@@ -3,19 +3,18 @@
     system:
       user:
         lmercl:
+          email: lmercl@mirantis.com
           enabled: true
-          name: lmercl
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Lubos Mercl
           home: /home/lmercl
-          email: lmercl@mirantis.com
+          name: lmercl
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         lmercl:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCy6mFrr4oNdLjT5wBZj1+KXNpdawnGGWEevDBQ2SWFjxBFujkWVLiW1kxLTpLVSnuoE5FB7doRIsT/CDe9IU5OhsJ+z6TT56R/pfVKrVnSB1rgrwqdezjgmYEM6kTWiH2GKJE0yiQEPgagK8Rz5Zl420JkhbFWnL7EGPhxNtmYMGDTZwUTzP0KYmytyeH15OqNIiBGTrp1t2bTrVB8HRnUp0uDpfoWAUnsijVGNe1j1bNKtDO0Z9LAWx3eUyxIk4cdpX/EeWJg8jNrSMxtAZZ7Hhm/WInNSNqcHcZ1rEYCAjENxo1WVOuA/aqUqc5xaAipWNon4Rk0e0IUAaFOfLvN2lIuilUZ5XKHDe7a2crkGPnotheT9FgaEHOeFtpuhSaygeZHTMR197jeocgjWIkPqHjVAGSQqQf0TAdNuN73QPTigbbfHWWc1d8KlCM5BqJUXMHPG6BasE1sI/4ykYbxN/DAEvVJ4+rdIlqSdedd73ZAseVQjDtpzD8diScGrpdOhZnTm43q89F8dIFv7tt1TjIwvfcDQNSBjyyKcYpj+NTyW2Zk7qWDVz+lzH0ToYk/rOKkGlrsRy7OwOnmyKR8IcIOL7Bowj895ThCX8tBrdLu/m55ojBOcZiCpawCm7K55ri1Ar6i8cO+bHDh11kKRa/utRRSQTpsW0sbCsamzQ== lubos@lubos-ThinkPad-X1
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZFmRirw1DHtY8VQDfnZDEi1tWhW4lHWaCq3T14K2HtU17ulJB4KbonMWZLiqFsX44okKM7FOiR9L5ij417CRytlzuHSJebnDj6kppE+lslvfd8TdTTVmvQ7rLj+mdvsRmNVRnou1JPlhryJFshZSsfonn6s6AlAWW4RHx9a8kWuYplObGdUQN9pXReDso9UjeOOuPVmtpfvBXgljHEa/IyAAk47CTe7vVTggauWTVIB+F3zmL2KPFEKGBvd6Ac/wOdirHgV5YgR9LT81hZ9p6TZXkfbIGOl+K6dOIgGqGykn77qloTnKUTSPMWJz11xgwE3sv314ZZ6oZvhCVCcLX lmercl@Luboss-MacBook-Pro.local
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCy6mFrr4oNdLjT5wBZj1+KXNpdawnGGWEevDBQ2SWFjxBFujkWVLiW1kxLTpLVSnuoE5FB7doRIsT/CDe9IU5OhsJ+z6TT56R/pfVKrVnSB1rgrwqdezjgmYEM6kTWiH2GKJE0yiQEPgagK8Rz5Zl420JkhbFWnL7EGPhxNtmYMGDTZwUTzP0KYmytyeH15OqNIiBGTrp1t2bTrVB8HRnUp0uDpfoWAUnsijVGNe1j1bNKtDO0Z9LAWx3eUyxIk4cdpX/EeWJg8jNrSMxtAZZ7Hhm/WInNSNqcHcZ1rEYCAjENxo1WVOuA/aqUqc5xaAipWNon4Rk0e0IUAaFOfLvN2lIuilUZ5XKHDe7a2crkGPnotheT9FgaEHOeFtpuhSaygeZHTMR197jeocgjWIkPqHjVAGSQqQf0TAdNuN73QPTigbbfHWWc1d8KlCM5BqJUXMHPG6BasE1sI/4ykYbxN/DAEvVJ4+rdIlqSdedd73ZAseVQjDtpzD8diScGrpdOhZnTm43q89F8dIFv7tt1TjIwvfcDQNSBjyyKcYpj+NTyW2Zk7qWDVz+lzH0ToYk/rOKkGlrsRy7OwOnmyKR8IcIOL7Bowj895ThCX8tBrdLu/m55ojBOcZiCpawCm7K55ri1Ar6i8cO+bHDh11kKRa/utRRSQTpsW0sbCsamzQ== lubos@lubos-ThinkPad-X1
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZFmRirw1DHtY8VQDfnZDEi1tWhW4lHWaCq3T14K2HtU17ulJB4KbonMWZLiqFsX44okKM7FOiR9L5ij417CRytlzuHSJebnDj6kppE+lslvfd8TdTTVmvQ7rLj+mdvsRmNVRnou1JPlhryJFshZSsfonn6s6AlAWW4RHx9a8kWuYplObGdUQN9pXReDso9UjeOOuPVmtpfvBXgljHEa/IyAAk47CTe7vVTggauWTVIB+F3zmL2KPFEKGBvd6Ac/wOdirHgV5YgR9LT81hZ9p6TZXkfbIGOl+K6dOIgGqGykn77qloTnKUTSPMWJz11xgwE3sv314ZZ6oZvhCVCcLX lmercl@Luboss-MacBook-Pro.local
           user: ${linux:system:user:lmercl}
diff --git a/openssh/server/team/members/manashkin.yml b/openssh/server/team/members/manashkin.yml
index 17da835..d5f4f96 100644
--- a/openssh/server/team/members/manashkin.yml
+++ b/openssh/server/team/members/manashkin.yml
@@ -3,19 +3,17 @@
     system:
       user:
         manashkin:
+          email: manashkin@mirantis.com
           enabled: true
-          name: manashkin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Miroslav Anashkin
           home: /home/manashkin
-          email: manashkin@mirantis.com
+          name: manashkin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         manashkin:
           enabled: true
           public_keys:
           - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDb1XOAU6ZoU+hSB0SPaypwK1Weu2armLzQrIQ3hhmlpAxFDV50oiF/PyPZ7W5NkJWgEr+DGYuZiKuqTDosrQV5Tt8TA4nt6bSJ9SlhJlNGltrOeWeLcP/Hf2YyWm0e9puzAIgUsKN8Np+CBrpIls4bq2JCshkz/vz9AreaFBMHrhjrh8YNn+yNbETJf9nmxDazVqYp3UI5SU4Wg0KchrFHBPNlREL099SSARfTGIsfbbJmSHx2LUw3Rt6v2fizRslv+Tuxvx2tqRsgbjeF7+NKfOFMBIloab97ag7N9EUdVvOHrjScXQ+nP/kdk3iq7O2WDpAgKYXIbSuaWA0YUk5Z manashkin@mirantis.com
           user: ${linux:system:user:manashkin}
-          group:
diff --git a/openssh/server/team/members/maximefimov.yml b/openssh/server/team/members/maximefimov.yml
index 1915548..286268d 100644
--- a/openssh/server/team/members/maximefimov.yml
+++ b/openssh/server/team/members/maximefimov.yml
@@ -3,20 +3,17 @@
     system:
       user:
         mefimov:
+          email: mefimov@mirantis.com
           enabled: true
-          name: mefimov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Maxim Efimov
           home: /home/mefimov
-          email: mefimov@mirantis.com
+          name: mefimov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         mefimov:
           enabled: true
-          public_keys: ${public_keys:mefimov}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAhbjsMWhgLWtiSYwJRBY8x6yuXPEmeOPjv2SWsGnhLkW3iY/6CEYph4mKBP22vvJaiXRmuUNIpQCnORjp9OrzD9gQM94EmEjpPhaLixYeejPxPW27rEfRo+Xtp9U02GfBUBpBP1hwayKvCOM8y/FTZnPF3pS2zXmBU9VYf3MGR8mt1RS1uJHj+ZBO6fDnf7LNStps1oGdyXkliTqytLH2AE7t+darR3RDN9CN8qMfAMaPSvDjjqE4UzmpoBU4+by/Rxt3bFFyGx5v0/xwq0ieSXT0pkLFSB7mX2P4BiPvr4piH3rZzcVio5QJ5zcH86fHwME9+/tUg7DXihWWW89Vvw== rsa-key-20161025
           user: ${linux:system:user:mefimov}
-  public_keys:
-    mefimov:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAhbjsMWhgLWtiSYwJRBY8x6yuXPEmeOPjv2SWsGnhLkW3iY/6CEYph4mKBP22vvJaiXRmuUNIpQCnORjp9OrzD9gQM94EmEjpPhaLixYeejPxPW27rEfRo+Xtp9U02GfBUBpBP1hwayKvCOM8y/FTZnPF3pS2zXmBU9VYf3MGR8mt1RS1uJHj+ZBO6fDnf7LNStps1oGdyXkliTqytLH2AE7t+darR3RDN9CN8qMfAMaPSvDjjqE4UzmpoBU4+by/Rxt3bFFyGx5v0/xwq0ieSXT0pkLFSB7mX2P4BiPvr4piH3rZzcVio5QJ5zcH86fHwME9+/tUg7DXihWWW89Vvw== rsa-key-20161025
diff --git a/openssh/server/team/members/mikhailkraynov.yml b/openssh/server/team/members/mikhailkraynov.yml
index a7a2d95..ca186ba 100644
--- a/openssh/server/team/members/mikhailkraynov.yml
+++ b/openssh/server/team/members/mikhailkraynov.yml
@@ -3,21 +3,17 @@
     system:
       user:
         mkraynov:
+          email: mkraynov@mirantis.com
           enabled: true
-          name: mkraynov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Mikhail Kraynov
           home: /home/mkraynov
-          email: mkraynov@mirantis.com
+          name: mkraynov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         mkraynov:
           enabled: true
-          public_keys: ${public_keys:mkraynov}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDD2yg5tjwdg+SFPbcm+qIsrYjLcI3qbaqSInA+qY7oyLGj3nO0sC4Wj+6hOQIEzuxXtt7a88Y0ghQrYB5EB6RK7Q6Ll0vT7XdqdVoYiYiKIvaAk7rOt1hhfDb1ogVTXXs7dKCUKmJDMZnALOuh2UJHoRd3G4wyveInNBAHW6PqOIfU0PjEckjDuGhAmYSlawXebNxDgGOvk0TfsxUGiCN3JKKZ6w5956eub6/I+HWpMzZIB1oUsgtPfhTvFnA7vq7JxNVWUv/tXvSI0qKuOCZ+eH8n2/cWtrzOwRUptMGMS7oOMvwEil99BruuB8Xl5Um1iG8qd+H0gAfVeKMnuBkT
           user: ${linux:system:user:mkraynov}
-  public_keys:
-    mkraynov:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDD2yg5tjwdg+SFPbcm+qIsrYjLcI3qbaqSInA+qY7oyLGj3nO0sC4Wj+6hOQIEzuxXtt7a88Y0ghQrYB5EB6RK7Q6Ll0vT7XdqdVoYiYiKIvaAk7rOt1hhfDb1ogVTXXs7dKCUKmJDMZnALOuh2UJHoRd3G4wyveInNBAHW6PqOIfU0PjEckjDuGhAmYSlawXebNxDgGOvk0TfsxUGiCN3JKKZ6w5956eub6/I+HWpMzZIB1oUsgtPfhTvFnA7vq7JxNVWUv/tXvSI0qKuOCZ+eH8n2/cWtrzOwRUptMGMS7oOMvwEil99BruuB8Xl5Um1iG8qd+H0gAfVeKMnuBkT
-
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/mkarpin.yml b/openssh/server/team/members/mkarpin.yml
index dc504d3..648089d 100644
--- a/openssh/server/team/members/mkarpin.yml
+++ b/openssh/server/team/members/mkarpin.yml
@@ -3,18 +3,17 @@
     system:
       user:
         mkarpin:
+          email: mkarpin@mirantis.com
           enabled: true
-          name: mkarpin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Mykyta Karpin
           home: /home/mkarpin
-          email: mkarpin@mirantis.com
+          name: mkarpin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         mkarpin:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCcO+qMO4z5O75JmeoyHQKNjq72psAMO2lebEMl5MbgVs7BAOT3PChamRId3xhwX2X5R0vS1ZSgRm0XC4br2OpJ9DsBhOBbPRK/EyjAm5aTBW8eZZ69NDFam/hLJ6Xq+jZDdlBT8iK7CPxTJD+0wz1KqpIgYlUNkix5EEj2wfUAfw3j6lGiEVQ0Cpbejey9sYlUSitKcYs/EAX5byBBqkFCLL4/D77fLOIuWfDzAAStUR/wbOJnWNiIScifu4EUdcSdHra9RoQaRgo31ALq+BeYVpvqnyHTOw9t2q04sZVDN4anhUMAFh0n1CkbY/2HWpX/RYWt1bV6XtDeoCpsC5Ar nkarpin@nkarpin-pc
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCcO+qMO4z5O75JmeoyHQKNjq72psAMO2lebEMl5MbgVs7BAOT3PChamRId3xhwX2X5R0vS1ZSgRm0XC4br2OpJ9DsBhOBbPRK/EyjAm5aTBW8eZZ69NDFam/hLJ6Xq+jZDdlBT8iK7CPxTJD+0wz1KqpIgYlUNkix5EEj2wfUAfw3j6lGiEVQ0Cpbejey9sYlUSitKcYs/EAX5byBBqkFCLL4/D77fLOIuWfDzAAStUR/wbOJnWNiIScifu4EUdcSdHra9RoQaRgo31ALq+BeYVpvqnyHTOw9t2q04sZVDN4anhUMAFh0n1CkbY/2HWpX/RYWt1bV6XtDeoCpsC5Ar nkarpin@nkarpin-pc
           user: ${linux:system:user:mkarpin}
diff --git a/openssh/server/team/members/mkobus.yml b/openssh/server/team/members/mkobus.yml
new file mode 100644
index 0000000..d418681
--- /dev/null
+++ b/openssh/server/team/members/mkobus.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        mkobus:
+          email: mkobus@mirantis.com
+          enabled: true
+          full_name: "Micha\u0142 Kobus"
+          home: /home/mkobus
+          name: mkobus
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        mkobus:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCBqe3X+LrneiuieWGjlw5wRtgixBu2Q8LZjH6W+8nsOkB7iN6qRdKom3jac1Cdd5wSJ0NFAhDNcTLK4Etz/3YACglsTxk09TzXlqs1V0Y7U5a2eqn3KTOgMNsJ1aOhFq/LnmUwTdN8NXac6TIkwZZBj5KhHSvIoO+mfsascct5FIVU/+p32d3o/4NqMDDdTg/qxIMKQsh5sw5Y9Tz9h28LGbDh+QF2lW+b5YJhnCG21Uw17xcyxf3/53EpJwTXfElonSR7HMVLxrq7oDzmqKFZ2z8i9do6EgODKlZpSkxiAFOBw5oA2hPtEeqtXqvddu2FcNGuSNhx/6O8ZHIKq3Xh/tTOYnoc+qYDMRCzDwzeyivfr5Ci3n64giUaZl+KUr6D1CKeL2s8j9+kod/1JJDEeoYR+V93MTiTD/39N8eQAGv+6r9HBapXIkvr3iNuTH1+5eN36Vc90jXXRmGMZkF5P9ivNGDZGcy2pBwwPg/bRn2xb0zx1fsxd4qOi+Cd7mBCF4+SfnVCqUd2H9R0O3S7WgfLr+wOXpFq6/WwgjzI9RVhLJ5cZmePJKvYZYYhkAxsVwWSE639zFFuU1zhFXr49wa0njK9DdYWiQEhOki0ki3huABmVbWKg/zP1Rlllmtk0S4mwggJ57JYbuhEV3a1x1KOtWMzODW5cb3HlPTQw==
+          user: ${linux:system:user:mkobus}
diff --git a/openssh/server/team/members/mmatuszkowiak.yml b/openssh/server/team/members/mmatuszkowiak.yml
new file mode 100644
index 0000000..43fb88e
--- /dev/null
+++ b/openssh/server/team/members/mmatuszkowiak.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        mmatuszkowiak:
+          email: mmatuszkowiak@mirantis.com
+          enabled: true
+          full_name: Mateusz Matuszkowiak
+          home: /home/mmatuszkowiak
+          name: mmatuszkowiak
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        mmatuszkowiak:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDC6TGCQAH3FGNSOhSbovhwODabOAsgVqG71rEDdXvDSShwyNB3RIICefas3mdSLsG7+1K9mZ1jicWzNbotvePwzrM/MESzntzp4QZ5J/9L3BMiqWWKL2u6BQ65LGe0YMzMmdSkqMAj0uxt3+OiFDPDrwqH6qN0hwxAJM+byeUlQW8uWQYm/pmWMD60GUrnjYUfKfEa/S3symaZBHQvjtp26De8D6u/jr4TWi5VJpKqVREqU7Z4IKwn8JvHMmUbRO4endW3cRiv35Qb7s66rO6TD0KlDFnnTxOtFvLhL51j58X4MrV9FHUI6czoqjAgEDe9CW7DzZ1xMj03d6IAipgL
+          user: ${linux:system:user:mmatuszkowiak}
diff --git a/openssh/server/team/members/mmazepa.yml b/openssh/server/team/members/mmazepa.yml
index a8aa3ba..f7000c3 100644
--- a/openssh/server/team/members/mmazepa.yml
+++ b/openssh/server/team/members/mmazepa.yml
@@ -3,20 +3,17 @@
     system:
       user:
         mmazepa:
+          email: mmazepa@mirantis.com
           enabled: true
-          name: mmazepa
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Margarita Mazepa
           home: /home/mmazepa
-          email: mmazepa@mirantis.com
+          name: mmazepa
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         mmazepa:
           enabled: true
-          public_keys: ${public_keys:mmazepa}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcMaBZDgLdCaOtoSd76IMIS+eJvOZSkidAIeBw/XuKz1jXfftdjUwWUNV+51Q+trvGE/Z/Puv4KCzTxnBhqo2n2HsO+LWGUn1Kg9SIQv6leSnfl62nLaTi2iiE7G+JEk3It9/cqonJkTWsXiid0Ve27GooxlInlgpwfk0VE6zSeYBdBIwtdi/l/lenkkdcSSu+lOe58kDxUziZvvheZ08LwczPWYxYd3pmDmFi5WHOhVPoxR+9LICSNc012N9VU3E/h99nz7Bx2wmdBq+OE4ManHhUP90ntJmLkak7CoSsPOpNOtpkLfTbW/m2XVaWoUKT39s4aU8ItQ3tdWMzuWr/ margarita@wargyrl
           user: ${linux:system:user:mmazepa}
-  public_keys:
-    mmazepa:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcMaBZDgLdCaOtoSd76IMIS+eJvOZSkidAIeBw/XuKz1jXfftdjUwWUNV+51Q+trvGE/Z/Puv4KCzTxnBhqo2n2HsO+LWGUn1Kg9SIQv6leSnfl62nLaTi2iiE7G+JEk3It9/cqonJkTWsXiid0Ve27GooxlInlgpwfk0VE6zSeYBdBIwtdi/l/lenkkdcSSu+lOe58kDxUziZvvheZ08LwczPWYxYd3pmDmFi5WHOhVPoxR+9LICSNc012N9VU3E/h99nz7Bx2wmdBq+OE4ManHhUP90ntJmLkak7CoSsPOpNOtpkLfTbW/m2XVaWoUKT39s4aU8ItQ3tdWMzuWr/ margarita@wargyrl
diff --git a/openssh/server/team/members/mpolreich.yml b/openssh/server/team/members/mpolreich.yml
index cfe8b70..deece1d 100644
--- a/openssh/server/team/members/mpolreich.yml
+++ b/openssh/server/team/members/mpolreich.yml
@@ -3,18 +3,17 @@
     system:
       user:
         mpolreich:
+          email: mpolreich@mirantis.com
           enabled: true
-          name: mpolreich
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Martin Polreich
           home: /home/mpolreich
-          email: mpolreich@mirantis.com
+          name: mpolreich
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         mpolreich:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDC6jbVpCqvru+Te2RGLPy/AkcaoRqyqxdBi3OjjXdRjPQYGNuAEFgmlQDZvs5xBMAKOcrcCl8wLcFb3mmpr9+xBJAdR4K0bEqwMfCKRejsN+6AubCbrOeoWb9SsTdvBOl7rOFyICt/XuSNX56C8k1hJojC0U21DIertWSCd8h5RExE8Skqd9+KdHSFa+TZffWbysMrwba29UBt7XsAPuQr1BUOqhA8JOx146ul5HszitCOSvglre8pSJKpw6a4Fk/cb1J8Oc/AfSMdTvTLAfuF+d2Mw6SEawFEocSXq0WKCdZfJpZrWPr6SEB+7zoq3kvhIWgUH2ypYZvvqf0EVlWx polreichmartin@gmail.com
-          user: ${linux:system:user:mpolreich}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDC6jbVpCqvru+Te2RGLPy/AkcaoRqyqxdBi3OjjXdRjPQYGNuAEFgmlQDZvs5xBMAKOcrcCl8wLcFb3mmpr9+xBJAdR4K0bEqwMfCKRejsN+6AubCbrOeoWb9SsTdvBOl7rOFyICt/XuSNX56C8k1hJojC0U21DIertWSCd8h5RExE8Skqd9+KdHSFa+TZffWbysMrwba29UBt7XsAPuQr1BUOqhA8JOx146ul5HszitCOSvglre8pSJKpw6a4Fk/cb1J8Oc/AfSMdTvTLAfuF+d2Mw6SEawFEocSXq0WKCdZfJpZrWPr6SEB+7zoq3kvhIWgUH2ypYZvvqf0EVlWx polreichmartin@gmail.com
+          user: ${linux:system:user:mpolreich}
diff --git a/openssh/server/team/members/mshalamov.yml b/openssh/server/team/members/mshalamov.yml
index dff804d..d01811d 100644
--- a/openssh/server/team/members/mshalamov.yml
+++ b/openssh/server/team/members/mshalamov.yml
@@ -3,18 +3,17 @@
     system:
       user:
         mshalamov:
+          email: mshalamov@mirantis.com
           enabled: true
-          name: mshalamov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Maksym Shalamov
           home: /home/mshalamov
-          email: mshalamov@mirantis.com
+          name: mshalamov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         mshalamov:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzGhXA8t3nWeeM8+L3drG+4ACt9pOS1CVAAsW634Q6EtbxSzpsdp3NEJ3X8jKmfiwGZmqUiJ0G0lzS+vHdQ4vJ58M9f7YpXYYah8/557YLvIgg+F/3cltS7PHSE3jqNZgQBHG0f4SRwiBq4zhWhDOCXtzHmsT4EUj+9K6EOlPk7SjrOQAZA0XcPl//lw8g5zHAAC6phNa+WzHLzQSyWAZZhIKyvbXTHpSAUAww5rIlquucxVMbnbqlSOD4FTikSOLQa9iq4Nx10c3ZZTD3xTMuissSj5XJU5LaO7qlraOBsKTlkO0T+VS1aMnfJ943QSI2wu6epKWWHAFXV7Z2nsTL mshalamov@mirantis.com
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzGhXA8t3nWeeM8+L3drG+4ACt9pOS1CVAAsW634Q6EtbxSzpsdp3NEJ3X8jKmfiwGZmqUiJ0G0lzS+vHdQ4vJ58M9f7YpXYYah8/557YLvIgg+F/3cltS7PHSE3jqNZgQBHG0f4SRwiBq4zhWhDOCXtzHmsT4EUj+9K6EOlPk7SjrOQAZA0XcPl//lw8g5zHAAC6phNa+WzHLzQSyWAZZhIKyvbXTHpSAUAww5rIlquucxVMbnbqlSOD4FTikSOLQa9iq4Nx10c3ZZTD3xTMuissSj5XJU5LaO7qlraOBsKTlkO0T+VS1aMnfJ943QSI2wu6epKWWHAFXV7Z2nsTL mshalamov@mirantis.com
           user: ${linux:system:user:mshalamov}
diff --git a/openssh/server/team/members/obasov.yml b/openssh/server/team/members/obasov.yml
index 8f58212..693d45c 100644
--- a/openssh/server/team/members/obasov.yml
+++ b/openssh/server/team/members/obasov.yml
@@ -3,18 +3,17 @@
     system:
       user:
         obasov:
+          email: obasov@mirantis.com
           enabled: true
-          name: obasov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Oleg Basov
           home: /home/obasov
-          email: obasov@mirantis.com
+          name: obasov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         obasov:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbt+z214gkpRTA1Fso0ltxDq37Cu0l75stLO9eIPh9Gd38MliXB5NpJsGk3b521y/a2fdIKMfzwlt3WpC/cgx16l2PesEt4b/ASHYiHNtoGPxbcDRfgcamAsUyUyPtKjbBJJJ2aPfYRRhnEDOZwA3P6ITvpfzj4I24Y46j1H+qmi8gKzFTZpj0EobaPTi/sRztuVLspTy3MntcIwGBJMZCaz0jifYLEEFdEQRHdaZy5L2/2jv7GVECBRd0ucHr+zSM1uV4LQbQVCuGquTn05GZBpwgtMyfwhm7ySMsewZpssVReDha+0WVpNiftKcyBAjXdUsLAgZqeaAz4exey1r olegeech@ns1.sytkovo.su
-          user: ${linux:system:user:obasov}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbt+z214gkpRTA1Fso0ltxDq37Cu0l75stLO9eIPh9Gd38MliXB5NpJsGk3b521y/a2fdIKMfzwlt3WpC/cgx16l2PesEt4b/ASHYiHNtoGPxbcDRfgcamAsUyUyPtKjbBJJJ2aPfYRRhnEDOZwA3P6ITvpfzj4I24Y46j1H+qmi8gKzFTZpj0EobaPTi/sRztuVLspTy3MntcIwGBJMZCaz0jifYLEEFdEQRHdaZy5L2/2jv7GVECBRd0ucHr+zSM1uV4LQbQVCuGquTn05GZBpwgtMyfwhm7ySMsewZpssVReDha+0WVpNiftKcyBAjXdUsLAgZqeaAz4exey1r olegeech@ns1.sytkovo.su
+          user: ${linux:system:user:obasov}
diff --git a/openssh/server/team/members/obryndzii.yml b/openssh/server/team/members/obryndzii.yml
index 911bdd8..28ebf03 100644
--- a/openssh/server/team/members/obryndzii.yml
+++ b/openssh/server/team/members/obryndzii.yml
@@ -3,15 +3,14 @@
     system:
       user:
         obryndzii:
+          email: obryndzii@mirantis.com
           enabled: true
-          name: obryndzii
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Oleksandr Bryndzii
           home: /home/obryndzii
-          email: obryndzii@mirantis.com
+          name: obryndzii
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         obryndzii:
           enabled: true
diff --git a/openssh/server/team/members/obutenko.yml b/openssh/server/team/members/obutenko.yml
new file mode 100644
index 0000000..4b0cddb
--- /dev/null
+++ b/openssh/server/team/members/obutenko.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        obutenko:
+          email: obutenko@mirantis.com
+          enabled: true
+          full_name: Oleksii Butenko
+          home: /home/obutenko
+          name: obutenko
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        obutenko:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1AfAmTtaBkg+8osdkG37KSHGc1r7k0ZWIgTR+COgPBnGGySRFrL3paG8PJ+JaEtZwj0git/Kufr+Mlcdln3x21kI3V4Jol0bgfx3d+AVZ2niyjwEHEl1vN6ffevzJUPVvLlUWlykKrEnGp1+RXKT3MEaoDcexzRLRgZB/FLaX79i1tE/AqB35rH5MZLBGCRYJdisUrpj70UHwIsqgikwr3P/JNr5gJzYTewPM8ls9Y9BtFNbFHmU8L9b8jFjmhOnCJmXXJPoLxQYRX+MQbcov7r2omZ95xulRnJsvY6xY2BSe8FAVmT8UzXnkWi3CrXwqPBdutu9GUCsQmH934vdJ obutenko@obutenko-pc
+          user: ${linux:system:user:obutenko}
diff --git a/openssh/server/team/members/ogrudev.yml b/openssh/server/team/members/ogrudev.yml
index 71964a6..6e3d7fb 100644
--- a/openssh/server/team/members/ogrudev.yml
+++ b/openssh/server/team/members/ogrudev.yml
@@ -3,18 +3,17 @@
     system:
       user:
         ogrudev:
+          email: ogrudev@mirantis.com
           enabled: true
-          name: ogrudev
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Oleksii Grudev
           home: /home/ogrudev
-          email: ogrudev@mirantis.com
+          name: ogrudev
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         ogrudev:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDilSKhVkANZQLOY6zhLBxhKD0OabfORbuxL3H1o+Q0TfL223/I2A8FAqpZzu9RdX0FoOcP3S85S51IX1p4odipTAA9Wyp4jEtMNUUWvRkXWTvVR99+QNCq4QiB78c0JhtydKPu29DJNQr3/UHG877BCrLvOyiXFNrVZI+EBC+Md2SEqSN8e1P/DlORUrjgQKAxuKhMhDyoBbyBvnfK32IYbs8bKlYZRusj1dlL3Jv/nR4VvN4YT+CzNOPCBTljFdcxuqdPZvqdAyMBIYDxaCxx2id96L98kYavKlqUZJn0x6mJ8ndtHtfn+Fwjom/+8cPFUjuhULWsQiPRjfqA6p8r agrudev@agrudev-pc
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDilSKhVkANZQLOY6zhLBxhKD0OabfORbuxL3H1o+Q0TfL223/I2A8FAqpZzu9RdX0FoOcP3S85S51IX1p4odipTAA9Wyp4jEtMNUUWvRkXWTvVR99+QNCq4QiB78c0JhtydKPu29DJNQr3/UHG877BCrLvOyiXFNrVZI+EBC+Md2SEqSN8e1P/DlORUrjgQKAxuKhMhDyoBbyBvnfK32IYbs8bKlYZRusj1dlL3Jv/nR4VvN4YT+CzNOPCBTljFdcxuqdPZvqdAyMBIYDxaCxx2id96L98kYavKlqUZJn0x6mJ8ndtHtfn+Fwjom/+8cPFUjuhULWsQiPRjfqA6p8r agrudev@agrudev-pc
           user: ${linux:system:user:ogrudev}
diff --git a/openssh/server/team/members/ohryhorov.yml b/openssh/server/team/members/ohryhorov.yml
index c58076e..154ffdd 100644
--- a/openssh/server/team/members/ohryhorov.yml
+++ b/openssh/server/team/members/ohryhorov.yml
@@ -3,18 +3,17 @@
     system:
       user:
         ohryhorov:
+          email: ohryhorov@mirantis.com
           enabled: true
-          name: ohryhorov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Oleh Hryhorov
           home: /home/ohryhorov
-          email: ohryhorov@mirantis.com
+          name: ohryhorov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         ohryhorov:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDURrVLvo44rOSe/2GBh69SPS06Jam21dJrunM9TzuxcHkw7u/rVLMA+pDMMwu/x2n8fFkW7wrd3/6QH7cLOGt1Xw4PDfFA17ZGmV7HwZ1XOeoux2+47TFkGeHyeHOqf7xKMW4o35tKDXd5uipW9opl7+Zm/l7ucd6TKnGjh9vA3nD9xqF8Gxb6qvY7W35EFMPAwU9sK9lMwM/LkuUJirEP11sIK38OoEC2aysNtXZyKdQ9LgmBWZGbaCod0LzgAJd29zQOxWOHHWOE7PK4zHVWYN3AxfiIWSg2mxqARMnqZpPulqbgwVETxLsJJSnPOvvTwoVggimxXh1HPUI7wUnb ohryhorov@ohryhorov-pc
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDURrVLvo44rOSe/2GBh69SPS06Jam21dJrunM9TzuxcHkw7u/rVLMA+pDMMwu/x2n8fFkW7wrd3/6QH7cLOGt1Xw4PDfFA17ZGmV7HwZ1XOeoux2+47TFkGeHyeHOqf7xKMW4o35tKDXd5uipW9opl7+Zm/l7ucd6TKnGjh9vA3nD9xqF8Gxb6qvY7W35EFMPAwU9sK9lMwM/LkuUJirEP11sIK38OoEC2aysNtXZyKdQ9LgmBWZGbaCod0LzgAJd29zQOxWOHHWOE7PK4zHVWYN3AxfiIWSg2mxqARMnqZpPulqbgwVETxLsJJSnPOvvTwoVggimxXh1HPUI7wUnb ohryhorov@ohryhorov-pc
           user: ${linux:system:user:ohryhorov}
diff --git a/openssh/server/team/members/oliemieshko.yml b/openssh/server/team/members/oliemieshko.yml
index ec8d8d6..c3ef98f 100644
--- a/openssh/server/team/members/oliemieshko.yml
+++ b/openssh/server/team/members/oliemieshko.yml
@@ -3,15 +3,14 @@
     system:
       user:
         oliemieshko:
+          email: oliemieshko@mirantis.com
           enabled: true
-          name: oliemieshko
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Oleksandr Liemieshko
           home: /home/oliemieshko
-          email: oliemieshko@mirantis.com
+          name: oliemieshko
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         oliemieshko:
           enabled: true
diff --git a/openssh/server/team/members/omolchanov.yml b/openssh/server/team/members/omolchanov.yml
index 85b8ccf..85db3a9 100644
--- a/openssh/server/team/members/omolchanov.yml
+++ b/openssh/server/team/members/omolchanov.yml
@@ -3,18 +3,17 @@
     system:
       user:
         omolchanov:
+          email: omolchanov@mirantis.com
           enabled: true
-          name: omolchanov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Oleksii Molchanov
           home: /home/omolchanov
-          email: omolchanov@mirantis.com
+          name: omolchanov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         omolchanov:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCulNT7qgpJtIoLshljGonHfWk5IYh/MhzO2PEh3GnzrsnI8Mgv2W8TCD4ZB7RbSP6Jt74T7P6F4Mgzag/Nxjwimh7cUJoJZQH54QC4GVBN+YG+CRjEhIDn/OEM9q+6fnAWqBLBf/k0pzeRxWM4mLpcU+6DSPS57qjEKG5OfLCgFbBFg+4EdGP9HNVTLcMBglo7vTWtvzaGjJgH0XFXjx1fXW9JftEmwMzNdoYpQ/a19JYC2x5vu0cGWUjdMWmrzJbnTJ7SwnVYfD2mhUYDi8WGy/nCk67tb6qKCAUN5kvCEWrMPDhVEcBfvyhXU2wVnZHJbOoZxrBiici9q2U7KDYT alex@alex-B85M-DS3H
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCulNT7qgpJtIoLshljGonHfWk5IYh/MhzO2PEh3GnzrsnI8Mgv2W8TCD4ZB7RbSP6Jt74T7P6F4Mgzag/Nxjwimh7cUJoJZQH54QC4GVBN+YG+CRjEhIDn/OEM9q+6fnAWqBLBf/k0pzeRxWM4mLpcU+6DSPS57qjEKG5OfLCgFbBFg+4EdGP9HNVTLcMBglo7vTWtvzaGjJgH0XFXjx1fXW9JftEmwMzNdoYpQ/a19JYC2x5vu0cGWUjdMWmrzJbnTJ7SwnVYfD2mhUYDi8WGy/nCk67tb6qKCAUN5kvCEWrMPDhVEcBfvyhXU2wVnZHJbOoZxrBiici9q2U7KDYT alex@alex-B85M-DS3H
           user: ${linux:system:user:omolchanov}
diff --git a/openssh/server/team/members/osavatieiev.yml b/openssh/server/team/members/osavatieiev.yml
new file mode 100644
index 0000000..54411f3
--- /dev/null
+++ b/openssh/server/team/members/osavatieiev.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        osavatieiev:
+          enabled: true
+          name: osavatieiev
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Alex Savatieiev
+          home: /home/osavatieiev
+          email: osavatieiev@mirantis.com
+  openssh:
+    server:
+      user:
+        osavatieiev:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1LOY6PdhYlueDeIx2ASl+56z+eUGqYXA2Aqep5W5j68W7ZRB0lmuam2Bqh5WVRP14l2pTQrV9CsCd8G1Y4nQamAwIb86ipf+8KKEawVaeWjihcUQf5VVwKIZEeZEwdHJFk5wK9YfmICn2x6rhKlQJ5ibcHpHlhdOgoscxvHMixzVxLGeRVyGn3OOeiGCEF+Ltt/ug1vj8A/9ytOCL0OMJJ9Oj8bCxrp9VQlVMAJt6Jp7iL6K8Q0J97/MZ1MehVr5RrpVf2wKNKrydfSwdqw+ZgIiQWRVl6yzv4S8AWCVhyFRMe7b1hMRpSQOqsW3oKgDyxfhc34/FFBNLOdAsQCSf osavatieiev@mirantis.com
+          user: ${linux:system:user:osavatieiev}
diff --git a/openssh/server/team/members/oshyshko.yml b/openssh/server/team/members/oshyshko.yml
index 8d9fea0..ee31ea2 100644
--- a/openssh/server/team/members/oshyshko.yml
+++ b/openssh/server/team/members/oshyshko.yml
@@ -3,18 +3,17 @@
     system:
       user:
         oshyshko:
+          email: oshyshko@mirantis.com
           enabled: true
-          name: oshyshko
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Oleksandr Shyshko
           home: /home/oshyshko
-          email: oshyshko@mirantis.com
+          name: oshyshko
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         oshyshko:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDHWGXkftochjnkEYF/2SqPp69zmy7pLICG9+DQjgGd6D8uX3lSqftKePqlIJLGn5ZfTpgVI5lIKO36Men95e6hixrlMeEdL2WCNx1yRGr3m1U+dZn3VGg35tqX1sV9eq+6+P8zkOoliCtc4GFbUB9Z683oJyiwtym/40t8qOAZwm4tvaQJ8fMhhnFk/agCN+V5B4hP0blgWpbodnStluiWr1Y6wT1IjCjwImYqTI5MyVlMTQKGewIj2u7eI8Qwtk0j44exjIa8HvN6RL430TTlzav8QrId+xRUBRnAZUpCd7s8Q75WjctCLAn2xGMkupqf4ANml6KP84hEVea9d/V oshyshko@oshyshko-pc
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDHWGXkftochjnkEYF/2SqPp69zmy7pLICG9+DQjgGd6D8uX3lSqftKePqlIJLGn5ZfTpgVI5lIKO36Men95e6hixrlMeEdL2WCNx1yRGr3m1U+dZn3VGg35tqX1sV9eq+6+P8zkOoliCtc4GFbUB9Z683oJyiwtym/40t8qOAZwm4tvaQJ8fMhhnFk/agCN+V5B4hP0blgWpbodnStluiWr1Y6wT1IjCjwImYqTI5MyVlMTQKGewIj2u7eI8Qwtk0j44exjIa8HvN6RL430TTlzav8QrId+xRUBRnAZUpCd7s8Q75WjctCLAn2xGMkupqf4ANml6KP84hEVea9d/V oshyshko@oshyshko-pc
           user: ${linux:system:user:oshyshko}
diff --git a/openssh/server/team/members/pcizinsky.yml b/openssh/server/team/members/pcizinsky.yml
index e9870c3..972830b 100644
--- a/openssh/server/team/members/pcizinsky.yml
+++ b/openssh/server/team/members/pcizinsky.yml
@@ -3,18 +3,17 @@
     system:
       user:
         pcizinsky:
+          email: pcizinsky@mirantis.com
           enabled: true
-          name: pcizinsky
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Pavel Cizinsky
           home: /home/pcizinsky
-          email: pcizinsky@mirantis.com
+          name: pcizinsky
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         pcizinsky:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCt9HA2bUwCVGGdUjyFzdPFp0j2z9XanLW9gHZ3BhB6Wc4ficU6zmbqYxrHUvdmUrRJbLMEAo9JDlzAIw4CPGhRkD3d7HfnmlEYcEeizLnnC+CmKo3+mrwkQIzWIz6PJOh1kvp5uaNp4ztjRGXXmPzcR0nk4jRD89gLHvH9EYStxZI6nsi3mmWR/LhgIhijb8p63duhE4HuK/RRRjeDQaUsbTG9TMEskY5ZI3p/QM55wlml9F8QJrtwxpaIPI5Fl8lflq+4YcoqgDIBFc6nwubIuiNY4gPJ8s1SQfsfxHSOJpFPZDwi76dxUpthtJrU46fqRvXPzTKoS29WZ5pSAY6p pavel.cizinsky@tcpcloud.eu
-          user: ${linux:system:user:pcizinsky}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCt9HA2bUwCVGGdUjyFzdPFp0j2z9XanLW9gHZ3BhB6Wc4ficU6zmbqYxrHUvdmUrRJbLMEAo9JDlzAIw4CPGhRkD3d7HfnmlEYcEeizLnnC+CmKo3+mrwkQIzWIz6PJOh1kvp5uaNp4ztjRGXXmPzcR0nk4jRD89gLHvH9EYStxZI6nsi3mmWR/LhgIhijb8p63duhE4HuK/RRRjeDQaUsbTG9TMEskY5ZI3p/QM55wlml9F8QJrtwxpaIPI5Fl8lflq+4YcoqgDIBFc6nwubIuiNY4gPJ8s1SQfsfxHSOJpFPZDwi76dxUpthtJrU46fqRvXPzTKoS29WZ5pSAY6p pavel.cizinsky@tcpcloud.eu
+          user: ${linux:system:user:pcizinsky}
diff --git a/openssh/server/team/members/pmichalec.yml b/openssh/server/team/members/pmichalec.yml
index b9b9c90..d7b4cfe 100644
--- a/openssh/server/team/members/pmichalec.yml
+++ b/openssh/server/team/members/pmichalec.yml
@@ -3,18 +3,17 @@
     system:
       user:
         pmichalec:
+          email: pmichalec@mirantis.com
           enabled: true
-          name: pmichalec
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Petr Michalec
           home: /home/pmichalec
-          email: pmichalec@mirantis.com
+          name: pmichalec
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         pmichalec:
           enabled: true
           public_keys:
-            - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGwsfObHWHqBv6UQBjvm0nkgnAGc5MZPuQXJ3ln4sM1P pmichalec@dontpanic
-          user: ${linux:system:user:pmichalec}
\ No newline at end of file
+          - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGwsfObHWHqBv6UQBjvm0nkgnAGc5MZPuQXJ3ln4sM1P pmichalec@dontpanic
+          user: ${linux:system:user:pmichalec}
diff --git a/openssh/server/team/members/prazumovsky.yml b/openssh/server/team/members/prazumovsky.yml
index dc2f1ea..0f297f3 100644
--- a/openssh/server/team/members/prazumovsky.yml
+++ b/openssh/server/team/members/prazumovsky.yml
@@ -3,18 +3,17 @@
     system:
       user:
         prazumovsky:
+          email: prazumovsky@mirantis.com
           enabled: true
-          name: prazumovsky
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Peter Razumovsky
           home: /home/prazumovsky
-          email: prazumovsky@mirantis.com
+          name: prazumovsky
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         prazumovsky:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBySoU/ncTbwN25gxgaubgnB8+xF6mQpiz/tC+MDLitiEw/QHloz6ME5slTJseW2Uvk4jFZz5FNZ9k9/1j+pOtafV8GMHIUOhvX3RUZEiq7wXmcH1T1P4z74Y5anouc82crAWW3d0hQUEAEOx0G3ZGTDmkQTl16mgJvmejvXIN1ESTdEA9tctUogJoSdVu7OGcjGwkqWM9x4CTT7vvD51whHvFswaf6GIWZC3ia1xVTAMJ8W6Xppi5muTW+Uhr4wZm06zZCVHXN+5uYMxwufSoyXc5zwQ+DBPsGENdFvjdNQltlIf9fU3GHuH3d9wAhiPM5CetPcWcj6j2PwwMbx+R prazumovsky@Peters-MacBook-Pro.local
-          user: ${linux:system:user:prazumovsky}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBySoU/ncTbwN25gxgaubgnB8+xF6mQpiz/tC+MDLitiEw/QHloz6ME5slTJseW2Uvk4jFZz5FNZ9k9/1j+pOtafV8GMHIUOhvX3RUZEiq7wXmcH1T1P4z74Y5anouc82crAWW3d0hQUEAEOx0G3ZGTDmkQTl16mgJvmejvXIN1ESTdEA9tctUogJoSdVu7OGcjGwkqWM9x4CTT7vvD51whHvFswaf6GIWZC3ia1xVTAMJ8W6Xppi5muTW+Uhr4wZm06zZCVHXN+5uYMxwufSoyXc5zwQ+DBPsGENdFvjdNQltlIf9fU3GHuH3d9wAhiPM5CetPcWcj6j2PwwMbx+R prazumovsky@Peters-MacBook-Pro.local
+          user: ${linux:system:user:prazumovsky}
diff --git a/openssh/server/team/members/pshchelo.yml b/openssh/server/team/members/pshchelo.yml
index 52e7cc6..f2da9a8 100644
--- a/openssh/server/team/members/pshchelo.yml
+++ b/openssh/server/team/members/pshchelo.yml
@@ -3,18 +3,17 @@
     system:
       user:
         pshchelo:
+          email: pshchelokovskyy@mirantis.com
           enabled: true
-          name: pshchelo
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Pavlo Shchelokovskyy
           home: /home/pshchelo
-          email: pshchelokovskyy@mirantis.com
+          name: pshchelo
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         pshchelo:
           enabled: true
           public_keys:
-            - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOns6c3H+TP0HBYWI+N6nX/ilPrGth5ElLCyN4EHJqcq pshchelo@git
+          - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOns6c3H+TP0HBYWI+N6nX/ilPrGth5ElLCyN4EHJqcq pshchelo@git
           user: ${linux:system:user:pshchelo}
diff --git a/openssh/server/team/members/pstefanski.yml b/openssh/server/team/members/pstefanski.yml
index cd14386..09ee8ff 100644
--- a/openssh/server/team/members/pstefanski.yml
+++ b/openssh/server/team/members/pstefanski.yml
@@ -3,18 +3,17 @@
     system:
       user:
         pstefanski:
+          email: pstefanski@mirantis.com
           enabled: true
-          name: pstefanski
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Pawel Stefanski
           home: /home/pstefanski
-          email: pstefanski@mirantis.com
+          name: pstefanski
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         pstefanski:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEmhgYMXA98zTAHALZKpgD4MIhHsUcAbrw0dM5AroBKiGBAEqlClxKxzsg7cC7yv4P8TloIoV656ywtgiRIfTAYoXGANxBgkeDfHFzlBQ7yYf8xU1Cl5jBG2xB9FnPJQYtxFJD36dAsUPQ4ykROw0epfBv+CCqgqmh6AWuIRnY8vGx6o3oKu4eZ4P0iSGuN2ITfVkGc32WoXFI0qIZPrnWLmIf4+LwbeA3aNZ54La5Er2wgrzdwF3D2MOBg964gCnuauUneY4WDkO81W+yUB7MA1n/WQP5dgLwdNTXiMtyNtuXs+QeEzlag2fRvMkmsUoU7oaIC3iuW8mf6967n+ED
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEmhgYMXA98zTAHALZKpgD4MIhHsUcAbrw0dM5AroBKiGBAEqlClxKxzsg7cC7yv4P8TloIoV656ywtgiRIfTAYoXGANxBgkeDfHFzlBQ7yYf8xU1Cl5jBG2xB9FnPJQYtxFJD36dAsUPQ4ykROw0epfBv+CCqgqmh6AWuIRnY8vGx6o3oKu4eZ4P0iSGuN2ITfVkGc32WoXFI0qIZPrnWLmIf4+LwbeA3aNZ54La5Er2wgrzdwF3D2MOBg964gCnuauUneY4WDkO81W+yUB7MA1n/WQP5dgLwdNTXiMtyNtuXs+QeEzlag2fRvMkmsUoU7oaIC3iuW8mf6967n+ED
           user: ${linux:system:user:pstefanski}
diff --git a/openssh/server/team/members/psvimbersky.yml b/openssh/server/team/members/psvimbersky.yml
index 9ed28ce..71705b2 100644
--- a/openssh/server/team/members/psvimbersky.yml
+++ b/openssh/server/team/members/psvimbersky.yml
@@ -3,18 +3,17 @@
     system:
       user:
         psvimbersky:
+          email: psvimbersky@mirantis.com
           enabled: true
-          name: psvimbersky
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Pavel Svimbersky
           home: /home/psvimbersky
-          email: psvimbersky@mirantis.com
+          name: psvimbersky
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         psvimbersky:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnsI2H2xgNFttWvGaIa7UdXtgAnlGMpin1/sBufx/bYkDMU2r0xGDjIBbUNWc4/OSKhpDyJiwxT5qiln07uFDBw0PtHUlJYHpJgS9xE6PERZPEiyQqrmbUVdqX9bIimweMH8kJIXjKgut+pc+GLUs5SyUlkjlHbKuYoYo52jAx+ldAslKK0P/aA1msjzGpoDRSvFChew7FHs9sH0GTgX865DoqCzqulNjHiGUrziBxwEAdUVjNDfxFHROm6kgdFU7ipgNQTHB7NvEI/VfZFlcuZ9IWZQhLQiw1jSxs4zAxOYJWrELPUqhPYE5yB5Y9j8iP4b0xIKhwoWkxQxdYuaLB
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnsI2H2xgNFttWvGaIa7UdXtgAnlGMpin1/sBufx/bYkDMU2r0xGDjIBbUNWc4/OSKhpDyJiwxT5qiln07uFDBw0PtHUlJYHpJgS9xE6PERZPEiyQqrmbUVdqX9bIimweMH8kJIXjKgut+pc+GLUs5SyUlkjlHbKuYoYo52jAx+ldAslKK0P/aA1msjzGpoDRSvFChew7FHs9sH0GTgX865DoqCzqulNjHiGUrziBxwEAdUVjNDfxFHROm6kgdFU7ipgNQTHB7NvEI/VfZFlcuZ9IWZQhLQiw1jSxs4zAxOYJWrELPUqhPYE5yB5Y9j8iP4b0xIKhwoWkxQxdYuaLB
           user: ${linux:system:user:psvimbersky}
diff --git a/openssh/server/team/members/rlubianyi.yml b/openssh/server/team/members/rlubianyi.yml
index 63f3397..df358c5 100644
--- a/openssh/server/team/members/rlubianyi.yml
+++ b/openssh/server/team/members/rlubianyi.yml
@@ -3,18 +3,17 @@
     system:
       user:
         rlubianyi:
+          email: rlubianyi@mirantis.com
           enabled: true
-          name: rlubianyi
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Roman Lubianyi
           home: /home/rlubianyi
-          email: rlubianyi@mirantis.com
+          name: rlubianyi
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         rlubianyi:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXWwy6p3t4AGvaCtFDJxqKZiPDotJnbu2IKg2p7sl7YXQw+APLKk9maHyUehQQuGzidgBZpmBOMAXENcO1FGFj56cnp4W9tldTiRq1bWcUMq42wfNwIToP6dAXj5ZyhL+UZj1GsCThSasDhFe4Xife0cn69KHJqtmahApQK6D7tpZr2UNDYNWh/2JIrUOcJXZU+BqNg7zm1KNb6e9lKXL6KLDeaCiQ0bj+L/unqepLdg26eO7AQSZ/rt2qAnbfcquozECtDhT4cbK8q9xJODlJQ3eQGOgTH3m8jGijL+3UdPFUzbo4KwSK4V9FmB711HVBCQM4nlH9zumIUSxutnkd rlubianyi@rlubianyi-pc
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXWwy6p3t4AGvaCtFDJxqKZiPDotJnbu2IKg2p7sl7YXQw+APLKk9maHyUehQQuGzidgBZpmBOMAXENcO1FGFj56cnp4W9tldTiRq1bWcUMq42wfNwIToP6dAXj5ZyhL+UZj1GsCThSasDhFe4Xife0cn69KHJqtmahApQK6D7tpZr2UNDYNWh/2JIrUOcJXZU+BqNg7zm1KNb6e9lKXL6KLDeaCiQ0bj+L/unqepLdg26eO7AQSZ/rt2qAnbfcquozECtDhT4cbK8q9xJODlJQ3eQGOgTH3m8jGijL+3UdPFUzbo4KwSK4V9FmB711HVBCQM4nlH9zumIUSxutnkd rlubianyi@rlubianyi-pc
           user: ${linux:system:user:rlubianyi}
diff --git a/openssh/server/team/members/sandriichenko.yml b/openssh/server/team/members/sandriichenko.yml
index adc8fc9..9415c7b 100644
--- a/openssh/server/team/members/sandriichenko.yml
+++ b/openssh/server/team/members/sandriichenko.yml
@@ -3,18 +3,17 @@
     system:
       user:
         sandriichenko:
+          email: sandriichenko@mirantis.com
           enabled: true
-          name: sandriichenko
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Sofiia Andriichenko
           home: /home/sandriichenko
-          email: sandriichenko@mirantis.com
+          name: sandriichenko
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         sandriichenko:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC36ZGwGD7WgfEwCDfSkQjiNI3cfgitrRcY+QzXP1+HNLwGoRFiZwmOp2vuYE2JiwvZfxVGXfmFmlDqypFA+H+gNobizGM2S/w7Hz8S5Qja75YBWty9KqdwcRVo7+/cPi4IHsWDxb1xpsiiFMfW2RRvrA3rE131xhwwnfKdZBj5HTlDO+qLIJD0FbJVYehKhJwIJuVGKQyVgj3hepaO17UTbG6IqtZeDz6nb9Sl+3eX5zS+8xS86cHf868M09zmxwrA3uI/eyYT49kMZN+HUezqvrZSG7v3ociOh9P1TI+4TIJN7JaRUAen7hTV2ufgZtNUrOzqXZTuUTmJQmRapAi9 sandriichenko@sandriichenko-pc
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC36ZGwGD7WgfEwCDfSkQjiNI3cfgitrRcY+QzXP1+HNLwGoRFiZwmOp2vuYE2JiwvZfxVGXfmFmlDqypFA+H+gNobizGM2S/w7Hz8S5Qja75YBWty9KqdwcRVo7+/cPi4IHsWDxb1xpsiiFMfW2RRvrA3rE131xhwwnfKdZBj5HTlDO+qLIJD0FbJVYehKhJwIJuVGKQyVgj3hepaO17UTbG6IqtZeDz6nb9Sl+3eX5zS+8xS86cHf868M09zmxwrA3uI/eyYT49kMZN+HUezqvrZSG7v3ociOh9P1TI+4TIJN7JaRUAen7hTV2ufgZtNUrOzqXZTuUTmJQmRapAi9 sandriichenko@sandriichenko-pc
           user: ${linux:system:user:sandriichenko}
diff --git a/openssh/server/team/members/sbanka.yml b/openssh/server/team/members/sbanka.yml
new file mode 100644
index 0000000..d9f6416
--- /dev/null
+++ b/openssh/server/team/members/sbanka.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        sbanka:
+          email: sbanka@mirantis.com
+          enabled: true
+          full_name: "Szymon Ba\u0144ka"
+          home: /home/sbanka
+          name: sbanka
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        sbanka:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMdgjQ/jeWwQTaPyy7G5JJAkM+QPNPFkzMldPHJzOxEBzt/M5zAooj0XgbRIDIztolhXhmj8N5QSG5n3Wn9T9e2KpoxrLaVhMV5WGTgMrXMmyT8oXLV3gLxGNHMWFvplSbHLK78EsZQQ1/kBQMyPXB1+FpIuSHVOxaospOQObJ08lvQfvlO7AUUV4ecpFj3PpV5vkKPRS+KfiRm84BeGIu51BL1BClZcOyHZPBQT+DUBjm8y4Nd7pVZRjsiBzZBvUotCbn5+RqWJnu4kyoGoRNmk8pvCx7jGL1G9rE8NNsKlCUWedvyNkDeoWKvleJuzkj3ggfuCj/iTtDoXFR95e3
+          user: ${linux:system:user:sbanka}
diff --git a/openssh/server/team/members/sflorczak.yml b/openssh/server/team/members/sflorczak.yml
index 152fe39..8e42edb 100644
--- a/openssh/server/team/members/sflorczak.yml
+++ b/openssh/server/team/members/sflorczak.yml
@@ -3,18 +3,17 @@
     system:
       user:
         sflorczak:
+          email: sflorczak@mirantis.com
           enabled: true
-          name: sflorczak
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Szymon Florczak
           home: /home/sflorczak
-          email: sflorczak@mirantis.com
+          name: sflorczak
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         sflorczak:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOdCr32ewiGJKLLwxf0Ic0naFV1j+ZflpfUVjuIPplrLeL5u8CNVlT5adPzgc48ijbee3qpzNvkOC7Ym295xQXUluo/cj2p5wVp70YnHrfhnLjGOCldm/K8B9bHmHbm1XW6hWUp7SWjMwhOdR217iveVLkuOy+hPdpXOC86hO93v7fY12UZDiqSRfrHpUqEaHHqlSyU2Eftn9GsR4UaotkeaQsiv8bi/k5nrwea/ccALZXnhrgTSTpXOVy3rfR5cCFQCA1PjMYvFEjhUofCHBSk+OA8xwOkpBOCfYrWRUmMT7MGEV5Jjm75QUrq1AuqRdFh8SM5lP39Tdwr8FMC+q5 flor3k@MacBook-Pro-Szymon.local
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOdCr32ewiGJKLLwxf0Ic0naFV1j+ZflpfUVjuIPplrLeL5u8CNVlT5adPzgc48ijbee3qpzNvkOC7Ym295xQXUluo/cj2p5wVp70YnHrfhnLjGOCldm/K8B9bHmHbm1XW6hWUp7SWjMwhOdR217iveVLkuOy+hPdpXOC86hO93v7fY12UZDiqSRfrHpUqEaHHqlSyU2Eftn9GsR4UaotkeaQsiv8bi/k5nrwea/ccALZXnhrgTSTpXOVy3rfR5cCFQCA1PjMYvFEjhUofCHBSk+OA8xwOkpBOCfYrWRUmMT7MGEV5Jjm75QUrq1AuqRdFh8SM5lP39Tdwr8FMC+q5 flor3k@MacBook-Pro-Szymon.local
           user: ${linux:system:user:sflorczak}
diff --git a/openssh/server/team/members/sgalkin.yml b/openssh/server/team/members/sgalkin.yml
index 1388ebc..c13e0c2 100644
--- a/openssh/server/team/members/sgalkin.yml
+++ b/openssh/server/team/members/sgalkin.yml
@@ -3,18 +3,17 @@
     system:
       user:
         sgalkin:
+          email: sgalkin@mirantis.com
           enabled: true
-          name: sgalkin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Sergey Galkin
           home: /home/sgalkin
-          email: sgalkin@mirantis.com
+          name: sgalkin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         sgalkin:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyaEWaI1tkQiWHIB/pHZ6jrZyN7fQDxYodhT54rtbFcwnxGM0L1PuL1WcHGB9GJgWwOe7FE+9/kGxAuabjiFjg/NagdtAOfBp2b9+9sYCc8luJxIicTXHI5fY/tVW28OL8s51cw3Gr2m0atRDxKpb8Zv78qfYSSaENB9vq02IYu4Cr1CLEB6Zawm9iRq9ahMwWfslwIii4wKFuWcgjT6spMiHNkUwIYwxdFlCUh3gEhJYfwhe3LpoAvHmBESW0hdEj0S9YgTByBRgKkKrh98irf6B4DVOLWQLudLjAl59lb9Gz2s6fKUBYbz++I6bejHQ6I83VzT0DDKnbiQRXLh4/Q== gals@gals
-          user: ${linux:system:user:sgalkin}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyaEWaI1tkQiWHIB/pHZ6jrZyN7fQDxYodhT54rtbFcwnxGM0L1PuL1WcHGB9GJgWwOe7FE+9/kGxAuabjiFjg/NagdtAOfBp2b9+9sYCc8luJxIicTXHI5fY/tVW28OL8s51cw3Gr2m0atRDxKpb8Zv78qfYSSaENB9vq02IYu4Cr1CLEB6Zawm9iRq9ahMwWfslwIii4wKFuWcgjT6spMiHNkUwIYwxdFlCUh3gEhJYfwhe3LpoAvHmBESW0hdEj0S9YgTByBRgKkKrh98irf6B4DVOLWQLudLjAl59lb9Gz2s6fKUBYbz++I6bejHQ6I83VzT0DDKnbiQRXLh4/Q== gals@gals
+          user: ${linux:system:user:sgalkin}
diff --git a/openssh/server/team/members/sgarbuz.yml b/openssh/server/team/members/sgarbuz.yml
index 324d5b3..00a3be1 100644
--- a/openssh/server/team/members/sgarbuz.yml
+++ b/openssh/server/team/members/sgarbuz.yml
@@ -3,18 +3,17 @@
     system:
       user:
         sgarbuz:
+          email: sgarbuz@mirantis.com
           enabled: true
-          name: sgarbuz
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Serhii Garbuz
           home: /home/sgarbuz
-          email: sgarbuz@mirantis.com
+          name: sgarbuz
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         sgarbuz:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKDwmQ8Zf6X4Ztu7MDaggm6Y2/hpf8Y7gQFcfqX0q84a9OZLw5jLgqTXewKW+0LPAsF7Gx0K7G9mFtcvXb5B74cbLg8SnETMET6t6fipOOVVu17/2N5RFGJ0Alwia0WQCDmGv6yYRB63NgFcavvcD8AEQ2LTlGIU8zPclq1j2kOJNLzH0xVsOiUTdEeUk8mOMBqSHQxVCZeyBBpkLHeECiM7AzsVtCWo1R+Sdo82BHs4+Ig9SOhIjLstBXS9DSjS6gzTOQLvCoGjB2P8spllSX0QtPXXNZndKfrj1YWht5O456ILTCocT8F/OGehy+7QL4+iq7JWBXn7ZamO+l8ceH sgarbuz@sgarbuz-pc
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKDwmQ8Zf6X4Ztu7MDaggm6Y2/hpf8Y7gQFcfqX0q84a9OZLw5jLgqTXewKW+0LPAsF7Gx0K7G9mFtcvXb5B74cbLg8SnETMET6t6fipOOVVu17/2N5RFGJ0Alwia0WQCDmGv6yYRB63NgFcavvcD8AEQ2LTlGIU8zPclq1j2kOJNLzH0xVsOiUTdEeUk8mOMBqSHQxVCZeyBBpkLHeECiM7AzsVtCWo1R+Sdo82BHs4+Ig9SOhIjLstBXS9DSjS6gzTOQLvCoGjB2P8spllSX0QtPXXNZndKfrj1YWht5O456ILTCocT8F/OGehy+7QL4+iq7JWBXn7ZamO+l8ceH sgarbuz@sgarbuz-pc
           user: ${linux:system:user:sgarbuz}
diff --git a/openssh/server/team/members/sgudz.yml b/openssh/server/team/members/sgudz.yml
new file mode 100644
index 0000000..1640ac0
--- /dev/null
+++ b/openssh/server/team/members/sgudz.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        sgudz:
+          email: sgudz@mirantis.com
+          enabled: true
+          full_name: Sergii Gudz
+          home: /home/sgudz
+          name: sgudz
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        sgudz:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1pRe3qQ8NvXNcfa1CHr5Mox2zuS/Wkl8cUaNlUUHUNbIwMnbnmMcHYfSH/uDD+SJSpxpD5ob2C5Z7sjXn3VMymyu+S9srNF99oRSPAW6caJ4b/+VGte1WRyTGr+yhGe9zjk6Qmpxdq6evOd8Yhqh+1r6SKBwmIhnx7u8SAKNxejRJUbx8hQ4LrHlr2B0IXF6Trz2JxRXdpo8ryphwzb9EQnfMFjbcvsOL5TTCk9eWeeWVf1Uy13pQZfXP1xlBcwK6p5OWTMCsOb6Y8h1RXn+nGmzr5fke8Nx1V+ehCyGZMX32hBnlXl/4U/Pd8Fj/28lvgvU3iIJ1uEGI2ulGN8mz sgudz@serg
+          user: ${linux:system:user:sgudz}
diff --git a/openssh/server/team/members/skreys.yml b/openssh/server/team/members/skreys.yml
index 19a0f70..b94f5b8 100644
--- a/openssh/server/team/members/skreys.yml
+++ b/openssh/server/team/members/skreys.yml
@@ -3,18 +3,17 @@
     system:
       user:
         skreys:
+          email: skreys@mirantis.com
           enabled: true
-          name: skreys
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Sergey Kreys
           home: /home/skreys
-          email: skreys@mirantis.com
+          name: skreys
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         skreys:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDeg+Wj7yTBRLvsu2LKgdKyb6FW4n3t5me0LAZhGkP9mbsYonE5sN0OwI42ZPYeU1O35c+E4n3GJ4ZzdJYRUQJtqO5EHUMNyXELEcS8GZKydg5A0KPs69bB8SPVlTfO5D77sAWwG/3JIQD/uI21jqCp3a4lyEw5X2HjMbuz2Z4cW7Y69i73RdIYQdYb0X5+mqcVz8YEyuMZi2zweMxsvOczcanQ/4J6JKtC8imJu23Gr0TeS15OJCFh7yGviVp//LBzusXreqlEf7Tzx2yHkJ/rqULIIlPpBC1TFD7sgA72j3kq9rw3ZeQAwmaJA82L3KzagkgSQprEsRYnQ+wSWXkj skreys@skreys
-          user: ${linux:system:user:skreys}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDeg+Wj7yTBRLvsu2LKgdKyb6FW4n3t5me0LAZhGkP9mbsYonE5sN0OwI42ZPYeU1O35c+E4n3GJ4ZzdJYRUQJtqO5EHUMNyXELEcS8GZKydg5A0KPs69bB8SPVlTfO5D77sAWwG/3JIQD/uI21jqCp3a4lyEw5X2HjMbuz2Z4cW7Y69i73RdIYQdYb0X5+mqcVz8YEyuMZi2zweMxsvOczcanQ/4J6JKtC8imJu23Gr0TeS15OJCFh7yGviVp//LBzusXreqlEf7Tzx2yHkJ/rqULIIlPpBC1TFD7sgA72j3kq9rw3ZeQAwmaJA82L3KzagkgSQprEsRYnQ+wSWXkj skreys@skreys
+          user: ${linux:system:user:skreys}
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/smatov.yml b/openssh/server/team/members/smatov.yml
index 073b02f..2973eca 100644
--- a/openssh/server/team/members/smatov.yml
+++ b/openssh/server/team/members/smatov.yml
@@ -3,18 +3,17 @@
     system:
       user:
         smatov:
+          email: smatov@mirantis.com
           enabled: true
-          name: smatov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Sergey Matov
           home: /home/smatov
-          email: smatov@mirantis.com
+          name: smatov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         smatov:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgBHACRnY/VEEDFE63xDp4bx0zgWY4h1aB9/c2f962HtTNaQ6R/Cz6DLISaB5th8qzrzbvjn9WcpHdxyTm9BqkLLzB4qe7fnebPtn6zGczZ9Btrjk9R8Fuw6DZhSucSk572r/gVIY0O3Z1LajHkNr0ZTQS8AY3fgn8rXMD2vMOruOzyTOmfWKmEw7e+JYUqoFXHhE3Dd7hGQ99d6kH2N3zXfM2rzfjshGAq0kOi5dN4Hx6QIXZapt0t9TzpYTkK5SaVzuEVyVaKRLYSa/rdPjHkKqDFa99RcQ+OI93uvT9CFNWDFIC/TDJ2M+7PQbm836EICXXVWKjQ2NUnQJeOU5v smatov@ubuntu
-          user: ${linux:system:user:smatov}
\ No newline at end of file
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgBHACRnY/VEEDFE63xDp4bx0zgWY4h1aB9/c2f962HtTNaQ6R/Cz6DLISaB5th8qzrzbvjn9WcpHdxyTm9BqkLLzB4qe7fnebPtn6zGczZ9Btrjk9R8Fuw6DZhSucSk572r/gVIY0O3Z1LajHkNr0ZTQS8AY3fgn8rXMD2vMOruOzyTOmfWKmEw7e+JYUqoFXHhE3Dd7hGQ99d6kH2N3zXfM2rzfjshGAq0kOi5dN4Hx6QIXZapt0t9TzpYTkK5SaVzuEVyVaKRLYSa/rdPjHkKqDFa99RcQ+OI93uvT9CFNWDFIC/TDJ2M+7PQbm836EICXXVWKjQ2NUnQJeOU5v smatov@ubuntu
+          user: ${linux:system:user:smatov}
diff --git a/openssh/server/team/members/snovikov.yml b/openssh/server/team/members/snovikov.yml
new file mode 100644
index 0000000..19afd9f
--- /dev/null
+++ b/openssh/server/team/members/snovikov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        snovikov:
+          email: snovikov@mirantis.com
+          enabled: true
+          full_name: Sergey Novikov
+          home: /home/snovikov
+          name: snovikov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        snovikov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYj97WGfiL550eVPyQmFyrgpTw61tfins1CpgrZewWqAWJMgYklRdMYl4OReE5UO2po7ag0f/QsOtGU8aQbnxnWUYPZyS3Qk+Bg8OOSBmewPxmT7WH97KdGKBdC9b3xUNFOUXEUOMmOe3jq9YET+xebUnfsA5qwYU5dL9Cb5UAPzVxYI8z5RiaNTo8dtwZr7lbJJRy8YfSWCtiD59vewc6BE2NTUyDjsfmKd9K/IkyKboGU9AC5mLYDsjvWwiGcNdfigRyaYWKmoo7Xhe1W2Og4dpI5pozOwVg7hISW9NRgLXrZP/9me1rFBH7EQjpjO3+Pto1//R3Nx9QLsB59yuj snovikov@snovikov
+          user: ${linux:system:user:snovikov}
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/tleontovich.yml b/openssh/server/team/members/tleontovich.yml
new file mode 100644
index 0000000..4df0fa5
--- /dev/null
+++ b/openssh/server/team/members/tleontovich.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        tleontovich:
+          email: tleontovich@mirantis.com
+          enabled: true
+          full_name: Tatyanka Leontovich
+          home: /home/tleontovich
+          name: tleontovich
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        tleontovich:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLtOIkzqNA3wdLQyQxLRaRwi4oXnRCPCsrn8oaAyxDXHhU3+ATGvXBdbkA6xU3d4hAohru5DwxGzyikzAAtrv79GWA9/ryXPcplmxBiJcN36GyfW6eX89hI1VIJMKMG3cUs0ONf2D+hENhbaO0pu4hNAb5HFcHAuqecQNOFFrJ3RqnWM8RWgJPY3iF1A9JnXwVrUgME962VPlydYvlL5mLk+h+4DgHuPipw/Qana5a2JfdErsPYeAdDwG8frCdA9wvMzVVZv78s0lA6BritQdd0SyZejbOlT9KVHhSOhqnWdCtd8+nZXzXgjV7GAiv7H9yE4Ee6QYSHUQHwJxZs3ZT tleontovich@tleontovich-pc
+          user: ${linux:system:user:tleontovich}
diff --git a/openssh/server/team/members/vblokhin.yml b/openssh/server/team/members/vblokhin.yml
index 74ae49c..122429c 100644
--- a/openssh/server/team/members/vblokhin.yml
+++ b/openssh/server/team/members/vblokhin.yml
@@ -3,19 +3,17 @@
     system:
       user:
         vblokhin:
+          email: vblokhin@mirantis.com
           enabled: true
-          name: vblokhin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Volodymyr Blokhin
           home: /home/vblokhin
-          email: vblokhin@mirantis.com
+          name: vblokhin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         vblokhin:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDY5F0bDcbiCtO5HkwIVgjwAwCHcTRDZwEIE5cwuGlXNKWk9JtlDKh724Dp8f/Yny1e30Kt9oqs23bv6xfMh4pU4vrajjSv9f+s3hCSs1X9JrlEw92CD7r+jpq2R0vz3ufeHZWSWmeMsRR62BodtYy4EkoyPKvq16guq745KHTYgATm/qJgCkjQ5lxca280i0z14Fv+JOtVxrk52xMTxHS+N6wzVOjuEjBbW2vyktsV/RidT/SoJAVMHoPISjJTR+q5usVuKb6J5U83Y2vbmUCnygAnPX6l9k8atsAvwl1v54QxWE6Qz61kMPpwZZ56BNGhCZ458HqqXiybx4lU4PN6eg/zPA9Eq+xj5ZoXaUK1hg2UpJrmrtCh8H4T+/dPySZ+HMDBp221DCuH43x9No6V0QWhifhHPaGWyeK+mGsznbaSnlZ0QxRun5qWgjG7xHu97zgxjlyxmQII8FWGaOSuv/w6jg894A4jcsDfH5oxDbgVTbqqZG9o7TszIXKTImt1f2fmKKr/CT7ixwIKO3MioUNu3PoQ/GhmKajqugV+TIRe4vJ2FD5hl11ythzLlZCchzlEoymap4P6Y5dMh60YErCtYftn7jATJKSq9EHiLEeTIQDBVqhJzdS9/QWAXBV97mNX7mib1dO0H9TBZu1mYMZio7udbx9oursrVPq3fw== vblokhin@mirantis.com
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDY5F0bDcbiCtO5HkwIVgjwAwCHcTRDZwEIE5cwuGlXNKWk9JtlDKh724Dp8f/Yny1e30Kt9oqs23bv6xfMh4pU4vrajjSv9f+s3hCSs1X9JrlEw92CD7r+jpq2R0vz3ufeHZWSWmeMsRR62BodtYy4EkoyPKvq16guq745KHTYgATm/qJgCkjQ5lxca280i0z14Fv+JOtVxrk52xMTxHS+N6wzVOjuEjBbW2vyktsV/RidT/SoJAVMHoPISjJTR+q5usVuKb6J5U83Y2vbmUCnygAnPX6l9k8atsAvwl1v54QxWE6Qz61kMPpwZZ56BNGhCZ458HqqXiybx4lU4PN6eg/zPA9Eq+xj5ZoXaUK1hg2UpJrmrtCh8H4T+/dPySZ+HMDBp221DCuH43x9No6V0QWhifhHPaGWyeK+mGsznbaSnlZ0QxRun5qWgjG7xHu97zgxjlyxmQII8FWGaOSuv/w6jg894A4jcsDfH5oxDbgVTbqqZG9o7TszIXKTImt1f2fmKKr/CT7ixwIKO3MioUNu3PoQ/GhmKajqugV+TIRe4vJ2FD5hl11ythzLlZCchzlEoymap4P6Y5dMh60YErCtYftn7jATJKSq9EHiLEeTIQDBVqhJzdS9/QWAXBV97mNX7mib1dO0H9TBZu1mYMZio7udbx9oursrVPq3fw== vblokhin@mirantis.com
           user: ${linux:system:user:vblokhin}
-
diff --git a/openssh/server/team/members/vdrok.yml b/openssh/server/team/members/vdrok.yml
index 44611fb..6f6cbba 100644
--- a/openssh/server/team/members/vdrok.yml
+++ b/openssh/server/team/members/vdrok.yml
@@ -3,18 +3,17 @@
     system:
       user:
         vdrok:
+          email: vdrok@mirantis.com
           enabled: true
-          name: vdrok
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Vladyslav Drok
           home: /home/vdrok
-          email: vdrok@mirantis.com
+          name: vdrok
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         vdrok:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpnn6IyistbIGnzeV3DOWR+u/QLl1cuQspwuvcl1FxeZljkdIgLXcNVzFaFHSX+rOgrOLpcFf3X+dwnB55EoUDj85IOwKz1tVoD5Df42xZMnmjnvOaAScVTStrdcWxzpB6bWt/+GWpt1br3pLpTjqZxa1YipT7tz6bs7cNKplvQuBaoYeG/x9ycRhLIhYXFYOtHD/lxwTRqHnvpwdNKRYPtfakR/kaeZEaYQoJlVcAq0AKzws8l87InoWnjGo/NrBJTvgiLQPYw6uJ9mf17p2GVv1JGCbEpPKnRLyIitdwCFjYEwAKoSsisf2TdH9iY1DWwJEuPzsvjM2ZCPcc7baV vlad@carbon
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpnn6IyistbIGnzeV3DOWR+u/QLl1cuQspwuvcl1FxeZljkdIgLXcNVzFaFHSX+rOgrOLpcFf3X+dwnB55EoUDj85IOwKz1tVoD5Df42xZMnmjnvOaAScVTStrdcWxzpB6bWt/+GWpt1br3pLpTjqZxa1YipT7tz6bs7cNKplvQuBaoYeG/x9ycRhLIhYXFYOtHD/lxwTRqHnvpwdNKRYPtfakR/kaeZEaYQoJlVcAq0AKzws8l87InoWnjGo/NrBJTvgiLQPYw6uJ9mf17p2GVv1JGCbEpPKnRLyIitdwCFjYEwAKoSsisf2TdH9iY1DWwJEuPzsvjM2ZCPcc7baV vlad@carbon
           user: ${linux:system:user:vdrok}
diff --git a/openssh/server/team/members/vgusev.yml b/openssh/server/team/members/vgusev.yml
new file mode 100644
index 0000000..5cdfe39
--- /dev/null
+++ b/openssh/server/team/members/vgusev.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        vgusev:
+          email: vgusev@mirantis.com
+          enabled: true
+          full_name: Vitaly Gusev
+          home: /home/vgusev
+          name: vgusev
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        vgusev:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrCyaZjs8hiwx38LfpeQ2z9n9ptwQ7gFrhq2z5sK9q/LQMCubbnp5xhyF0SMY1jmQUewBOKXhnq3QSX+DmtNsnhitnZBw2BE5PBXllCBWMMiWULfAYvB0of728Q3EEjrtyfHkt7o2E+CvreVJcVI4kBwjKh5WpVBZ8mmkW/sexLGMuYu0bUWjCddu6ZlhUa+y14VZKOKp44auemza1VL/UzqOVZkBAfR2gPV2pBG3Im+SlnOlDRxKPEXQbsn3u/sNeZq0wSY++khY86AU7jAKfL2NiNsoA7CyB0jTEKwYO3vOWOhECifZuHwY/TNWyRFWM2ImW3mT9aO7nE4w4jXXJ vgusev@vgusev
+          user: ${linux:system:user:vgusev}
diff --git a/openssh/server/team/members/vjigulin.yml b/openssh/server/team/members/vjigulin.yml
index 58e3a00..b71b520 100644
--- a/openssh/server/team/members/vjigulin.yml
+++ b/openssh/server/team/members/vjigulin.yml
@@ -3,18 +3,17 @@
     system:
       user:
         vjigulin:
+          email: vjigulin@mirantis.com
           enabled: true
-          name: vjigulin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Vladimir Jigulin
           home: /home/vjigulin
-          email: vjigulin@mirantis.com
+          name: vjigulin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         vjigulin:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDI+OmVDWql8hAOtHIN03zmd0vOj6lzgRwgT5/atyJHbkcl9y5CuB5+DdlXplMcPnm7lH+2u9LnWr21dcal3DuoHYSavnRKvyZZfTDDyvWB1FGYwM8igrdrrSGGuhl5yLlRbuXdQzlfo889s0LYtymKDdXIdo+WDdC/jDnVgUXA6J4TWQ/D2U9GLXRoT10J0duN664bbbdmJhSq7Qehq94k2as7Jy9R3HtvT+DIITrCVua3yPg0Zm+SxCA8xT8g3VKtdKTJdTlDG6o6PXWHR3W9jfNbO6CayLTBaiAFXqbKAol31yCaRbcDZfnoWfmFVu6rsQ90WZv4L9gK05uNBH1z mogaika@mogaika
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDI+OmVDWql8hAOtHIN03zmd0vOj6lzgRwgT5/atyJHbkcl9y5CuB5+DdlXplMcPnm7lH+2u9LnWr21dcal3DuoHYSavnRKvyZZfTDDyvWB1FGYwM8igrdrrSGGuhl5yLlRbuXdQzlfo889s0LYtymKDdXIdo+WDdC/jDnVgUXA6J4TWQ/D2U9GLXRoT10J0duN664bbbdmJhSq7Qehq94k2as7Jy9R3HtvT+DIITrCVua3yPg0Zm+SxCA8xT8g3VKtdKTJdTlDG6o6PXWHR3W9jfNbO6CayLTBaiAFXqbKAol31yCaRbcDZfnoWfmFVu6rsQ90WZv4L9gK05uNBH1z mogaika@mogaika
           user: ${linux:system:user:vjigulin}
diff --git a/openssh/server/team/members/vkhlyunev.yml b/openssh/server/team/members/vkhlyunev.yml
index 9779831..dce6e28 100644
--- a/openssh/server/team/members/vkhlyunev.yml
+++ b/openssh/server/team/members/vkhlyunev.yml
@@ -3,18 +3,17 @@
     system:
       user:
         vkhlyunev:
+          email: vkhlyunev@mirantis.com
           enabled: true
-          name: vkhlyunev
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Vladimir Khlyunev
           home: /home/vkhlyunev
-          email: vkhlyunev@mirantis.com
+          name: vkhlyunev
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         vkhlyunev:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1v5pWSan9H2Wl64C8bKWmbULp0QgJUi9FqPyuw1bfS5GfHLxejPxaDzec0uSx0PXWzS9afwIO7aGA1dg+dvdl1iPy9jfpkQbGGsusmSsbLvf6+WLVsPk90Bvoc4anmEsG2DWT1SGR65d/imjlwsnlbHTQIm0YucjDjV/p2MmYlbaFLm+ynfo9mt1mP954GDPKQHvyBpxvAIEHL3xAcnNXcpSXm2jhCNsNGUSpY+R7gin2q8MtrpzQNeZZ8degUMpgba7CTXN1sws2dc3UayJ8KZkyRVJNk6mpt2jey03izJzXzt3ux3hg5lToELvEIMDdHOPHT0b0U7f2H+eBCfH/ vkhlyunev@cz7317
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1v5pWSan9H2Wl64C8bKWmbULp0QgJUi9FqPyuw1bfS5GfHLxejPxaDzec0uSx0PXWzS9afwIO7aGA1dg+dvdl1iPy9jfpkQbGGsusmSsbLvf6+WLVsPk90Bvoc4anmEsG2DWT1SGR65d/imjlwsnlbHTQIm0YucjDjV/p2MmYlbaFLm+ynfo9mt1mP954GDPKQHvyBpxvAIEHL3xAcnNXcpSXm2jhCNsNGUSpY+R7gin2q8MtrpzQNeZZ8degUMpgba7CTXN1sws2dc3UayJ8KZkyRVJNk6mpt2jey03izJzXzt3ux3hg5lToELvEIMDdHOPHT0b0U7f2H+eBCfH/ vkhlyunev@cz7317
           user: ${linux:system:user:vkhlyunev}
diff --git a/openssh/server/team/members/vnaumov.yml b/openssh/server/team/members/vnaumov.yml
new file mode 100644
index 0000000..f46cd1d
--- /dev/null
+++ b/openssh/server/team/members/vnaumov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        vnaumov:
+          email: vnaumov@mirantis.com
+          enabled: true
+          full_name: Vlad Naumov
+          home: /home/vnaumov
+          name: vnaumov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        vnaumov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDno7VX9jiveRCF7d1C/FK24WLZwCArdrBBOQ1uHqpkUfUYtG6vrYgt/K2n2FXoX55lbeoJAwuNC9HviaY+vQAekCI4W2s02iD+j/GRUwitpv+lJZXSmt/q2PgLz3OFUIsJV0EwyNl+bexM4+2jYTmHeDMrXAsHL4I2GUv5sFycA11UhxZ/Qm2QMKlRZhje/IJieX9u2BhgYuPYffASVl4AhwtDagYdqquwUXrfu/dQRt/U9w0Di9alApcyPqiW9LbXUgwha1G9+ScQnxmp8WvmaV8YR+nf2OFxQHvOZPYjCzniRnYpaQUMeUAkJKxDwqR1dAKYnaQY5TfXtFwfzsjN vnaumov@vnaumov
+          user: ${linux:system:user:vnaumov}
diff --git a/openssh/server/team/members/vnogin.yml b/openssh/server/team/members/vnogin.yml
index 26f9106..b569696 100644
--- a/openssh/server/team/members/vnogin.yml
+++ b/openssh/server/team/members/vnogin.yml
@@ -3,18 +3,17 @@
     system:
       user:
         vnogin:
+          email: vnogin@mirantis.com
           enabled: true
-          name: vnogin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Vitaliy Nogin
           home: /home/vnogin
-          email: vnogin@mirantis.com
+          name: vnogin
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         vnogin:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiuKuC+aACWPhwTg1liOOGMAvL3zSMcgU2ZfjN6NMLMyekJqD7sr9NwJkeXEt6wr1YSelfYDcUjdu2ZyQHzfQ8CaNrTAlrNYUc+UlUqqydbO1d89j/MMn8fUAuFBu1vLMOqfNW8nPRmy327blmvSxBq2Oz9wSf/z/3lB4TVJKGwB61ciQn08FwFAitCN9cdfBthjRJXrhs/7kt0/An8O0p43LNa1aQ5QeaxLUAqMZa3VxkAaEwFzm/E/Vg4SPEJLijfCWYPozkZttoS2ud0HAJR87jya/BaCrtSAOqX55cLzWGABlvDWFprwo/59aJw7WlE8Y2bgxhtnFRdaHuIk7T vnogin@MacBook-Pro-Vitalii.local
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiuKuC+aACWPhwTg1liOOGMAvL3zSMcgU2ZfjN6NMLMyekJqD7sr9NwJkeXEt6wr1YSelfYDcUjdu2ZyQHzfQ8CaNrTAlrNYUc+UlUqqydbO1d89j/MMn8fUAuFBu1vLMOqfNW8nPRmy327blmvSxBq2Oz9wSf/z/3lB4TVJKGwB61ciQn08FwFAitCN9cdfBthjRJXrhs/7kt0/An8O0p43LNa1aQ5QeaxLUAqMZa3VxkAaEwFzm/E/Vg4SPEJLijfCWYPozkZttoS2ud0HAJR87jya/BaCrtSAOqX55cLzWGABlvDWFprwo/59aJw7WlE8Y2bgxhtnFRdaHuIk7T vnogin@MacBook-Pro-Vitalii.local
           user: ${linux:system:user:vnogin}
diff --git a/openssh/server/team/members/vryzhenkin.yml b/openssh/server/team/members/vryzhenkin.yml
new file mode 100644
index 0000000..467d60c
--- /dev/null
+++ b/openssh/server/team/members/vryzhenkin.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        vryzhenkin:
+          email: vryzhenkin@mirantis.com
+          enabled: true
+          full_name: Victor Ryzhenkin
+          home: /home/vryzhenkin
+          name: vryzhenkin
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        vryzhenkin:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDwqFlEKeZDHKPSwIRXN7Bprc9G8HRvuq2ht+XPFixkX3H/GLrsy781PkE9CM3ZVhz7h68Rmyt3n6B1d0ewvcCHj2m/rixJj8rayNOuQN7v8yflTB/iKFZW7BZ9yxu3OSkQScrjQ6YRcifDYBMDFTkMrKsrIkfMBasvOGcK6BoPx1s3diupG8gN0fpGZ/BPIia+mGz+3jRk6aFBI9n5G1bbFikUPonhjlEoHoQv2ngKGvmDr8FWoItuvzQ7HH9mEwRTqVMzCNdeVxvNNNTLJ72ikig1FaCyAxGViVCa2Xidug9iRHE6dUWsqvaxNtXIrGX4E5lvNXHiJYi/mVcQR+Dx freerunner@pegasus
+          user: ${linux:system:user:vryzhenkin}
diff --git a/openssh/server/team/members/vsaienko.yml b/openssh/server/team/members/vsaienko.yml
index d47a4a6..752721a 100644
--- a/openssh/server/team/members/vsaienko.yml
+++ b/openssh/server/team/members/vsaienko.yml
@@ -3,18 +3,17 @@
     system:
       user:
         vsaienko:
+          email: vsaienko@mirantis.com
           enabled: true
-          name: vsaienko
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Vasyl Saienko
           home: /home/vsaienko
-          email: vsaienko@mirantis.com
+          name: vsaienko
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         vsaienko:
           enabled: true
           public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPagYDP2Dt5cGMC/HYlv+5AVYx/v9yRiOSJuQb/XqU35PLW5CVroSAaEA33IIAOjyte8DRrmi4UxErX00V7+F9Dwebt0qkEX35FE91E+BM2L3S2Zcuuh4gHDDp5khsHSTHdgiFpMhRREFesuG6P7ekQ6gCBzKK4R+TTLVTKWYn1/TXQIvMUAO+umGykHQ2T6memO2eGivnSSNkKCGOjODquyP3JMmt9Dk7bP5RR6kRLSD9HknFCIFds2fkcdbOhZMv+XIqwOVAWhRPksafOMktmaHNyy3k6IcMPJroH6H4P/GsQmrPL8IXpDP01vTdeQYM47YqPC14L3T74u71YJGF vsaienko@mirantis.com
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPagYDP2Dt5cGMC/HYlv+5AVYx/v9yRiOSJuQb/XqU35PLW5CVroSAaEA33IIAOjyte8DRrmi4UxErX00V7+F9Dwebt0qkEX35FE91E+BM2L3S2Zcuuh4gHDDp5khsHSTHdgiFpMhRREFesuG6P7ekQ6gCBzKK4R+TTLVTKWYn1/TXQIvMUAO+umGykHQ2T6memO2eGivnSSNkKCGOjODquyP3JMmt9Dk7bP5RR6kRLSD9HknFCIFds2fkcdbOhZMv+XIqwOVAWhRPksafOMktmaHNyy3k6IcMPJroH6H4P/GsQmrPL8IXpDP01vTdeQYM47YqPC14L3T74u71YJGF vsaienko@mirantis.com
           user: ${linux:system:user:vsaienko}
diff --git a/openssh/server/team/members/ylobankov.yml b/openssh/server/team/members/ylobankov.yml
new file mode 100644
index 0000000..4126d6e
--- /dev/null
+++ b/openssh/server/team/members/ylobankov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        ylobankov:
+          email: ylobankov@mirantis.com
+          enabled: true
+          full_name: Yaroslav Lobankov
+          home: /home/ylobankov
+          name: ylobankov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        ylobankov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDiBwStgCHjvPFYOAJgFXAFSFZaf57fJoSJV2Ijeg3uC3owsfQCgp6xd0aqSAUPYwnyV88IiDhNESeltJc3HmrA7kHWzziKCe4H7HEIg3IPGUKcnG7HF9izkmVTxqI/sXoyPvFoel5mJhtSes3A8Nk8IfWOexTy8NBfh2Te4PWqsYqEmHn2AdJ4oVBBrRDoxH8jac8vimOCZ742qMvF9lRWtItWatuEA8+moOyzAxLc0k1e7E8Myp37jE7LeXdoCE97rNp3OX7JHnfCYsthbRytA3Xjh8WLTdAaI1RCj0GqnVS3jdPS/Qzreit1gh7c74HWH/h/aj/U2wjHK1X63fJx/ZhzyqCwHjJ3spDPcIZ0tujZhw0ZjD/MiVxRze1EpmVJ3Zt0S6sgrOFXPSeC+3BEW6LD+jVIb33kS5y3bN1CXikv18WdCaLYjOGHolYF18Z5VgrxQh6hq94cSuJCYTDnbhkbww8XXCPiB2JKVF6KlD3MwfqlGKD+pyUWXKF0ZC8J4IO+keMnGGuausOFoRxg0vmpJ0fb0HODGofNIcwqnXSGmTYucBxWVs1Y4vs7NQPNJyzTcXcM8NyPpsG2uy1pwvDo+rTZ/nWFdu1mvW11hfInkNXTXjWljlNwhJCfRyNFvoUbahfRaNaBRIhy4GlGYjAHaMfkdYTYm0Dqt00YjQ== ylobankov@ylobankov
+          user: ${linux:system:user:ylobankov}
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/members_ci/mcp-scale-jenkins.yml b/openssh/server/team/members_ci/mcp-scale-jenkins.yml
index 3ec3a1c..cd3ff0c 100644
--- a/openssh/server/team/members_ci/mcp-scale-jenkins.yml
+++ b/openssh/server/team/members_ci/mcp-scale-jenkins.yml
@@ -11,7 +11,6 @@
           email: mos-scale-jenkins@mirantis.com
   openssh:
     server:
-      enabled: true
       user:
         mcp-scale-jenkins:
           enabled: true
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index a7d8871..6f86bc5 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -15,6 +15,7 @@
 - system.openssh.server.team.members.ataraday
 - system.openssh.server.team.members.svasilenko
 - system.openssh.server.team.members.akasatkin
+- system.openssh.server.team.members.akurenyshev
 # Deprecated users
 - system.openssh.server.team.members.deprecated.pjediny
 - system.openssh.server.team.members.deprecated.akuznetsova
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/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 21ccba7..61eab35 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -17,10 +17,12 @@
 - system.openssh.server.team.members.yisakov
 - system.openssh.server.team.members.vblokhin
 - system.openssh.server.team.members.dstremkouski
+- system.openssh.server.team.members.osavatieiev
 - system.openssh.server.team.members.mchernik
 - system.openssh.server.team.members.hkraemer
 - system.openssh.server.team.members.pbasov
 - system.openssh.server.team.members.alis
+- system.openssh.server.team.members.isviridov
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/stacklight.yml b/openssh/server/team/stacklight.yml
index 4736b4a..2d20aad 100644
--- a/openssh/server/team/stacklight.yml
+++ b/openssh/server/team/stacklight.yml
@@ -1,267 +1,20 @@
 classes:
-- system.openssh.server.team.members.akiseleva
+- system.openssh.server.team.members.dkalashnik
+- system.openssh.server.team.members.isvetlov
+- system.openssh.server.team.members.mmatuszkowiak
+- system.openssh.server.team.members.mkobus
+- system.openssh.server.team.members.sbanka
+- system.openssh.server.team.members.vgusev
+# Deprecated users
+- system.openssh.server.team.members.deprecated.akholkin
+- system.openssh.server.team.members.deprecated.akomarek
+- system.openssh.server.team.members.deprecated.bkupidura
+- system.openssh.server.team.members.deprecated.kszukielojc
+- system.openssh.server.team.members.deprecated.nzaporozhets
+- system.openssh.server.team.members.deprecated.obourdon
+- system.openssh.server.team.members.deprecated.rpromyshlennikov
+- system.openssh.server.team.members.deprecated.spasquier
+
 parameters:
   _param:
     linux_system_user_sudo: true
-  linux:
-    system:
-      user:
-        newt:
-          enabled: true
-          name: newt
-          sudo: true
-          full_name: Ales Komarek
-          home: /home/newt
-          email: mail@newt.cz
-        spasquier:
-          enabled: true
-          name: spasquier
-          sudo: true
-          full_name: Simon Pasquier
-          home: /home/spasquier
-          email: spasquier@mirantis.com
-        obourdon:
-          enabled: true
-          name: obourdon
-          sudo: true
-          full_name: Olivier Bourdon
-          home: /home/obourdon
-          email: obourdon@mirantis.com
-        dkalashnik:
-          enabled: true
-          name: dkalashnik
-          sudo: true
-          full_name: Dmitry Kalashnik
-          home: /home/dkalashnik
-          email: dkalashnik@mirantis.com
-        rpromyshlennikov:
-          enabled: true
-          name: rpromyshlennikov
-          sudo: true
-          full_name: Rodion Promyshlennikov
-          home: /home/rpromyshlennikov
-          email: rpromyshlennikov@mirantis.com
-        vgusev:
-          enabled: true
-          name: vgusev
-          sudo: true
-          full_name: Vitaly Gusev
-          home: /home/vgusev
-          email: vgusev@mirantis.com
-        mpolreich:
-          enabled: true
-          name: mpolreich
-          sudo: true
-          full_name: Martin Polreich
-          home: /home/mpolreich
-          email: mpolreich@mirantis.com
-        isvetlov:
-          enabled: true
-          name: isvetlov
-          sudo: true
-          full_name: Ildar Svetlov
-          home: /home/isvetlov
-          email: isvetlov@mirantis.com
-        akholkin:
-          enabled: true
-          name: akholkin
-          sudo: true
-          full_name: Aleksandr Kholkin
-          home: /home/akholkin
-          email: akholkin@mirantis.com
-        kszukielojc:
-          enabled: true
-          name: kszukielojc
-          sudo: true
-          full_name: Krzysztof Szukiełojć
-          home: /home/kszukielojc
-          email: kszukielojc@mirantis.com
-        bkupidura:
-          enabled: true
-          name: bkupidura
-          sudo: true
-          full_name: Bartosz Kupidura
-          home: /home/bkupidura
-          email: bkupidura@mirantis.com
-        isviridov:
-          enabled: true
-          name: isviridov
-          sudo: true
-          full_name: Illia Svyrydov
-          home: /home/isviridov
-          email: isviridov@mirantis.com
-        nzaporozhets:
-          enabled: true
-          name: nzaporozhets
-          sudo: true
-          full_name: Nikita Zaporozhets
-          home: /home/nzaporozhets
-          email: nzaporozhets@mirantis.com
-        sbanka:
-          enabled: true
-          name: sbanka
-          sudo: true
-          full_name: Szymon Banka
-          home: /home/sbanka
-          email: sbanka@mirantis.com
-        crh:
-          enabled: true
-          name: crh
-          sudo: true
-          full_name: Christian Huebner
-          home: /home/crh
-          email: chuebner@mirantis.com
-        mmatuszkowiak:
-          enabled: true
-          name: mmatuszkowiak
-          sudo: true
-          full_name: Mateusz Matuszkowiak
-          home: /home/mmatuszkowiak
-          email: mmatuszkowiak@mirantis.com
-        mkobus:
-          enabled: true
-          name: mkobus
-          sudo: true
-          full_name: Michal Kobus
-          home: /home/mkobus
-          email: mkobus@mirantis.com
-        akiseleva:
-          enabled: true
-          name: akiseleva
-          sudo: true
-          full_name: Alena Kiseleva
-          home: /home/akiseleva
-          email: akiseleva@mirantis.com
-  openssh:
-    client:
-      enabled: true
-    server:
-      enabled: true
-      user:
-        newt:
-          enabled: true
-          public_keys:
-          - ${public_keys:newt}
-          user: ${linux:system:user:newt}
-        spasquier:
-          enabled: true
-          public_keys:
-          - ${public_keys:spasquier}
-          user: ${linux:system:user:spasquier}
-        obourdon:
-          enabled: true
-          public_keys:
-          - ${public_keys:obourdon}
-          user: ${linux:system:user:obourdon}
-        dkalashnik:
-          enabled: true
-          public_keys:
-          - ${public_keys:dkalashnik}
-          user: ${linux:system:user:dkalashnik}
-        rpromyshlennikov:
-          enabled: true
-          public_keys:
-          - ${public_keys:rpromyshlennikov}
-          user: ${linux:system:user:rpromyshlennikov}
-        vgusev:
-          enabled: true
-          public_keys:
-          - ${public_keys:vgusev}
-          user: ${linux:system:user:vgusev}
-        mpolreich:
-          enabled: true
-          public_keys:
-          - ${public_keys:mpolreich}
-          user: ${linux:system:user:mpolreich}
-        isvetlov:
-          enabled: true
-          public_keys:
-          - ${public_keys:isvetlov}
-          user: ${linux:system:user:isvetlov}
-        akholkin:
-          enabled: true
-          public_keys:
-          - ${public_keys:akholkin}
-          user: ${linux:system:user:akholkin}
-        kszukielojc:
-          enabled: true
-          public_keys:
-          - ${public_keys:kszukielojc}
-          user: ${linux:system:user:kszukielojc}
-        bkupidura:
-          enable: true
-          public_keys:
-          - ${public_keys:bkupidura}
-          user: ${linux:system:user:bkupidura}
-        isviridov:
-          enabled: true
-          public_keys:
-          - ${public_keys:isviridov}
-          user: ${linux:system:user:isviridov}
-        nzaporozhets:
-          enabled: true
-          public_keys:
-          - ${public_keys:nzaporozhets}
-          user: ${linux:system:user:nzaporozhets}
-        sbanka:
-          enabled: true
-          public_keys:
-          - ${public_keys:sbanka}
-          user: ${linux:system:user:sbanka}
-        crh:
-          enabled: true
-          public_keys:
-          - ${public_keys:crh}
-          user: ${linux:system:user:crh}
-        mmatuszkowiak:
-          enabled: true
-          public_keys:
-          - ${public_keys:mmatuszkowiak}
-          user: ${linux:system:user:mmatuszkowiak}
-        mkobus:
-          enabled: true
-          public_keys:
-          - ${public_keys:mkobus}
-          user: ${linux:system:user:mkobus}
-        akiseleva:
-          enabled: true
-          public_keys:
-          - ${public_keys:akiseleva}
-          user: ${linux:system:user:akiseleva}
-  public_keys:
-    newt:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3odU+3V2uDA2ptAFL9hrJRPNEEdAyztWOZFQ5Oyd9oerTGOU3p4xmrgWWjfKFKbYGhiiIUcYAol5PkTfKukGEkkjCHYA1t023soCaaAj85wCZCnw2zQNAziwxTYmAzTqgxiSvtZNMMrtJvFHRIRDzJ3M1lV0prWNWkMM1/3FAd4W49y6VT3fkMCo8uqG7CfGdgR2DgBCxf9KaNPfW5eDEPOgmE5lK8tVSEI6T+Cg7hbcTf4lFYnlFBnlQgp/0JstsM4Vbwb4B34LOpOsf2S8rrWk2xQMjwaMHXkc2s/E8iW3F5nVFuyEXYISFQIiAHw8dzC6CHgLcyHUVWwznKawZ newt@newt-dev1
-    spasquier:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXBHKQaGUNB92DsnyvflmCbmuXnkiuNahZiue3hnyXqLA2q8jmQmzBbxReAJzexnVfJhrUCTw8IPJUpMUP27u3igvGdkhfctdUuxVf9yGJErtGNgHK/aGbeLCvUOmhw6X/xbf3IbyFL1gwxOJ2cmmjlSptYU9E1W2xFY+IMFWBhzO3vso5EABgPVli/UUMfeXUUd++lIZpoyYe2Hkri1QGNhzfbZcFjEO78+vNiLZrvjJEtkXWu7iZTYK6eE365CiFJzqFL7N6Ichb28qakcmVqR/foreuz3cOMqMGssKoOQk1213x8w4fE0yLwf9Ft8L7GMf+vXQvuNt0ZKBPWqn7 spasquier@mirantis.com
-    obourdon:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOd0PnoQhjjo/UrmCotaGZxXfpxLoMmuZ+XjKqAkEb9kE+aE0+k8t2EUs8PIctEgIcIC9vmovqOzIt5uNLV5MyN4R+pdIBKyWEQ5fQPaFhn/uZKf7AxLYhTVVW1wM+cDzrpWTyNQ0w59JBfNPZ/BDMtdpch9gTP24pwJ8yUDHHMSt1FnVqa7+Czw8jig4/oM05Mob5DQKlWOdtdUP3XYHSGJuHY4tHmc5sPvzIqs5r47uj5VD4gaCUqYeRS2C1YJcisN880qIqUHuCK0k9gQP+0DKJPVPmPPCuwebBzUUfjhKcbqiikKxPS0p4DWiprmeF8xjvmVWX+V8lP/v0hXiVgMc3wMoXJklH+XM7U5y5uzN8MF4YqAi4M/uSK5UF+TPn5dtu9s+joQmqt5XXaV4iFQe5kcdIYEMNJUGxiwMzByhvqWgC1reYSD8FquqLTH/5ITvFFmaTyQbBJMnXAE+QxdTXMfhTnfI/pbbhAUmfr5w8Z34lZG5UDnUy/rR+LlvJS76MqCr3nemZTHqhUYIrIJA8f9Xa8o9UJTy2QICdj2NidW1UzHCPybc/nH7qc6TjZJALLdhzK2QDbO6seJLOXuVHwSxjOx2Jdv5HImpFSeEfiGRQqc8bT+NGZI5V+cW+FuztU8i46VaSPXFM8t+57Ut/MdndAVYSPqgc7E3u3w== obourdon@mirantis.com
-    dkalashnik:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAyz5ovMK/rRxlhiy7x4dVwFkUqN/hhdVIpsQRQoGgTOjVhH6Y+eTE3si0RRq/HKZMwkcClJIqzMgjoajT5eQQphQrAAn2pwuCyZj0mXJJ1RSXQm+nSnhoqyB1r7Nl3keopgxrDlBLWyvyS3dJM9RJy4TimIwhuSA3qdhmfeqRm5M=
-    rpromyshlennikov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3dCFNCYVxHQQD+/X1JJ9auAzpj15AkEl6yO4lJ1XL43ljxJbzWXXl3RN9vAjiBE1tvxEfuPEIxF7kO2sc1xPKtkw40RIwXrDIGfjlVCaBLtnxCPnCQX349UMSJl/AXpkHqKGVeAW+AO4zbeI8XnS9aDNMuX6ncgrLRMxWCxETL3J/IIE1LZ5v0QvyQBHuJc5jbyODVb4onff296SbjzYm96elJZcRFo4FzFaIcKtis+Sm4+6OAGCNDIXxfB9e5TK579x+L+ci/W1k83Fcz6NpQU/OM1R1CZVMap/Xet424aRMFPmA8sTF4hdYvWd6adBihco2isaW51b1Gkc+K9N9wELiEBMpdKQtqkPOvm98UhoRk7Wp+8+zSamj1uEs/7m6VCGFebq8V3xqTexWH2dCUznxZ5+KS6WLBh+3f4P6wG8VuWfgFjIUf7jjYKjidBXfSXFDxRkhf/LV8V0jLv+Ma1mjKBUX+rk7IFxm0X/PkjqNhVFlg3rH4Wre0+9WdsTCyzWS0HEaTxIKdPtwwULLEiwClO1LLebdlVjx9yhen0czXxMAHONbZeTvxN8ULfei+b7c07oYm16T8T9JAdiWn5nGxiT8TAUrCPBJMpbE4xQJLztYhAbMpfhFSdkKfTotFxTK9AKpTg4TZFY0NYOktFtV2R9ZnzP7hHZDSIg2Bw== rpromyshlennikov@mirantis.com
-    vgusev:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrCyaZjs8hiwx38LfpeQ2z9n9ptwQ7gFrhq2z5sK9q/LQMCubbnp5xhyF0SMY1jmQUewBOKXhnq3QSX+DmtNsnhitnZBw2BE5PBXllCBWMMiWULfAYvB0of728Q3EEjrtyfHkt7o2E+CvreVJcVI4kBwjKh5WpVBZ8mmkW/sexLGMuYu0bUWjCddu6ZlhUa+y14VZKOKp44auemza1VL/UzqOVZkBAfR2gPV2pBG3Im+SlnOlDRxKPEXQbsn3u/sNeZq0wSY++khY86AU7jAKfL2NiNsoA7CyB0jTEKwYO3vOWOhECifZuHwY/TNWyRFWM2ImW3mT9aO7nE4w4jXXJ vgusev@vgusev
-    mpolreich:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDC6jbVpCqvru+Te2RGLPy/AkcaoRqyqxdBi3OjjXdRjPQYGNuAEFgmlQDZvs5xBMAKOcrcCl8wLcFb3mmpr9+xBJAdR4K0bEqwMfCKRejsN+6AubCbrOeoWb9SsTdvBOl7rOFyICt/XuSNX56C8k1hJojC0U21DIertWSCd8h5RExE8Skqd9+KdHSFa+TZffWbysMrwba29UBt7XsAPuQr1BUOqhA8JOx146ul5HszitCOSvglre8pSJKpw6a4Fk/cb1J8Oc/AfSMdTvTLAfuF+d2Mw6SEawFEocSXq0WKCdZfJpZrWPr6SEB+7zoq3kvhIWgUH2ypYZvvqf0EVlWx polreichmartin@gmail.com
-    isvetlov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9lvegjKq6OP7cgF9YU9mPOk1/mfJbov3YnYnhiW1Ks0hrWZyAo+0TV3O7LgWZ8jqD9abbYaOiWCt4d9ABkLUJfCLNAqOJRapJ+tybPAxJKx4eV8pptJ7UF0EdItasTdd+gqJJ4Krk869rwmqVQ4hethdykjhKyWu3bG+uVtFUF5xUj9zaT9NThA6/Xhz0idAiTO8ArmLng4W8ne45gANaHIWXpIsklo6GLUSZwl4z6j2z4joxNJsB1hrw0msT56F26ctkDo6thNMAzPMyZsLjYJBJIRYhdC1d4Up9114nVcY4pzYw76+zXU9zED2XNRLdyAaxFlwXvumAs3iMLI8Z isvetlov@isvetlov-mac.local
-    akholkin:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDjpy9RI6iEDH/04eOOwreDa+R32USZiWxyFiKHa8zoDAlOfwaZVg6mZWepOxzwxCJPYusPGXCwQ6Zw9tHxVWOCgtzzPpsCCfhUU4v+99Wh08//W8d/s/WFka+5vqyskAO5Z8Ekk+kQU+jpUBG8/gMxAPBjj0fFc5BNeqDY9r9nmMNK6N2RVjvA6wZ8G5hLGxL9bn5Prhf/+avui1NAfy6gsT/mRt1W+eHWTvpijyNGm+m83jU34dQO6gE48n6WdSylLh/fY/p31rzAURaq1V/AZhdbSuZ8aJYDnfHevpK5+hMjoOop3v3hb7WHEmybGujQfW5HVaaWmG7SFlHeKGE/gZ2P9T+bQ+SgO+PmEAw4LayiBkzTPAHdZ2UGZe+3BI5gdM/ayovK2WVO1jS5FNlNGIvEQW+ws9V+ph+S1jL4jobDJEjs358iXrAYpf4JL+LvxFHiuj6EL51tbo8EU22z5mmgRQQ5eFrDzBuVLhcim651A3a5iSlmCeAQ5rTmHX/Op/PbK+3vAtI8vnlK4AhycLvWQ3kK2DRx+Uhzrlk5v6E14SopAhvpGOHqrLgmoHwHp1xt/9M1JgxkOUK5gccFKTQduxLHoTNBaNcP60IOG/MjqUPcOXSBcAN4Y1RDBg+pwXe4PFgOzwKdFoYeuhvtm8y185S0IvvfCHLCD8pNfQ== akholkin@mirantis.com
-    kszukielojc:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCiUm3Z3W3t4v7oe143rCNM/hbg9NU2bYUmQXek8DJPA4c3Xm6u0q+RL9kEXME+3zcj2HKqMxKsCBLXXdFIsgdUbOBV8AYiuySE220FTnEKRmdxsEnfSaBhXxFyIBNoew4gI7URSqAOclt5WuPJTqRM7K4VhbtzwEgeWVd/NUhxMCCtgkdJCYTSmycxmxs7R6V8vMr9Mb8DOqKkSpOu6f3JkR0lwnFN9zGGC4V/60FlJSDzvvI5Tn40ANPHITivs8xME0znsx7t0bF4vQUimvhYn1mumQCY1NwIaxJ/QqasD6Ag9Sn5dxSg9b3SeLn0JM6qKoIqZtfPYVuCp9gmlH0fyzJUdqu4lKKb2wBw/H5lK6icH4+owMawkav55rbvinHQOqmVCr/Bg/rTfc35ycVqjTXH/5J7OhzioKjU0yFkXFS2X/s8gpyxp3beJ+Ea4faoX+kcs0gyhMYzqC7/DOamrau7aVyEAjKYJNy60xRfjCQzjqiurbxVFh+3Fi64UUn7Bl1QV8VEiU3ztJ118psEI7zA+x2VROLZ1jrtaBYZTYB118JZicaFDycEVgg3+BHX3pFH/QSOjLsA4SK+HJjSz8CFKvWwaO6QJv1/3KHpcGEacMvmqKxwpQK0E4WpjWhglZRMPObQ0dBaGClOujgoOIHXtFGILEpWy2SdzDQkHw== kszukielojc@w541
-    bkupidura:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAfsAyuh1O+SfVRgddjQ8nByz2nNzXm71sP9FAPi5G5WoJA7El3fdrOWsG5bj5kQveVZj/M4qlETajcxMLwaFQd36nS4C0WjmzfoX2i6X+iWHFH/L/ha0UaDclfYkuGdxtCeYRakJ0Xqsm0vNuMpGhIGQP8j+OSLK0Q9pnrd1md+jrxx6JS1MXM5iUh+zU4roklrGy75WQvDJcCD3miVnktJsjb2hda8cIxkRf+l88xPm5TcC82cVAWpXF91+kUVdcHiB1D13t0IDEL6BdeUHffQij1++9x6JUukIEVDoP8Ot6DC16cbma4H9ssjdc9vnTGJjsZiu7Am+BNLKD4zsMnuSqWWfPYzQuoG5HZlyonzQIYncxo98LsHLRtrEE/CWnnO+jrd8Zfe9nAatelBgVv86UHoKEPyL666nd4UxaTiyKaXfNlvHWhfgbV67ZGRTrmllfdTmu1olOIniO706L3t3V+Zu6RjN5VjYdLegKKMo2E6XwhkMCcIg9Syi95pj8x8jFoKwjvOhb1EleuZyNHNbEvosIjAy1HsUgEo5bIwiV8K0aWIQE8VVyqyhdXOpR/Gk9UtFYsACyfCX84DjQBXp7OXIkyYt9s5N15Panml2X1CXnNgsh9M60+RvJBsFj3k8M57zcc7VAarAUKnYrI59l3cCZZVLtd4aIp8= zynzel@banshee
-    isviridov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGNZxzOm7OsZi/q6Qk71fnvjCfWk4BfxpZ5hDig6N1f9D0iAMaINyNmlF2PxstSLW0Mjdq2tXTUvVWlYpGrw+YLHQmVk8dckmLdUAxe2Z0oEvtWhiQC64927ibBTgQ2Tjfkao+PFYPbdjiO4FgRymS1/FpGKhvpdyPDCcOLrxsMSK9YpPi4kbkd4GmlGMercuaEzP3JOOzJioOOLtEw3LOLWG5mAIzXjGFxuCNdTI4gqxQm/iw/tOpb9PcsY10EapZsS4Pd8j58vuhJlwdoTxI3gzySJcTlWm0tcphex0g8X0tEUI+zVjemJcrYkZgUpb6x5/mUjNxC4nv+4A4yMTP
-    nzaporozhets:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC/UtqwBD6qkEoWSrmO0jXa9sUcwumySxmkX2XCTlAj+e8tzCNndNhaUueu01pbcNrGrB7xvCHyTa5cxgJEv0RAJRxZnObTjluegiuW+/KNSGwiSDy90bwPVb6zWalrDg12xGh8C0ybmv90uC+GrGO1UXFpm5N1qL3ZsUvSjWBRZ70xXjUI4self+fWxBYJhu7hGZ0RVCeA8TjRutzdOWcSZwN2Arn2Oq+fx9n5HP8iXlPcfM6aWj+QvkXphvKjUhDYiImQ07kJctYvxEwMei5pM1dAPZefQ6FRsUP1gKYKPVp1CiBHPIKLG3LMwxp0/LWQmHB4umZvA6HYplSUXZLMd+FhCRuocVFdxe308JWeIFWyw7og/qEBlpxqW4BUk0bR3c4deI9QDKWCuuunTDB4oEB8ZnkI7utknpx7sqO72Ev2UNS/CSi3yyqgOajojQ3l+McWn9bm08KSLzuuMaexETRYQ9dgjE79N7fH+DEt5Ryii+GA2a8Gl3iRtTZs9WA94mTb/KjZBrVxh+PixpQ6s3oGFelFCPMKSPWIEb+rwuAUi0Ulrqb2UZDzJYhT50QfbCzRN2MU+8bR7PJt/xpAADvQX0iMMrMUvAVngs2YrXKapJliyHhTZxOmVdDRIyCQ1YpK2ktBJf+E+RXl3R5XUmbJkT4jZ1R6cA1QJOEKVQ== nzaporozhets@mirantis.com
-    sbanka:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMdgjQ/jeWwQTaPyy7G5JJAkM+QPNPFkzMldPHJzOxEBzt/M5zAooj0XgbRIDIztolhXhmj8N5QSG5n3Wn9T9e2KpoxrLaVhMV5WGTgMrXMmyT8oXLV3gLxGNHMWFvplSbHLK78EsZQQ1/kBQMyPXB1+FpIuSHVOxaospOQObJ08lvQfvlO7AUUV4ecpFj3PpV5vkKPRS+KfiRm84BeGIu51BL1BClZcOyHZPBQT+DUBjm8y4Nd7pVZRjsiBzZBvUotCbn5+RqWJnu4kyoGoRNmk8pvCx7jGL1G9rE8NNsKlCUWedvyNkDeoWKvleJuzkj3ggfuCj/iTtDoXFR95e3
-    crh:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjW4PSMoILjoZWDM8RnbiW6HXHBFntnDd6jgAlokJhTpYIjzUHpoh/OqphraKbNFnPbzL2nkIbaKZqKj+uuvbsitHnApmdFgSpOmBRGeaSExA30GqweYrIMKN5JAQTbONZWLSm+LD689CXRv2s6Th/YMELYfoi2W0pkvwiBdr+/0NxpdRvJydCn36SE6wOigu4uJXIXeNqIjTD+x4sW6GB54Ugbg+SMmI9D5ONlmfEj8K/ZmG1THdPGOLlquy/VLiuOBuwNoJCBV9shsGEmdg8NiOu8NPupQlsbmClZDbBAklJ0AF6ElAwKSiqCOhbaa7hu4qJFrCKC+XAgYxS9t7r
-    mmatuszkowiak:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDC6TGCQAH3FGNSOhSbovhwODabOAsgVqG71rEDdXvDSShwyNB3RIICefas3mdSLsG7+1K9mZ1jicWzNbotvePwzrM/MESzntzp4QZ5J/9L3BMiqWWKL2u6BQ65LGe0YMzMmdSkqMAj0uxt3+OiFDPDrwqH6qN0hwxAJM+byeUlQW8uWQYm/pmWMD60GUrnjYUfKfEa/S3symaZBHQvjtp26De8D6u/jr4TWi5VJpKqVREqU7Z4IKwn8JvHMmUbRO4endW3cRiv35Qb7s66rO6TD0KlDFnnTxOtFvLhL51j58X4MrV9FHUI6czoqjAgEDe9CW7DzZ1xMj03d6IAipgL
-    mkobus:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCBqe3X+LrneiuieWGjlw5wRtgixBu2Q8LZjH6W+8nsOkB7iN6qRdKom3jac1Cdd5wSJ0NFAhDNcTLK4Etz/3YACglsTxk09TzXlqs1V0Y7U5a2eqn3KTOgMNsJ1aOhFq/LnmUwTdN8NXac6TIkwZZBj5KhHSvIoO+mfsascct5FIVU/+p32d3o/4NqMDDdTg/qxIMKQsh5sw5Y9Tz9h28LGbDh+QF2lW+b5YJhnCG21Uw17xcyxf3/53EpJwTXfElonSR7HMVLxrq7oDzmqKFZ2z8i9do6EgODKlZpSkxiAFOBw5oA2hPtEeqtXqvddu2FcNGuSNhx/6O8ZHIKq3Xh/tTOYnoc+qYDMRCzDwzeyivfr5Ci3n64giUaZl+KUr6D1CKeL2s8j9+kod/1JJDEeoYR+V93MTiTD/39N8eQAGv+6r9HBapXIkvr3iNuTH1+5eN36Vc90jXXRmGMZkF5P9ivNGDZGcy2pBwwPg/bRn2xb0zx1fsxd4qOi+Cd7mBCF4+SfnVCqUd2H9R0O3S7WgfLr+wOXpFq6/WwgjzI9RVhLJ5cZmePJKvYZYYhkAxsVwWSE639zFFuU1zhFXr49wa0njK9DdYWiQEhOki0ki3huABmVbWKg/zP1Rlllmtk0S4mwggJ57JYbuhEV3a1x1KOtWMzODW5cb3HlPTQw==
-    akiseleva:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyxzlFKlCcfwagnnmCg1r9SUVfAgy/IdPSxsnpELjCRaz3FI66sYa1F1RdZngoXmYxe5qlmkiRQ0rCjIYk12I08du5FJGYQvMttJEgmVeHtFKW0o3uGBIKNJ5nCni3lR8idPTRXqhwdXYeA4A9+COQO4MGcaJZrqHgEviZt4jQrYy90WdqbKTD4meBRy4MC9+TOUs719kTxK54tmMHBq2l/ukmv3FwgtLz2xMeNW7htiS/1rzA9CEerjkvpc0mOxc4DCY4bH8sR2Ts3Y33Rx6aUN8shTij2aX2v8UvUay2JPqQTJicY+IsYl4D8w/XPx00Oj/3b54f6kTLlzzoNDq5 alena@alena-Lenovo-V580c
diff --git a/openssh/server/team/storage.yml b/openssh/server/team/storage.yml
new file mode 100644
index 0000000..075b9d1
--- /dev/null
+++ b/openssh/server/team/storage.yml
@@ -0,0 +1,3 @@
+classes:
+- system.openssh.server.team.members.akiseleva
+- system.openssh.server.team.members.mlos
diff --git a/panko/server/cluster.yml b/panko/server/cluster.yml
index 7954944..354ac58 100644
--- a/panko/server/cluster.yml
+++ b/panko/server/cluster.yml
@@ -12,8 +12,6 @@
     panko_memcached_node03_address: ${_param:cluster_node03_address}
     # Keep events in database for 30 days
     panko_event_time_to_live: 2592000
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
   linux:
     system:
       cron:
diff --git a/panko/server/single.yml b/panko/server/single.yml
index 968267c..5e91db1 100644
--- a/panko/server/single.yml
+++ b/panko/server/single.yml
@@ -6,8 +6,6 @@
   _param:
     # Keep events in database for 30 days
     panko_event_time_to_live: 2592000
-    openstack_mysql_x509_enabled: False
-    galera_ssl_enabled: False
   linux:
     system:
       cron:
diff --git a/prometheus/gainsight/query/openstack.yml b/prometheus/gainsight/query/openstack.yml
index 34c81c3..877ad32 100644
--- a/prometheus/gainsight/query/openstack.yml
+++ b/prometheus/gainsight/query/openstack.yml
@@ -2,17 +2,17 @@
   prometheus:
     gainsight:
       queries:
-        vcpu_used: "'vCPU Used','sum(avg_over_time(openstack_nova_used_vcpus[24h]))'"
-        vcpu_free: "'vCPU Free','sum(avg_over_time(openstack_nova_free_vcpus[24h]))'"
-        vstorage_used: "'vStorage Used','sum(avg_over_time(openstack_nova_used_disk[24h]))'"
-        vstorage_free: "'vStorage Free','sum(avg_over_time(openstack_nova_free_disk[24h]))'"
-        vram_used: "'vRAM Used','sum(avg_over_time(openstack_nova_used_ram[24h]))'"
-        vram_free: "'vRAM Free','sum(avg_over_time(openstack_nova_free_ram[24h]))'"
-        instances: "'Instances','sum(avg_over_time(openstack_nova_instances[24h]))'"
-        compute_nodes: "'Compute Nodes','sum(openstack_nova_services{service=~\"nova.compute\"})'"
-        tenants: "'Tenants','sum(avg_over_time(openstack_keystone_tenants_total[24h]))'"
-        cinder_api: "'Cinder API','avg(avg_over_time(openstack_api_check_status{service=\"cinderv2\"}[24h]))'"
-        nova_api: "'Nova API','avg(avg_over_time(openstack_api_check_status{service=\"nova\"}[24h]))'"
-        keystone_api: "'Keystone API','avg(avg_over_time(openstack_api_check_status{service=\"keystone\"}[24h]))'"
-        glance_api: "'Glance API','avg(avg_over_time(openstack_api_check_status{service=\"glance\"}[24h]))'"
-        neutron_api: "'Neutron API','avg(avg_over_time(openstack_api_check_status{service=\"neutron\"}[24h]))'"
+        vcpu_used: "'vCPU Used','avg(sum(avg_over_time(openstack_nova_used_vcpus[24h])) by (instance))'"
+        vcpu_free: "'vCPU Free','avg(sum(avg_over_time(openstack_nova_free_vcpus[24h])) by (instance))'"
+        vstorage_used: "'vStorage Used','avg(sum(avg_over_time(openstack_nova_used_disk[24h])) by (instance))'"
+        vstorage_free: "'vStorage Free','avg(sum(avg_over_time(openstack_nova_free_disk[24h])) by (instance))'"
+        vram_used: "'vRAM Used','avg(sum(avg_over_time(openstack_nova_used_ram[24h])) by (instance))'"
+        vram_free: "'vRAM Free','avg(sum(avg_over_time(openstack_nova_free_ram[24h])) by (instance))'"
+        instances: "'Active Instances','avg(sum(avg_over_time(openstack_nova_instances{state=\"active\"}[24h])) by (instance))'"
+        compute_nodes: "'Compute Nodes','avg(sum(openstack_nova_services{binary=~\"nova.compute\"}) by (instance))'"
+        tenants: "'Tenants','avg(sum(avg_over_time(openstack_keystone_tenants_total[24h])) by (instance))'"
+        cinder_api: "'Cinder API','avg(avg_over_time(openstack_api_check_status{name=\"cinderv2\"}[24h]))'"
+        nova_api: "'Nova API','avg(avg_over_time(openstack_api_check_status{name=\"nova\"}[24h]))'"
+        keystone_api: "'Keystone API','avg(avg_over_time(openstack_api_check_status{name=\"keystone\"}[24h]))'"
+        glance_api: "'Glance API','avg(avg_over_time(openstack_api_check_status{name=\"glance\"}[24h]))'"
+        neutron_api: "'Neutron API','avg(avg_over_time(openstack_api_check_status{name=\"neutron\"}[24h]))'"
diff --git a/prometheus/server/target/federation/init.yml b/prometheus/server/target/federation/init.yml
index 564af82..c480c1a 100644
--- a/prometheus/server/target/federation/init.yml
+++ b/prometheus/server/target/federation/init.yml
@@ -10,8 +10,8 @@
           prometheus_federation:
             honor_labels: true
             metrics_path: '/federate'
-            scrape_interval: 15s
-            scrape_timeout: 15s
+            scrape_interval: 30s
+            scrape_timeout: 30s
             endpoint:
              - address: ${_param:stacklight_monitor_address}
                port: 15010
diff --git a/rabbitmq/server/ssl/init.yml b/rabbitmq/server/ssl/init.yml
index 961d28d..06962d1 100644
--- a/rabbitmq/server/ssl/init.yml
+++ b/rabbitmq/server/ssl/init.yml
@@ -2,10 +2,6 @@
 - system.salt.minion.cert.rabbitmq_server
 - service.rabbitmq.server.ssl
 parameters:
-  _param:
-    rabbitmq_ssl_enabled: true
-    openstack_rabbitmq_x509_enabled: false
-    openstack_rabbitmq_port: 5671 # for non-ssl use 5672 / for ssl 5671
   rabbitmq:
     server:
       ssl:
diff --git a/rundeck/client/project/cicd.yml b/rundeck/client/project/cicd.yml
index 6038fcc..e09d9f1 100644
--- a/rundeck/client/project/cicd.yml
+++ b/rundeck/client/project/cicd.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     rundeck_cis_jobs_repository: https://gerrit.mcp.mirantis.net/oss/rundeck-cis-jobs
     rundeck_cis_jobs_revision: master
     rundeck_cis_elasticsearch_url: yourelastic:9200
diff --git a/salt/control/placement/openstack/compact.yml b/salt/control/placement/openstack/compact.yml
index 83f2254..e209cab 100644
--- a/salt/control/placement/openstack/compact.yml
+++ b/salt/control/placement/openstack/compact.yml
@@ -14,11 +14,30 @@
     openstack_message_queue_node03_hostname: msg03
     openstack_proxy_node01_hostname: prx01
     openstack_proxy_node02_hostname: prx02
+    openstack_share_node01_hostname: share01
+    openstack_share_node02_hostname: share02
+    openstack_share_node03_hostname: share03
+    openstack_barbican_node01_hostname: kmn01
+    openstack_barbican_node02_hostname: kmn02
+    openstack_barbican_node03_hostname: kmn03
+    openstack_dns_node01_hostname: dns01
+    openstack_dns_node02_hostname: dns02
+    openstack_telemetry_node01_hostname: mdb01
+    openstack_telemetry_node02_hostname: mdb02
+    openstack_telemetry_node03_hostname: mdb03
+    openstack_baremetal_node01_hostname: bmt01
+    openstack_baremetal_node02_hostname: bmt02
+    openstack_baremetal_node03_hostname: bmt03
     salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_share_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
       cluster:
@@ -90,3 +109,89 @@
               backend: ${_param:openstack_proxy_backend_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.proxy
+            share01:
+              name: ${_param:openstack_share_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            share02:
+              name: ${_param:openstack_share_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            share03:
+              name: ${_param:openstack_share_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            kmn01:
+              name: ${_param:openstack_barbican_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            kmn02:
+              name: ${_param:openstack_barbican_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            kmn03:
+              name: ${_param:openstack_barbican_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            dns01:
+              name: ${_param:openstack_dns_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_dns_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.dns
+            dns02:
+              name: ${_param:openstack_dns_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_dns_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.dns
+            mdb01:
+              name: ${_param:openstack_telemetry_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            mdb02:
+              name: ${_param:openstack_telemetry_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            mdb03:
+              name: ${_param:openstack_telemetry_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            bmt01:
+              name: ${_param:openstack_baremetal_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+            bmt02:
+              name: ${_param:openstack_baremetal_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+            bmt03:
+              name: ${_param:openstack_baremetal_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+
+
diff --git a/salt/control/placement/openstack/large.yml b/salt/control/placement/openstack/large.yml
index f09d3f6..9fd5465 100644
--- a/salt/control/placement/openstack/large.yml
+++ b/salt/control/placement/openstack/large.yml
@@ -21,11 +21,30 @@
     openstack_message_queue_node03_hostname: msg03
     openstack_proxy_node01_hostname: prx01
     openstack_proxy_node02_hostname: prx02
+    openstack_share_node01_hostname: share01
+    openstack_share_node02_hostname: share02
+    openstack_share_node03_hostname: share03
+    openstack_barbican_node01_hostname: kmn01
+    openstack_barbican_node02_hostname: kmn02
+    openstack_barbican_node03_hostname: kmn03
+    openstack_dns_node01_hostname: dns01
+    openstack_dns_node02_hostname: dns02
+    openstack_telemetry_node01_hostname: mdb01
+    openstack_telemetry_node02_hostname: mdb02
+    openstack_telemetry_node03_hostname: mdb03
+    openstack_baremetal_node01_hostname: bmt01
+    openstack_baremetal_node02_hostname: bmt02
+    openstack_baremetal_node03_hostname: bmt03
     salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_share_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
       cluster:
@@ -109,3 +128,87 @@
               backend: ${_param:openstack_proxy_backend_image}
               provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
               size: openstack.proxy
+            share01:
+              name: ${_param:openstack_share_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            share02:
+              name: ${_param:openstack_share_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            share03:
+              name: ${_param:openstack_share_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            kmn01:
+              name: ${_param:openstack_barbican_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            kmn02:
+              name: ${_param:openstack_barbican_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            kmn03:
+              name: ${_param:openstack_barbican_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            dns01:
+              name: ${_param:openstack_dns_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_dns_backend_image}
+              provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
+              size: openstack.dns
+            dns02:
+              name: ${_param:openstack_dns_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_dns_backend_image}
+              provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
+              size: openstack.dns
+            mdb01:
+              name: ${_param:openstack_telemetry_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            mdb02:
+              name: ${_param:openstack_telemetry_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            mdb03:
+              name: ${_param:openstack_telemetry_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            bmt01:
+              name: ${_param:openstack_baremetal_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+            bmt02:
+              name: ${_param:openstack_baremetal_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+            bmt03:
+              name: ${_param:openstack_baremetal_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
diff --git a/salt/control/placement/openstack/medium.yml b/salt/control/placement/openstack/medium.yml
index 2419c74..14779d2 100644
--- a/salt/control/placement/openstack/medium.yml
+++ b/salt/control/placement/openstack/medium.yml
@@ -17,11 +17,30 @@
     openstack_message_queue_node03_hostname: msg03
     openstack_proxy_node01_hostname: prx01
     openstack_proxy_node02_hostname: prx02
+    openstack_share_node01_hostname: share01
+    openstack_share_node02_hostname: share02
+    openstack_share_node03_hostname: share03
+    openstack_barbican_node01_hostname: kmn01
+    openstack_barbican_node02_hostname: kmn02
+    openstack_barbican_node03_hostname: kmn03
+    openstack_dns_node01_hostname: dns01
+    openstack_dns_node02_hostname: dns02
+    openstack_telemetry_node01_hostname: mdb01
+    openstack_telemetry_node02_hostname: mdb02
+    openstack_telemetry_node03_hostname: mdb03
+    openstack_baremetal_node01_hostname: bmt01
+    openstack_baremetal_node02_hostname: bmt02
+    openstack_baremetal_node03_hostname: bmt03
     salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_share_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
       cluster:
@@ -93,3 +112,90 @@
               backend: ${_param:openstack_proxy_backend_image}
               provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               size: openstack.proxy
+            share01:
+              name: ${_param:openstack_share_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            share02:
+              name: ${_param:openstack_share_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            share03:
+              name: ${_param:openstack_share_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            kmn01:
+              name: ${_param:openstack_barbican_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            kmn02:
+              name: ${_param:openstack_barbican_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            kmn03:
+              name: ${_param:openstack_barbican_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            dns01:
+              name: ${_param:openstack_dns_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_dns_backend_image}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              size: openstack.dns
+            dns02:
+              name: ${_param:openstack_dns_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_dns_backend_image}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              size: openstack.dns
+            mdb01:
+              name: ${_param:openstack_telemetry_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            mdb02:
+              name: ${_param:openstack_telemetry_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            mdb03:
+              name: ${_param:openstack_telemetry_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            bmt01:
+              name: ${_param:openstack_baremetal_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+            bmt02:
+              name: ${_param:openstack_baremetal_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+            bmt03:
+              name: ${_param:openstack_baremetal_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+
+
+
diff --git a/salt/control/placement/openstack/minimal.yml b/salt/control/placement/openstack/minimal.yml
index 83f2254..27e2b47 100644
--- a/salt/control/placement/openstack/minimal.yml
+++ b/salt/control/placement/openstack/minimal.yml
@@ -14,11 +14,30 @@
     openstack_message_queue_node03_hostname: msg03
     openstack_proxy_node01_hostname: prx01
     openstack_proxy_node02_hostname: prx02
+    openstack_share_node01_hostname: share01
+    openstack_share_node02_hostname: share02
+    openstack_share_node03_hostname: share03
+    openstack_barbican_node01_hostname: kmn01
+    openstack_barbican_node02_hostname: kmn02
+    openstack_barbican_node03_hostname: kmn03
+    openstack_dns_node01_hostname: dns01
+    openstack_dns_node02_hostname: dns02
+    openstack_telemetry_node01_hostname: mdb01
+    openstack_telemetry_node02_hostname: mdb02
+    openstack_telemetry_node03_hostname: mdb03
+    openstack_baremetal_node01_hostname: bmt01
+    openstack_baremetal_node02_hostname: bmt02
+    openstack_baremetal_node03_hostname: bmt03
     salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_share_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
       cluster:
@@ -90,3 +109,87 @@
               backend: ${_param:openstack_proxy_backend_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.proxy
+            share01:
+              name: ${_param:openstack_share_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            share02:
+              name: ${_param:openstack_share_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            share03:
+              name: ${_param:openstack_share_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            kmn01:
+              name: ${_param:openstack_barbican_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            kmn02:
+              name: ${_param:openstack_barbican_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            kmn03:
+              name: ${_param:openstack_barbican_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            dns01:
+              name: ${_param:openstack_dns_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_dns_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.dns
+            dns02:
+              name: ${_param:openstack_dns_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_dns_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.dns
+            mdb01:
+              name: ${_param:openstack_telemetry_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            mdb02:
+              name: ${_param:openstack_telemetry_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            mdb03:
+              name: ${_param:openstack_telemetry_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            bmt01:
+              name: ${_param:openstack_baremetal_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+            bmt02:
+              name: ${_param:openstack_baremetal_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+            bmt03:
+              name: ${_param:openstack_baremetal_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
diff --git a/salt/control/placement/openstack/small.yml b/salt/control/placement/openstack/small.yml
index 83f2254..27e2b47 100644
--- a/salt/control/placement/openstack/small.yml
+++ b/salt/control/placement/openstack/small.yml
@@ -14,11 +14,30 @@
     openstack_message_queue_node03_hostname: msg03
     openstack_proxy_node01_hostname: prx01
     openstack_proxy_node02_hostname: prx02
+    openstack_share_node01_hostname: share01
+    openstack_share_node02_hostname: share02
+    openstack_share_node03_hostname: share03
+    openstack_barbican_node01_hostname: kmn01
+    openstack_barbican_node02_hostname: kmn02
+    openstack_barbican_node03_hostname: kmn03
+    openstack_dns_node01_hostname: dns01
+    openstack_dns_node02_hostname: dns02
+    openstack_telemetry_node01_hostname: mdb01
+    openstack_telemetry_node02_hostname: mdb02
+    openstack_telemetry_node03_hostname: mdb03
+    openstack_baremetal_node01_hostname: bmt01
+    openstack_baremetal_node02_hostname: bmt02
+    openstack_baremetal_node03_hostname: bmt03
     salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_share_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
+    openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
       cluster:
@@ -90,3 +109,87 @@
               backend: ${_param:openstack_proxy_backend_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.proxy
+            share01:
+              name: ${_param:openstack_share_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            share02:
+              name: ${_param:openstack_share_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            share03:
+              name: ${_param:openstack_share_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_share_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.share
+            kmn01:
+              name: ${_param:openstack_barbican_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            kmn02:
+              name: ${_param:openstack_barbican_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            kmn03:
+              name: ${_param:openstack_barbican_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_barbican_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.barbican
+            dns01:
+              name: ${_param:openstack_dns_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_dns_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.dns
+            dns02:
+              name: ${_param:openstack_dns_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_dns_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.dns
+            mdb01:
+              name: ${_param:openstack_telemetry_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            mdb02:
+              name: ${_param:openstack_telemetry_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            mdb03:
+              name: ${_param:openstack_telemetry_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_telemetry_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.telemetry
+            bmt01:
+              name: ${_param:openstack_baremetal_node01_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+            bmt02:
+              name: ${_param:openstack_baremetal_node02_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
+            bmt03:
+              name: ${_param:openstack_baremetal_node03_hostname}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_baremetal_backend_image}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              size: openstack.baremetal
diff --git a/salt/control/sizes/openstack/compact.yml b/salt/control/sizes/openstack/compact.yml
index d326a9b..4955911 100644
--- a/salt/control/sizes/openstack/compact.yml
+++ b/salt/control/sizes/openstack/compact.yml
@@ -20,6 +20,26 @@
     salt_control_size_ram_openstack_upgrade: 16384
     salt_control_size_disk_profile_openstack_upgrade: medium
     salt_control_size_net_profile_openstack_upgrade: default
+    salt_control_size_cpu_openstack_share: 2
+    salt_control_size_ram_openstack_share: 2048
+    salt_control_size_disk_profile_openstack_share: large
+    salt_control_size_net_profile_openstack_share: default
+    salt_control_size_cpu_openstack_dns: 2
+    salt_control_size_ram_openstack_dns: 4096
+    salt_control_size_disk_profile_openstack_dns: small
+    salt_control_size_net_profile_openstack_dns: default
+    salt_control_size_cpu_openstack_telemetry: 4
+    salt_control_size_ram_openstack_telemetry: 8192
+    salt_control_size_disk_profile_openstack_telemetry: xlarge
+    salt_control_size_net_profile_openstack_telemetry: default
+    salt_control_size_cpu_openstack_barbican: 4
+    salt_control_size_ram_openstack_barbican: 8192
+    salt_control_size_disk_profile_openstack_barbican: large
+    salt_control_size_net_profile_openstack_barbican: default
+    salt_control_size_cpu_openstack_baremetal: 8
+    salt_control_size_ram_openstack_baremetal: 8192
+    salt_control_size_disk_profile_openstack_baremetal: large
+    salt_control_size_net_profile_openstack_baremetal: default
   salt:
     control:
       size:
@@ -47,4 +67,29 @@
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+        openstack.share:
+          cpu: ${_param:salt_control_size_cpu_openstack_share}
+          ram: ${_param:salt_control_size_ram_openstack_share}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+        openstack.dns:
+          cpu: ${_param:salt_control_size_cpu_openstack_dns}
+          ram: ${_param:salt_control_size_ram_openstack_dns}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+        openstack.telemetry:
+          cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
+          ram: ${_param:salt_control_size_ram_openstack_telemetry}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+        openstack.barbican:
+          cpu: ${_param:salt_control_size_cpu_openstack_barbican}
+          ram: ${_param:salt_control_size_ram_openstack_barbican}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+        openstack.baremetal:
+          cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
+          ram: ${_param:salt_control_size_ram_openstack_baremetal}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
diff --git a/salt/control/sizes/openstack/large.yml b/salt/control/sizes/openstack/large.yml
index db27874..cd7d71e 100644
--- a/salt/control/sizes/openstack/large.yml
+++ b/salt/control/sizes/openstack/large.yml
@@ -20,6 +20,26 @@
     salt_control_size_ram_openstack_upgrade: 16384
     salt_control_size_disk_profile_openstack_upgrade: medium
     salt_control_size_net_profile_openstack_upgrade: default
+    salt_control_size_cpu_openstack_share: 4
+    salt_control_size_ram_openstack_share: 6144
+    salt_control_size_disk_profile_openstack_share: large
+    salt_control_size_net_profile_openstack_share: default
+    salt_control_size_cpu_openstack_dns: 4
+    salt_control_size_ram_openstack_dns: 8192
+    salt_control_size_disk_profile_openstack_dns: small
+    salt_control_size_net_profile_openstack_dns: default
+    salt_control_size_cpu_openstack_telemetry: 8
+    salt_control_size_ram_openstack_telemetry: 32768
+    salt_control_size_disk_profile_openstack_telemetry: large
+    salt_control_size_net_profile_openstack_telemetry: default
+    salt_control_size_cpu_openstack_barbican: 4
+    salt_control_size_ram_openstack_barbican: 32768
+    salt_control_size_disk_profile_openstack_barbican: large
+    salt_control_size_net_profile_openstack_barbican: default
+    salt_control_size_cpu_openstack_baremetal: 32
+    salt_control_size_ram_openstack_baremetal: 65536
+    salt_control_size_disk_profile_openstack_baremetal: large
+    salt_control_size_net_profile_openstack_baremetal: default
   salt:
     control:
       size:
@@ -47,4 +67,29 @@
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+        openstack.share:
+          cpu: ${_param:salt_control_size_cpu_openstack_share}
+          ram: ${_param:salt_control_size_ram_openstack_share}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+        openstack.dns:
+          cpu: ${_param:salt_control_size_cpu_openstack_dns}
+          ram: ${_param:salt_control_size_ram_openstack_dns}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+        openstack.telemetry:
+          cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
+          ram: ${_param:salt_control_size_ram_openstack_telemetry}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+        openstack.barbican:
+          cpu: ${_param:salt_control_size_cpu_openstack_barbican}
+          ram: ${_param:salt_control_size_ram_openstack_barbican}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+        openstack.baremetal:
+          cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
+          ram: ${_param:salt_control_size_ram_openstack_baremetal}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
diff --git a/salt/control/sizes/openstack/medium.yml b/salt/control/sizes/openstack/medium.yml
index e436ca6..4ff4570 100644
--- a/salt/control/sizes/openstack/medium.yml
+++ b/salt/control/sizes/openstack/medium.yml
@@ -20,6 +20,26 @@
     salt_control_size_ram_openstack_upgrade: 16384
     salt_control_size_disk_profile_openstack_upgrade: medium
     salt_control_size_net_profile_openstack_upgrade: default
+    salt_control_size_cpu_openstack_share: 4
+    salt_control_size_ram_openstack_share: 4096
+    salt_control_size_disk_profile_openstack_share: large
+    salt_control_size_net_profile_openstack_share: default
+    salt_control_size_cpu_openstack_dns: 4
+    salt_control_size_ram_openstack_dns: 6144
+    salt_control_size_disk_profile_openstack_dns: small
+    salt_control_size_net_profile_openstack_dns: default
+    salt_control_size_cpu_openstack_telemetry: 8
+    salt_control_size_ram_openstack_telemetry: 16384
+    salt_control_size_disk_profile_openstack_telemetry: large
+    salt_control_size_net_profile_openstack_telemetry: default
+    salt_control_size_cpu_openstack_barbican: 4
+    salt_control_size_ram_openstack_barbican: 16384
+    salt_control_size_disk_profile_openstack_barbican: large
+    salt_control_size_net_profile_openstack_barbican: default
+    salt_control_size_cpu_openstack_baremetal: 16
+    salt_control_size_ram_openstack_baremetal: 16384
+    salt_control_size_disk_profile_openstack_baremetal: small
+    salt_control_size_net_profile_openstack_baremetal: default
   salt:
     control:
       size:
@@ -47,4 +67,29 @@
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+        openstack.share:
+          cpu: ${_param:salt_control_size_cpu_openstack_share}
+          ram: ${_param:salt_control_size_ram_openstack_share}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+        openstack.dns:
+          cpu: ${_param:salt_control_size_cpu_openstack_dns}
+          ram: ${_param:salt_control_size_ram_openstack_dns}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+        openstack.telemetry:
+          cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
+          ram: ${_param:salt_control_size_ram_openstack_telemetry}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+        openstack.barbican:
+          cpu: ${_param:salt_control_size_cpu_openstack_barbican}
+          ram: ${_param:salt_control_size_ram_openstack_barbican}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+        openstack.baremetal:
+          cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
+          ram: ${_param:salt_control_size_ram_openstack_baremetal}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
diff --git a/salt/control/sizes/openstack/minimal.yml b/salt/control/sizes/openstack/minimal.yml
index 9e41e75..e24a597 100644
--- a/salt/control/sizes/openstack/minimal.yml
+++ b/salt/control/sizes/openstack/minimal.yml
@@ -20,6 +20,26 @@
     salt_control_size_ram_openstack_upgrade: 16384
     salt_control_size_disk_profile_openstack_upgrade: medium
     salt_control_size_net_profile_openstack_upgrade: default
+    salt_control_size_cpu_openstack_share: 1
+    salt_control_size_ram_openstack_share: 2048
+    salt_control_size_disk_profile_openstack_share: large
+    salt_control_size_net_profile_openstack_share: default
+    salt_control_size_cpu_openstack_dns: 2
+    salt_control_size_ram_openstack_dns: 4096
+    salt_control_size_disk_profile_openstack_dns: small
+    salt_control_size_net_profile_openstack_dns: default
+    salt_control_size_cpu_openstack_telemetry: 4
+    salt_control_size_ram_openstack_telemetry: 6144
+    salt_control_size_disk_profile_openstack_telemetry: small
+    salt_control_size_net_profile_openstack_telemetry: default
+    salt_control_size_cpu_openstack_barbican: 4
+    salt_control_size_ram_openstack_barbican: 6144
+    salt_control_size_disk_profile_openstack_barbican: small
+    salt_control_size_net_profile_openstack_barbican: default
+    salt_control_size_cpu_openstack_baremetal: 4
+    salt_control_size_ram_openstack_baremetal: 4096
+    salt_control_size_disk_profile_openstack_baremetal: small
+    salt_control_size_net_profile_openstack_baremetal: default
   salt:
     control:
       size:
@@ -47,4 +67,29 @@
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+        openstack.share:
+          cpu: ${_param:salt_control_size_cpu_openstack_share}
+          ram: ${_param:salt_control_size_ram_openstack_share}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+        openstack.dns:
+          cpu: ${_param:salt_control_size_cpu_openstack_dns}
+          ram: ${_param:salt_control_size_ram_openstack_dns}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+        openstack.telemetry:
+          cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
+          ram: ${_param:salt_control_size_ram_openstack_telemetry}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+        openstack.barbican:
+          cpu: ${_param:salt_control_size_cpu_openstack_barbican}
+          ram: ${_param:salt_control_size_ram_openstack_barbican}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+        openstack.baremetal:
+          cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
+          ram: ${_param:salt_control_size_ram_openstack_baremetal}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
diff --git a/salt/control/sizes/openstack/small.yml b/salt/control/sizes/openstack/small.yml
index 3e8aeb6..32b2113 100644
--- a/salt/control/sizes/openstack/small.yml
+++ b/salt/control/sizes/openstack/small.yml
@@ -20,6 +20,26 @@
     salt_control_size_ram_openstack_upgrade: 16384
     salt_control_size_disk_profile_openstack_upgrade: medium
     salt_control_size_net_profile_openstack_upgrade: default
+    salt_control_size_cpu_openstack_share: 2
+    salt_control_size_ram_openstack_share: 2048
+    salt_control_size_disk_profile_openstack_share: large
+    salt_control_size_net_profile_openstack_share: default
+    salt_control_size_cpu_openstack_dns: 2
+    salt_control_size_ram_openstack_dns: 4096
+    salt_control_size_disk_profile_openstack_dns: small
+    salt_control_size_net_profile_openstack_dns: default
+    salt_control_size_cpu_openstack_telemetry: 4
+    salt_control_size_ram_openstack_telemetry: 8192
+    salt_control_size_disk_profile_openstack_telemetry: large
+    salt_control_size_net_profile_openstack_telemetry: default
+    salt_control_size_cpu_openstack_barbican: 4
+    salt_control_size_ram_openstack_barbican: 8192
+    salt_control_size_disk_profile_openstack_barbican: small
+    salt_control_size_net_profile_openstack_barbican: default
+    salt_control_size_cpu_openstack_baremetal: 8
+    salt_control_size_ram_openstack_baremetal: 8192
+    salt_control_size_disk_profile_openstack_baremetal: small
+    salt_control_size_net_profile_openstack_baremetal: default
   salt:
     control:
       size:
@@ -47,4 +67,29 @@
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+        openstack.share:
+          cpu: ${_param:salt_control_size_cpu_openstack_share}
+          ram: ${_param:salt_control_size_ram_openstack_share}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+        openstack.dns:
+          cpu: ${_param:salt_control_size_cpu_openstack_dns}
+          ram: ${_param:salt_control_size_ram_openstack_dns}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+        openstack.telemetry:
+          cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
+          ram: ${_param:salt_control_size_ram_openstack_telemetry}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+        openstack.barbican:
+          cpu: ${_param:salt_control_size_cpu_openstack_barbican}
+          ram: ${_param:salt_control_size_ram_openstack_barbican}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+        openstack.baremetal:
+          cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
+          ram: ${_param:salt_control_size_ram_openstack_baremetal}
+          disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
+          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
diff --git a/salt/minion/cert/barbican.yml b/salt/minion/cert/barbican.yml
index f499732..b53d07d 100644
--- a/salt/minion/cert/barbican.yml
+++ b/salt/minion/cert/barbican.yml
@@ -2,7 +2,7 @@
   _param:
     salt_minion_ca_host: kmn01.${_param:cluster_domain}
     salt_minion_ca_authority: salt_master_ca
-    barbican_cert_alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_vip_address},DNS:${linux:system:name},DNS:${linux:network:fqdn}
+    barbican_cert_alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_vip_address},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_vip_address}
   salt:
     minion:
         cert:
diff --git a/salt/minion/cert/octavia/amphora_client.yml b/salt/minion/cert/octavia/amphora_client.yml
index fd8f465..5a0309f 100644
--- a/salt/minion/cert/octavia/amphora_client.yml
+++ b/salt/minion/cert/octavia/amphora_client.yml
@@ -5,7 +5,7 @@
     minion:
       cert:
         octavia_amp_client:
-          ca_file: ${octavia:manager:certificates:ca_certificate}
+          ca_file: ${octavia:manager:haproxy_amphora:server_ca}
           ca_key_file: ${octavia:manager:certificates:ca_private_key}
           key_file: ${octavia:manager:haproxy_amphora:client_cert_key}
           cert_file: ${octavia:manager:haproxy_amphora:client_cert}
diff --git a/salt/minion/cert/openstack_api.yml b/salt/minion/cert/openstack_api.yml
index 1095f7e..03e8974 100644
--- a/salt/minion/cert/openstack_api.yml
+++ b/salt/minion/cert/openstack_api.yml
@@ -2,7 +2,7 @@
   _param:
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_minion_ca_authority: salt_master_ca
-    openstack_api_cert_alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_vip_address},DNS:${linux:system:name},DNS:${linux:network:fqdn}
+    openstack_api_cert_alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_vip_address},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_vip_address}
     openstack_api_cert_key_file: "/etc/ssl/private/openstack_api.key"
     openstack_api_cert_cert_file: "/etc/ssl/certs/openstack_api.crt"
     openstack_api_cert_all_file: "/etc/ssl/certs/openstack_api_with_chain.crt"