diff --git a/jenkins/client/job/oscore/cookiecutter.yml b/jenkins/client/job/oscore/cookiecutter.yml
index ca6e6f6..0ea2bba 100644
--- a/jenkins/client/job/oscore/cookiecutter.yml
+++ b/jenkins/client/job/oscore/cookiecutter.yml
@@ -75,7 +75,7 @@
               default: |-
                 #Extra context that will be merged with content of COOKIECUTTER_TEMPLATE_CONTEXT_FILE
                 default_context:
-                  openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,stacklight,k8s_team,mcp_qa"
+                  openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,drivetrain,stacklight,k8s_team,mcp_qa"
                   cookiecutter_template_url: https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates.git
                   cookiecutter_template_branch: 'master'
                   shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
diff --git a/jenkins/client/job/stacklight/cookiecutter.yml b/jenkins/client/job/stacklight/cookiecutter.yml
index 0f40403..15f0bb6 100644
--- a/jenkins/client/job/stacklight/cookiecutter.yml
+++ b/jenkins/client/job/stacklight/cookiecutter.yml
@@ -60,7 +60,7 @@
               default: |-
                 #Extra context that will be merged with content of COOKIECUTTER_TEMPLATE_CONTEXT_FILE
                 default_context:
-                  openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,stacklight,k8s_team"
+                  openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,stacklight,k8s_team,drivetrain"
                   cookiecutter_template_url: https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates.git
                   cookiecutter_template_branch: 'master'
                   shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 0d5bc95..f7b77db 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -21,6 +21,7 @@
     kubernetes_dashboard_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes
     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
 
     # component docker images
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
@@ -32,7 +33,7 @@
     kubernetes_pause_image: ${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.11.3-2
     kubernetes_contrail_cni_image: ${_param:kubernetes_contrail_cni_repo}/contrail-cni:v1.2.0
     kubernetes_contrail_network_controller_image: ${_param:kubernetes_contrail_network_controller_repo}/contrail-network-controller:v1.2.0
-    kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.4.0
+    kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.4.1
     kubernetes_criproxy_version: v0.12.0
     kubernetes_criproxy_checksum: md5=371cacd3d8568eb88425498b48a649dd
     kubernetes_netchecker_agent_image: ${_param:kubernetes_netchecker_agent_repo}/k8s-netchecker-agent:v1.2.2
@@ -41,20 +42,21 @@
     kubernetes_dnsmasq_image: ${_param:kubernetes_kubedns_repo}/k8s-dns-dnsmasq-amd64:1.14.5
     kubernetes_sidecar_image: ${_param:kubernetes_kubedns_repo}/k8s-dns-sidecar-amd64:1.14.5
     kubernetes_dns_autoscaler_image: ${_param:kubernetes_kubedns_repo}/cluster-proportional-autoscaler-amd64:1.0.0
-    kubernetes_externaldns_image: ${_param:kubernetes_externaldns_repo}/external-dns:v0.5.6-1
-    kubernetes_genie_source: ${_param:kubernetes_genie_repo}/genie_v1.0-138-gbf5dbaa
-    kubernetes_genie_source_hash: md5=b024052ed4ecb1d5354e0cc8f51afaca
+    kubernetes_externaldns_image: ${_param:kubernetes_externaldns_repo}/external-dns:v0.5.6-2
+    kubernetes_genie_source: ${_param:kubernetes_genie_repo}/genie_v1.0-165-gbe0268b
+    kubernetes_genie_source_hash: md5=20da66e80eaa453461cf269bf793f2aa
     kubernetes_flannel_image: ${_param:kubernetes_flannel_repo}/flannel:v0.10.0-amd64
     kubernetes_metallb_controller_image: ${_param:kubernetes_metallb_repo}/controller:v0.7.3-2
     kubernetes_metallb_speaker_image: ${_param:kubernetes_metallb_repo}/speaker:v0.7.3-2
-    kubernetes_sriov_source: ${_param:kubernetes_sriov_repo}/sriov_v0.3-8-g8b7ed98
-    kubernetes_sriov_source_hash: md5=c0cc33202afd02e4cc44b977a8faf6e7
-    kubernetes_cniplugins_source: ${_param:kubernetes_cniplugins_repo}/cni-plugins_v0.7.1-48-g696b1f9.tar.gz
-    kubernetes_cniplugins_source_hash: md5=5ec1cf5e989097c6127ea5365e277b02
+    kubernetes_sriov_source: ${_param:kubernetes_sriov_repo}/sriov_v0.3-9-g3b31f1a
+    kubernetes_sriov_source_hash: md5=cd9ea01e80d260218260314447c23b30
+    kubernetes_cniplugins_source: ${_param:kubernetes_cniplugins_repo}/containernetworking-plugins_v0.7.2-95-g1eec540.tar.gz
+    kubernetes_cniplugins_source_hash: md5=bd1cff74194d64538e00c3206f049d1e
     kubernetes_dashboard_image: ${_param:kubernetes_dashboard_repo}/kubernetes-dashboard-amd64:v1.10.0-4
     kubernetes_telegraf_image: ${_param:mcp_docker_registry}/openstack-docker/telegraf:2018.8.0
     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
 
     kubelet_fail_on_swap: true
     kubernetes_dashboard_enabled: true
@@ -130,6 +132,8 @@
         coredns:
           enabled: ${_param:kubernetes_coredns_enabled}
           image: ${_param:kubernetes_coredns_image}
+          etcd:
+            operator_image: ${_param:kubernetes_corends_etcd_operator_image}
         contrail_network_controller:
           enabled: ${_param:kubernetes_contrail_network_controller_enabled}
           image: ${_param:kubernetes_contrail_network_controller_image}
diff --git a/linux/system/repo/keystorage/mirantis_com/apt_mirantis.yml b/linux/system/repo/keystorage/mirantis_com/apt_mirantis.yml
new file mode 100644
index 0000000..26e3435
--- /dev/null
+++ b/linux/system/repo/keystorage/mirantis_com/apt_mirantis.yml
@@ -0,0 +1,57 @@
+parameters:
+  _param:
+    # pub   4096R/A76882D3 2015-06-17
+    # http://apt.mirantis.com/
+    linux_system_repo_apt_mirantis_key: |-
+        -----BEGIN PGP PUBLIC KEY BLOCK-----
+        Version: GnuPG v1
+
+        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
+        jtcwJrHue5Xn8UPSLkE=
+        =SWiA
+        -----END PGP PUBLIC KEY BLOCK-----
diff --git a/linux/system/repo/keystorage/mirantis_com/extra.yml b/linux/system/repo/keystorage/mirantis_com/extra.yml
deleted file mode 100644
index 88e7a27..0000000
--- a/linux/system/repo/keystorage/mirantis_com/extra.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-parameters:
-  linux:
-    system:
-      repo:
-        mcp_extra:
-          # pub   2048R/4C5289EF 2018-07-25
-          key: |
-            -----BEGIN PGP PUBLIC KEY BLOCK-----
-            Version: GnuPG v1
-
-            mQENBFtYVY8BCAC3oli93husG0ZVtv/L8I4/bcW60LFCyB0DuwEznGlSaj1fjOQu
-            C7QX9wvGRq8mRZ8mfZ6sbxGmgs0LnV5QIBle1l5I3B+AMGksf6UGEWgoN/vq86g+
-            0Jg6kJP/D0sjGXvdlfy+bgAqjsx2bWOLjQGtHSIxhe4cE9HPBfMiYsFwGQua3XN3
-            tiGKcifszvDA6uqdjS6DuTEPCzyKiSyUevnWtBh0oUtUt//X4lG2Mx0lU91uUQGj
-            KeZ+fYXOLqgZm/FxLVT5w3g/UGK9Cbz5h4kGCJOfk0EwIZp0IRRs1phOC6gVMwoV
-            yWKCtdHmg7Ob8I4AZ8OW5HJn1UPHTprxcHBnABEBAAG0LEF1dG9idWlsZGVyIDxp
-            bmZyYSthdXRpYnVpbGRlckBtaXJhbnRpcy5jb20+iQE4BBMBAgAiBQJbWFWPAhsD
-            BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCRZVp5TFKJ70cJB/9ArWrSFyEx
-            qs7Tyo9M5WCPjqw7y2F7jd4Et3hqwc5jx6KlxGpg17SHt4oWcmtML3VBx+ziBAi0
-            5Ry4Z4w0QqFW6gAqQepeW76Yq/OP5SoqEI9sUwzLfUY7raK/P1buvXB1eZh4mMw4
-            TFf4Hgo8yUQ3geYNnUBBfaSfkmiyBJGsMXBfW2zhlpVIyB6Cye5R823FxGNJe+li
-            hggNCQnKYqrGtr55RO6xYI1v89cgGrO2EVwPkFLA/MUnQEb433Ck+sjp1NZDUfuJ
-            U3gg8S0hT+Cf5XiknT/xqIhhTY/KzlNmynZt/51DzZzsbM+RO6JZFYJL2LuC69gB
-            +R5jrmaGu9fG
-            =sqIn
-            -----END PGP PUBLIC KEY BLOCK-----
diff --git a/linux/system/repo/keystorage/mirantis_com/init.yml b/linux/system/repo/keystorage/mirantis_com/init.yml
index 8a3c1de..ec902da 100644
--- a/linux/system/repo/keystorage/mirantis_com/init.yml
+++ b/linux/system/repo/keystorage/mirantis_com/init.yml
@@ -1,3 +1,3 @@
 classes:
-- system.linux.system.repo.keystorage.mirantis_com.openstack
-- system.linux.system.repo.keystorage.mirantis_com.extra
+- system.linux.system.repo.keystorage.mirantis_com.mirror_mirantis
+- system.linux.system.repo.keystorage.mirantis_com.apt_mirantis
diff --git a/linux/system/repo/keystorage/mirantis_com/openstack.yml b/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
similarity index 93%
rename from linux/system/repo/keystorage/mirantis_com/openstack.yml
rename to linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
index fd99220..9b08546 100644
--- a/linux/system/repo/keystorage/mirantis_com/openstack.yml
+++ b/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
@@ -1,7 +1,8 @@
 parameters:
   _param:
     # pub   2048R/4C5289EF 2018-07-25
-    linux_system_repo_mirantis_openstack_key: |-
+    # https://mirror.mirantis.com
+    linux_system_repo_mirror_mirantis_key: |-
         -----BEGIN PGP PUBLIC KEY BLOCK-----
         Version: GnuPG v1
 
diff --git a/linux/system/repo/mcp/apt_mirantis/ceph.yml b/linux/system/repo/mcp/apt_mirantis/ceph.yml
index 40c8d87..fe55b68 100644
--- a/linux/system/repo/mcp/apt_mirantis/ceph.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ceph.yml
@@ -1,3 +1,5 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
 parameters:
   _param:
     apt_mk_version: stable
@@ -9,7 +11,7 @@
         mcp_ceph:
           source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_ceph_version} ceph-${_param:linux_system_repo_mcp_ceph_codename}"
           architectures: amd64
-          key_url: "http://apt.mirantis.com/public.gpg"
+          key: ${_param:linux_system_repo_apt_mirantis_key}
           clean_file: true
           pin:
           - pin: 'release a=${_param:linux_system_repo_mcp_ceph_version}'
diff --git a/linux/system/repo/mcp/apt_mirantis/extra.yml b/linux/system/repo/mcp/apt_mirantis/extra.yml
index 12e8adc..5523f55 100644
--- a/linux/system/repo/mcp/apt_mirantis/extra.yml
+++ b/linux/system/repo/mcp/apt_mirantis/extra.yml
@@ -10,6 +10,7 @@
       repo:
         mcp_extra:
           source: "deb ${_param:linux_system_repo_mcp_extra_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:
diff --git a/linux/system/repo/mcp/apt_mirantis/openstack.yml b/linux/system/repo/mcp/apt_mirantis/openstack.yml
index 5d11e59..3f591e1 100644
--- a/linux/system/repo/mcp/apt_mirantis/openstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/openstack.yml
@@ -1,3 +1,5 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
 parameters:
   _param:
     apt_mk_version: stable
@@ -8,7 +10,7 @@
         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_url: "http://apt.mirantis.com/public.gpg"
+          key: ${_param:linux_system_repo_apt_mirantis_key}
           pin:
           - pin: 'release l=${_param:openstack_version}'
             priority: 1100
@@ -16,7 +18,7 @@
         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_url: "http://apt.mirantis.com/public.gpg"
+          key: ${_param:linux_system_repo_apt_mirantis_key}
           pin:
           - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
             priority: 1100
diff --git a/linux/system/repo/mcp/extra.yml b/linux/system/repo/mcp/extra.yml
index 7711fa0..d2a9a49 100644
--- a/linux/system/repo/mcp/extra.yml
+++ b/linux/system/repo/mcp/extra.yml
@@ -1,3 +1,5 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
 parameters:
   _param:
     apt_mk_version: stable
diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml
index 37482da..66a5530 100644
--- a/linux/system/repo/mcp/mirror/v1/openstack.yml
+++ b/linux/system/repo/mcp/mirror/v1/openstack.yml
@@ -10,6 +10,7 @@
       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:
diff --git a/linux/system/sudo.yml b/linux/system/sudo.yml
index 68f2b84..a6dbffb 100644
--- a/linux/system/sudo.yml
+++ b/linux/system/sudo.yml
@@ -108,4 +108,3 @@
     - /usr/bin/barbican*
     - /usr/bin/ceilometer*
     - /usr/bin/trove*
-    
diff --git a/nginx/server/proxy/openstack/glance.yml b/nginx/server/proxy/openstack/glance.yml
index 3479296..9cdd702 100644
--- a/nginx/server/proxy/openstack/glance.yml
+++ b/nginx/server/proxy/openstack/glance.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_glance_protocol: 'http'
     nginx_proxy_openstack_glance_host: ${_param:glance_service_host}
+    nginx_proxy_openstack_glance_image_size: '30000m'
     nginx_proxy_openstack_api_address: 0.0.0.0
   nginx:
     server:
@@ -18,7 +19,7 @@
             host: ${_param:nginx_proxy_openstack_glance_host}
             port: 9292
             protocol: ${_param:nginx_proxy_openstack_glance_protocol}
-            size: 30000m
+            size:  ${_param:nginx_proxy_openstack_glance_image_size}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 9292
diff --git a/openssh/server/team/k8s_team.yml b/openssh/server/team/k8s_team.yml
index 934afd6..918a16a 100644
--- a/openssh/server/team/k8s_team.yml
+++ b/openssh/server/team/k8s_team.yml
@@ -1,162 +1,20 @@
 classes:
 - system.openssh.server.team.members.ashestakov
+- system.openssh.server.team.members.vjigulin
+- system.openssh.server.team.members.skolekonov
+- system.openssh.server.team.members.pskamruk
+- system.openssh.server.team.members.ishvedunov
+- system.openssh.server.team.members.jnowak
+- system.openssh.server.team.members.loles
+# Deprecated users
+- system.openssh.server.team.members.deprecated.dshulyak
+- system.openssh.server.team.members.deprecated.mattymo
+- system.openssh.server.team.members.deprecated.mkwiek
+- system.openssh.server.team.members.deprecated.psiwczak
+- system.openssh.server.team.members.deprecated.sgolovatiuk
+- system.openssh.server.team.members.deprecated.slagun
+- system.openssh.server.team.members.deprecated.vefimova
+
 parameters:
   _param:
     linux_system_user_sudo: true
-  linux:
-    system:
-      user:
-        dshulyak:
-          enabled: true
-          name: dshulyak
-          sudo: true
-          full_name: Dmitry Shulyak
-          home: /home/dshulyak
-          email: dshulyak@mirantis.com
-        pskamruk:
-          enabled: true
-          sudo: true
-          name: pskamruk
-          full_name: Piotr Skamruk
-          home: /home/pskamruk
-          email: pskamruk@mirantis.com
-        ishvedunov:
-          enabled: true
-          sudo: true
-          name: ishvedunov
-          full_name: Ivan Shvedunov
-          home: /home/ishvedunov
-          email: ishvedunov@mirantis.com
-        jnowak:
-          enabled: true
-          sudo: true
-          name: jnowak
-          full_name: Jedrzej Nowak
-          home: /home/jnowak
-          email: jnowak@mirantis.com
-        vefimova:
-          enabled: true
-          sudo: true
-          name: vefimova
-          full_name: Victoria Efimova
-          home: /home/vefimova
-          email: vefimova@mirantis.com
-        sgolovatiuk:
-          enabled: true
-          sudo: true
-          name: sgolovatiuk
-          full_name: Sergii Golovatiuk
-          home: /home/sgolovatiuk
-          email: sgolovatiuk@mirantis.com
-        loles:
-          enabled: true
-          sudo: true
-          name: loles
-          full_name: Lukasz Oles
-          home: /home/loles
-          email: loles@mirantis.com
-        mkwiek:
-          enabled: true
-          sudo: true
-          name: mkwiek
-          full_name: Maciej Kwiek
-          home: /home/mkwiek
-          email: mkwiek@mirantis.com
-        mattymo:
-          enabled: true
-          sudo: true
-          name: mattymo
-          full_name: Matthew Mosesohn
-          home: /home/mattymo
-          email: mattymo@mirantis.com
-        slagun:
-          enabled: true
-          sudo: true
-          name: slagun
-          full_name: Stan Lagun
-          home: /home/slagun
-          email: slagun@mirantis.com
-        psiwczak:
-          enabled: true
-          sudo: true
-          name: psiwczak
-          full_name: Piotr Siwczak
-          home: /home/psiwczak
-          email: psiwczak@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        dshulyak:
-          enabled: true
-          public_keys:
-          - ${public_keys:dshulyak}
-          user: ${linux:system:user:dshulyak}
-        pskamruk:
-          enabled: true
-          public_keys:
-          - ${public_keys:pskamruk}
-          user: ${linux:system:user:pskamruk}
-        ishvedunov:
-          enabled: true
-          public_keys:
-          - ${public_keys:ishvedunov}
-          user: ${linux:system:user:ishvedunov}
-        jnowak:
-          enabled: true
-          public_keys:
-          - ${public_keys:jnowak}
-          user: ${linux:system:user:jnowak}
-        vefimova:
-          enabled: true
-          public_keys:
-          - ${public_keys:vefimova}
-          user: ${linux:system:user:vefimova}
-        sgolovatiuk:
-          enabled: true
-          public_keys:
-            - ${public_keys:sgolovatiuk}
-          user: ${linux:system:user:sgolovatiuk}
-        loles:
-          enabled: true
-          public_keys:
-          - ${public_keys:loles}
-          user: ${linux:system:user:loles}
-        mkwiek:
-          enabled: true
-          public_keys:
-          - ${public_keys:mkwiek}
-          user: ${linux:system:user:mkwiek}
-        slagun:
-          enabled: true
-          public_keys:
-          - ${public_keys:slagun}
-          user: ${linux:system:user:slagun}
-        mattymo:
-          enabled: true
-          public_keys:
-          - ${public_keys:mattymo}
-          user: ${linux:system:user:mattymo}
-  public_keys:
-    dshulyak:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCvkecSoZQDlJ3rfnxzYYkKVOwZG/oGVNYykey07pJXzcc4RDnP+OSPSD57Ovc3f9DgGpDqi5EaSTK9wPT3Z4Xlq/0IN9mJjSqkMKahlQutozNeathqghM3mkiBrqV8Y9H+L+5V743ttWMxp+oEpYMVz6QlP152mDwhRESEoU6dm1UjPDOPmiqIBrjkc0glqrBGkvj6Rd7cyVrbVG//mOoemT0S+l9KHjVzIDF3sd9m1MWCtslO0ixCrIXh90wRYTUVJLe4g95Bo3f3k2/DIeqyLns2zjYaYBc54+VMwPllbc4KTNQnW+oZLGmh7fJRouJvNRmL9JrmVFBZ79tMKpLKq55U9RxAbtkO4wPUQxVXQRairYT6XVOis7eOQzojSyT8+jW1HK1ftexITn1nZnAgivzJYg9YugE5brS1pchJeptGQJDQSNeoAGR5rRc0A4uJIc9EzUjURVpa13ZWWKeenhQ3sfRUrP4+rCe4c0yeZS03jk54bNf3hqD7EEGH96L1ojAXyoVV/TgGgFJC3a3T7qciOMIJpWJVyKBVEgU9mSgWUL0lzEp/IrtEObNQQKwTb7LBM6wrSJd/57ePlTzXzSAZEed+7QV0LW+SBD7rwQyKM93i1P+do+4dmGO0fGr9AhMp2J4gsaFuAtCYZXV/b2zmuGnYGhbq3vacLIJYqQ== ds@ds-X10SAE
-    pskamruk:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTsdLa6F59A7ggGr1kXT5Hsg0sKXRA2zw2DApFU/DinDZ95d82hY5r26HRoPvEebslXUtpYei1T1w6XKSV6x9U0y/4+Wmdxnl+SADWqFWH8k7CJv3kONK7GhTT4fMpwt88ZHiVUwoTf5CdzhzNL1vd6NWpjt9qIq0G/4n0Ds/5paUFLJ5OIm7ealekMCmiOCQac/FgZYcQAdXr0nalhZkQzV4OOf9cxxftGTTq4ppLEF0I7aswWadN60qdmM2muRMpiaFZweyIH8f8wlqcYYFgd8N1RQmBqKcP6i6ukJLuvzqGb0aeCcv0h9i6ijZzC8s7DTYATn6TpD2XN4E4Adup jell@Piotrs-MacBook-Pro.local
-    ishvedunov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpw4sk2sO6RxkgAa3yTLWrLhke7mRccOHQ9LQFnhCuYxF8q8W0/FOw9imEMC/GQjLMUn0a3qDDflGq/Ze76/wygZQr04fupyD94XIMw1QC80FS/LbdSDq2RYIpS46Gw9tTiWzUegHZuD1YCb7nqqpmAELm1DKZybA85+oOaZidFrIgWNf07bvu2LdH6zVM5EQHyXvuUlBL4WA4aW2kB6dyklln1SH+J+UyMDeU9m4ygHzeZ1tf9c+8d9uBzWxEZ9//e0pDYnuvViDK/rgyNvDqpdrAtikmk2tlKAJLsZYhkQc60PR58yH0e4UAH0P6Ga/JrvUR72sY/H7HsUzUnWRD
-    jnowak:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2W27dcnqDu+wHpxy0c69czDihhDirm3FgQm4CuNKuuYwS0iJtITj5C7TWD1oP3Ym9yKvLqI71kpREH9BNB3qPw1ypfs/BY8Rv7CJTPk4N+lwUGlfIWPJ+PhS3bQMdDjOfpy7lBaVpVl6WpfBXN9RkNvqX0MYU7173Nm2EsBZVZ3Lcz/sYnpZxuRhbe+XMmnnOXmPJIO579Gawfx/yGMemjv/M4KxUpEIfCEdVhsUc5NRhIaWbk80VFxPJ/k8i6WJVootN0wtHgS1pk5Li0G66Y4A+epdmsyCaMJ5REJRzp9IyV70Dev7eBAYLSo0PGG2cG3AnLUnkMvyp6/vaWXBj pigmej@lap
-    vefimova:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDr7JWFM1GAEtsTKF3UfYnZRJJzCGM/Bp0QUdTa0ZPvcG1Vn01utIJvd8/STYHhG4Ifvreo7J76lF3gZ63nndr5kcB+StrSx604Rx12aD1yjLRNuJqiWa9JOgGq7zJaDECN0PIdRDiRH9tepdmrCeq+hrqZzeJLPYo8xIaTXukcI5g5IueciWEU37lerV86X4qycJp7weLYocT7IttNTq8Gln3K8fLfjYDO4JqVX32SOT4d/Y/BpxEMVwEMgFp7lVc75SfwdVFiTvYLrEqexvcL89Cefg12O/kEMAvGQ+s5UZp+4uwKE6meLkkYXTdN91yYq2gZ3Qvf2l9z9UY+jefH vyatta@vyatta
-    sgolovatiuk:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDRO3Q3yFST6biBh9aMbDROK8dDsknJCRSD9at3Bpac0dDHRuaM+Bq+bTmf/BtgTn3oKnL/cCDEmQYWIUY8aja8FcEE28rte6E0bBBQHXXLW0GyaD23wGOE5L20Qp+l9p0mcO9LtdZ0KVNGX28lx0z+qhE71l/PzMWHN+YxxwoOTBsI+3ByOefKKJYQsDvhvW4tGyKNATinA1ZSJBPPrnrTjac6zeYZZFE1evgBjxWawFm5Pebe95irLKuMr4tBWHqf7frP4VqfXlIWuRvhMi1OQDLMJeodhtZPKvX2FRfRST8XXwX4c8tfl1w3TD5nkGapTxPdUI/0BdTfyxPlf0sW3MQQTycCILxHSWQCTvP/O7hcckCYXpY5THTXRjkSat0nYNcERiiIbM0uubUdH+Pe7KTQ73OOrE92yWc8bDpnNTSgcMI41/YdKvX+dZtPVMFu8yT7Q/9aBvmQY4BzBt5zjI7ZQyGaOY/SmalYj50tCMFMbk+7Ey1WEDbNSsTMq/YH7l7ywxpcN6un9WVpUYvVSFdNjuS96LSeMYZA4126HwxQwLGDJ7xFUoSjwlkxgWBta6hajJEsXg43azinpGfcQLrlsTD3s9IlRhTeiWysmmM/OllqHCwMTE6xJi7HIoHu2WIvZNW58XRKNHY4AN8frvAsN7L+17UZ+huNweaLzQ==
-    loles:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDdbj2Li0TXK+U4jnLlfuQO8eyPdPjuqCHbHSWRokEmXwcjZVdRC/yLvI9W0tGFwNtPrf2Cyc14YJmnnPDUxvHklWX7vaOdLuTVvDRrnMrXK0INTVvFmytgLVzONvbAnFnMsh1HlpbkGwIfc12N+ZxUVtFEiwtVtT1Uf/drzZXENhTM2q7+l2/u9SlKrFWQkX5udw3L+Gi84D2RWqXhFG/0O0x/edZ5DDvKvLvolhyk+yXoo4wv5DJM+fRKI7tZC1whyL3jpDA9pe5TOxbKDsa/sHXx+2XIRQgQ1Z0vcUkde4j1LFZd032ZPMY4s8O1N0nKWOqGi/in1sOCxE6ofM1xtD/HJUYe8tp5qlWD1U2eofBxwtvw/qLUPjh00rUjW3S+Bla40M6rOmOoQdVID8qLsSXH/s/eAMNxoOL+go07EtfxL5uOOZp+3c+1kxFvyMfeu25Pb/xa8CHkTUgIri8eG4D0aGrBf6S24lb0/lRmhg0yZ6Zdk8pdlhIHXIOTvgPCkEY2O1Y8rHoWy4UtJAxxRvw8ssWsPexsvtDlFae1l3k7lh3ls9osebpo7xnfUevk5Lar4vCsoWkz0X2uNXxoiDHsINn1gUI17u2wH2nG7fvf6P/NvISIUKGN3vD0fLgjeQWYsXPX6x3bgO7DhJmibvVzhcAnq5Eb8qb5H3W5gQ== salmon@lmo
-    mkwiek:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDd/y9KPuy12K3hY+JE51rRm9Tbyl3FM2FK6+mi6Nbop/G03mDVSR8pbmsk+PiQwGRySMQtjVaLk3LoIkgn8MTNw9+Z1AqOdlBN7XJgaZ3PWvix3M4fV56uGzgjFtOTcWH9UfXPmGGKkqpwAfBEK1YK3lrW8dYWcnJcTH1juKCRsvbkWaxt1bzdTdkzH6LT3Bjr9S1imF4GpzXDecPve7eGmqxKjtq3jOupOrTb80BLo4AYBjrn1zdIWpEm0sBSz0acWlfhDd7+6eCaq5rSLAbWRHmBu+4shefh9oSyh/tLfGW68ILCNtpJWYKiKAWfFP5u1UqJyOLqzF0L9J9+fo5 mkwiek@mirantis.com
-    mattymo:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0IKYIbf05K67En++os8mfi2XYTCHp5ex+KBy4Y7NqAXC3J+hnqgcMry9sHtqVJ+O6do7bCRY7sjgnWosm6TxEupxMCs+euViT3VFvQlszAvj4v/xrAu0IwUUiqA0Pn9TKCJrHtYKYixkGfNw8IdxShH2FRTh52ufBqlLP5qRhdMP/nOohbNwtk0FAX49UB4AXzcLLkHu+P3gjTkR345CH+iciBGL88rp8qpEEA6QdtEjcgk1tGY3uktJ1tTWBv4ozth6EF9A+kG4yd1Fhwv2JVPRNkcL/xKR7f4i67A9KyyNoFLv4rHfXXPOjyproNpz5CZ06V7lJ4jgU/AbyHhLgw== mmosesohn@mattymo1
-    slagun:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfQtpitSDDfwP1TruBs7Nlim1B2PC8NKu1lOifZGOgGaL4G6CTXJunSoU48ovg0AOks6OPb7DSU9ocLTj6q0qNuPvy4yrsKWS+ZsrywLW5qp3OGfE7wmAWj5AGxNUiUaLAFKhriVV541v57OVw322dDuxQ3YE0P5dkKKBc9Xy3Su7PoDkR029fbQFvSlIsUtrICNGKvMtrTIm8V0EQHZnV7Y44+MMJMRxCMrulHJFmtaKE5uPaRz+eVVsbEOl1jfUA/BQ1WyU52Ol3gvm34kwBStQcnqhKC2CP/5ILVhf+Omylw+mcs58vKbc0Tw6dwFEDaTQlkYHLFZij+Y24HGyr slagun@MacLagun2.local
-    psiwczak:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFSHwjVOBC3nVVytH3DAaWEcfrca/cnurIn9K2elf8wn2PSet7q1OddfVTAtYdiG8pai9BX3uHswEu+TinAfgPoEnvKR4wSgk4hVf/W9eCf7xOn1X0fdSnfogQEjdP54Qk+mOmrh1vChcOL/NdBNNxJC6LGHRslVfcGu5ULaasT7EGzItMjUl8hKbbsM8tFX1IW7uRm3fZu4/HiMMaMnm+cPwH9LUB+cOaLEain5WNo0j0OKtpF6Kp53fpqCS6v4z/+wMgx0V2BMMrSla6cq4mL7iLvtufkO467j2ksa9sG8/ADD6Wh89hxkKGqF3yDm+olywNEo+WwTRfZf6Py5Uv
diff --git a/openssh/server/team/members/deprecated/dshulyak.yml b/openssh/server/team/members/deprecated/dshulyak.yml
new file mode 100644
index 0000000..dfc3450
--- /dev/null
+++ b/openssh/server/team/members/deprecated/dshulyak.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        dshulyak:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/dshulyak
+          name: dshulyak
+  openssh:
+    server:
+      user:
+        dshulyak:
+          enabled: false
+          user: ${linux:system:user:dshulyak}
diff --git a/openssh/server/team/members/deprecated/mattymo.yml b/openssh/server/team/members/deprecated/mattymo.yml
new file mode 100644
index 0000000..ad3f833
--- /dev/null
+++ b/openssh/server/team/members/deprecated/mattymo.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mattymo:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/mattymo
+          name: mattymo
+  openssh:
+    server:
+      user:
+        mattymo:
+          enabled: false
+          user: ${linux:system:user:mattymo}
diff --git a/openssh/server/team/members/deprecated/mkwiek.yml b/openssh/server/team/members/deprecated/mkwiek.yml
new file mode 100644
index 0000000..590cc38
--- /dev/null
+++ b/openssh/server/team/members/deprecated/mkwiek.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mkwiek:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/mkwiek
+          name: mkwiek
+  openssh:
+    server:
+      user:
+        mkwiek:
+          enabled: false
+          user: ${linux:system:user:mkwiek}
diff --git a/openssh/server/team/members/deprecated/psiwczak.yml b/openssh/server/team/members/deprecated/psiwczak.yml
new file mode 100644
index 0000000..2d8169b
--- /dev/null
+++ b/openssh/server/team/members/deprecated/psiwczak.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        psiwczak:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/psiwczak
+          name: psiwczak
+  openssh:
+    server:
+      user:
+        psiwczak:
+          enabled: false
+          user: ${linux:system:user:psiwczak}
diff --git a/openssh/server/team/members/deprecated/sgolovatiuk.yml b/openssh/server/team/members/deprecated/sgolovatiuk.yml
new file mode 100644
index 0000000..dfea022
--- /dev/null
+++ b/openssh/server/team/members/deprecated/sgolovatiuk.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        sgolovatiuk:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/sgolovatiuk
+          name: sgolovatiuk
+  openssh:
+    server:
+      user:
+        sgolovatiuk:
+          enabled: false
+          user: ${linux:system:user:sgolovatiuk}
diff --git a/openssh/server/team/members/deprecated/slagun.yml b/openssh/server/team/members/deprecated/slagun.yml
new file mode 100644
index 0000000..a1d5360
--- /dev/null
+++ b/openssh/server/team/members/deprecated/slagun.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        slagun:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/slagun
+          name: slagun
+  openssh:
+    server:
+      user:
+        slagun:
+          enabled: false
+          user: ${linux:system:user:slagun}
diff --git a/openssh/server/team/members/deprecated/vefimova.yml b/openssh/server/team/members/deprecated/vefimova.yml
new file mode 100644
index 0000000..6e2117f
--- /dev/null
+++ b/openssh/server/team/members/deprecated/vefimova.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        vefimova:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/vefimova
+          name: vefimova
+  openssh:
+    server:
+      user:
+        vefimova:
+          enabled: false
+          user: ${linux:system:user:vefimova}
diff --git a/openssh/server/team/members/ishvedunov.yml b/openssh/server/team/members/ishvedunov.yml
new file mode 100644
index 0000000..c424384
--- /dev/null
+++ b/openssh/server/team/members/ishvedunov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        ishvedunov:
+          enabled: true
+          name: ishvedunov
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Ivan Shvedunov
+          home: /home/ishvedunov
+          email: ishvedunov@mirantis.com
+  openssh:
+    server:
+      user:
+        ishvedunov:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpw4sk2sO6RxkgAa3yTLWrLhke7mRccOHQ9LQFnhCuYxF8q8W0/FOw9imEMC/GQjLMUn0a3qDDflGq/Ze76/wygZQr04fupyD94XIMw1QC80FS/LbdSDq2RYIpS46Gw9tTiWzUegHZuD1YCb7nqqpmAELm1DKZybA85+oOaZidFrIgWNf07bvu2LdH6zVM5EQHyXvuUlBL4WA4aW2kB6dyklln1SH+J+UyMDeU9m4ygHzeZ1tf9c+8d9uBzWxEZ9//e0pDYnuvViDK/rgyNvDqpdrAtikmk2tlKAJLsZYhkQc60PR58yH0e4UAH0P6Ga/JrvUR72sY/H7HsUzUnWRD
+          user: ${linux:system:user:ishvedunov}
diff --git a/openssh/server/team/members/jnowak.yml b/openssh/server/team/members/jnowak.yml
new file mode 100644
index 0000000..8ffb3e2
--- /dev/null
+++ b/openssh/server/team/members/jnowak.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        jnowak:
+          enabled: true
+          name: jnowak
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Jedrzej Nowak
+          home: /home/jnowak
+          email: jnowak@mirantis.com
+  openssh:
+    server:
+      user:
+        jnowak:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2W27dcnqDu+wHpxy0c69czDihhDirm3FgQm4CuNKuuYwS0iJtITj5C7TWD1oP3Ym9yKvLqI71kpREH9BNB3qPw1ypfs/BY8Rv7CJTPk4N+lwUGlfIWPJ+PhS3bQMdDjOfpy7lBaVpVl6WpfBXN9RkNvqX0MYU7173Nm2EsBZVZ3Lcz/sYnpZxuRhbe+XMmnnOXmPJIO579Gawfx/yGMemjv/M4KxUpEIfCEdVhsUc5NRhIaWbk80VFxPJ/k8i6WJVootN0wtHgS1pk5Li0G66Y4A+epdmsyCaMJ5REJRzp9IyV70Dev7eBAYLSo0PGG2cG3AnLUnkMvyp6/vaWXBj pigmej@lap
+          user: ${linux:system:user:jnowak}
diff --git a/openssh/server/team/members/loles.yml b/openssh/server/team/members/loles.yml
new file mode 100644
index 0000000..4a88d2f
--- /dev/null
+++ b/openssh/server/team/members/loles.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        loles:
+          enabled: true
+          name: loles
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Lukasz Oles
+          home: /home/loles
+          email: loles@mirantis.com
+  openssh:
+    server:
+      user:
+        loles:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDdbj2Li0TXK+U4jnLlfuQO8eyPdPjuqCHbHSWRokEmXwcjZVdRC/yLvI9W0tGFwNtPrf2Cyc14YJmnnPDUxvHklWX7vaOdLuTVvDRrnMrXK0INTVvFmytgLVzONvbAnFnMsh1HlpbkGwIfc12N+ZxUVtFEiwtVtT1Uf/drzZXENhTM2q7+l2/u9SlKrFWQkX5udw3L+Gi84D2RWqXhFG/0O0x/edZ5DDvKvLvolhyk+yXoo4wv5DJM+fRKI7tZC1whyL3jpDA9pe5TOxbKDsa/sHXx+2XIRQgQ1Z0vcUkde4j1LFZd032ZPMY4s8O1N0nKWOqGi/in1sOCxE6ofM1xtD/HJUYe8tp5qlWD1U2eofBxwtvw/qLUPjh00rUjW3S+Bla40M6rOmOoQdVID8qLsSXH/s/eAMNxoOL+go07EtfxL5uOOZp+3c+1kxFvyMfeu25Pb/xa8CHkTUgIri8eG4D0aGrBf6S24lb0/lRmhg0yZ6Zdk8pdlhIHXIOTvgPCkEY2O1Y8rHoWy4UtJAxxRvw8ssWsPexsvtDlFae1l3k7lh3ls9osebpo7xnfUevk5Lar4vCsoWkz0X2uNXxoiDHsINn1gUI17u2wH2nG7fvf6P/NvISIUKGN3vD0fLgjeQWYsXPX6x3bgO7DhJmibvVzhcAnq5Eb8qb5H3W5gQ== salmon@lmo
+          user: ${linux:system:user:loles}
diff --git a/openssh/server/team/members/pskamruk.yml b/openssh/server/team/members/pskamruk.yml
new file mode 100644
index 0000000..b0d4ead
--- /dev/null
+++ b/openssh/server/team/members/pskamruk.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        pskamruk:
+          enabled: true
+          name: pskamruk
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Piotr Skamruk
+          home: /home/pskamruk
+          email: pskamruk@mirantis.com
+  openssh:
+    server:
+      user:
+        pskamruk:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTsdLa6F59A7ggGr1kXT5Hsg0sKXRA2zw2DApFU/DinDZ95d82hY5r26HRoPvEebslXUtpYei1T1w6XKSV6x9U0y/4+Wmdxnl+SADWqFWH8k7CJv3kONK7GhTT4fMpwt88ZHiVUwoTf5CdzhzNL1vd6NWpjt9qIq0G/4n0Ds/5paUFLJ5OIm7ealekMCmiOCQac/FgZYcQAdXr0nalhZkQzV4OOf9cxxftGTTq4ppLEF0I7aswWadN60qdmM2muRMpiaFZweyIH8f8wlqcYYFgd8N1RQmBqKcP6i6ukJLuvzqGb0aeCcv0h9i6ijZzC8s7DTYATn6TpD2XN4E4Adup jell@Piotrs-MacBook-Pro.local
+          user: ${linux:system:user:pskamruk}
diff --git a/openssh/server/team/members/skolekonov.yml b/openssh/server/team/members/skolekonov.yml
new file mode 100644
index 0000000..340066f
--- /dev/null
+++ b/openssh/server/team/members/skolekonov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        skolekonov:
+          enabled: true
+          name: skolekonov
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Sergey Kolekonov
+          home: /home/skolekonov
+          email: skolekonov@mirantis.com
+  openssh:
+    server:
+      user:
+        skolekonov:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOzI36GW/vcXNEadnlGgzU5GEY5oKyqAWq13lEYemvrR1wpB+v3XN8QTFyPsUICjVhtMSj+U34pQG/e1PcuZ/kZLzzz1Ct97iK0q+faOksG1ydbSRq6aJNhfVQhEf8hKyuBT3EB55CHf2zbsROn7SvbxA3zw0IvIbONDYhj6jZaq2i0nkiL4YuOChCAYo4YT9UHEnPRK1o5aE9esxxire7WnxtPi7lTsFSRNpww1/zCtJPPsVIxbrLih+0zMdtdUiqO7DoEoXUKkuhdlsyF2fe81yAsok7thr6nanYSkfZbWa0ZXJf0mVjtdlYVNJDjbKMuh9lVzknNMbjjhx+lbC7 skolekonov@skolekonov.local
+          user: ${linux:system:user:skolekonov}