diff --git a/docker/swarm/stack/artifactory.yml b/docker/swarm/stack/artifactory.yml
index caab0ee..2dd9f15 100644
--- a/docker/swarm/stack/artifactory.yml
+++ b/docker/swarm/stack/artifactory.yml
@@ -21,4 +21,4 @@
                 - /srv/volumes/artifactory/backup:/var/opt/jfrog/artifactory/backup
                 - /srv/volumes/artifactory/etc:/var/opt/jfrog/artifactory/etc
                 - /srv/volumes/artifactory/logs:/var/opt/jfrog/artifactory/logs
-                - /srv/volumes/artifactory/keys:/var/opt/jfrog/artifactory/access/etc/keys
+                - /srv/volumes/artifactory/access:/var/opt/jfrog/artifactory/access
diff --git a/jenkins/client/job/deploy/lab/demo.yml b/jenkins/client/job/deploy/lab/demo.yml
deleted file mode 100644
index 3af2d7c..0000000
--- a/jenkins/client/job/deploy/lab/demo.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-parameters:
-  jenkins:
-    client:
-      job:
-        deploy_kafka_demo:
-          type: workflow-scm
-          concurrent: false
-          discard:
-            build:
-              keep_num: 10
-          display_name: "Kafka demo"
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: kafka-demo.groovy
-          param:
-              # salt master
-              SALT_MASTER_CREDENTIALS:
-                type: string
-                default: "salt-qa-credentials"
-              SALT_URL:
-                type: string
diff --git a/jenkins/client/job/deploy/lab/init.yml b/jenkins/client/job/deploy/lab/init.yml
index 4953d19..2b0bd60 100644
--- a/jenkins/client/job/deploy/lab/init.yml
+++ b/jenkins/client/job/deploy/lab/init.yml
@@ -1,6 +1,5 @@
 classes:
   - system.jenkins.client.job.deploy.lab.cicd
-  - system.jenkins.client.job.deploy.lab.demo
   - system.jenkins.client.job.deploy.lab.cleanup
   - system.jenkins.client.job.deploy.lab.release.mcp05
   - system.jenkins.client.job.deploy.lab.release.mcp10
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index 35a2912..9dc404b 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -2,7 +2,6 @@
   - system.jenkins.client.job.deploy.update.package
   - system.jenkins.client.job.deploy.update.config
   - system.jenkins.client.job.deploy.update.saltenv
-  - system.jenkins.client.job.deploy.update.update_salt_environment
   - system.jenkins.client.job.deploy.update.update_mirror_image
   - system.jenkins.client.job.deploy.update.upgrade
   - system.jenkins.client.job.deploy.update.upgrade_compute
diff --git a/jenkins/client/job/deploy/update/update_salt_environment.yml b/jenkins/client/job/deploy/update/update_salt_environment.yml
deleted file mode 100644
index dcc58d7..0000000
--- a/jenkins/client/job/deploy/update/update_salt_environment.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Jobs to update Salt master environment (formulas and models)
-#
-parameters:
-  _param:
-    jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
-  jenkins:
-    client:
-      job:
-        deploy-update-salt-environment:
-          type: workflow-scm
-          concurrent: true
-          discard:
-            build:
-              keep_num: 10
-            artifact:
-              keep_num: 10
-          display_name: "Deploy - update Salt environment"
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            branch: "${_param:jenkins_pipelines_branch}"
-            credentials: "gerrit"
-            script: update-salt-environment.groovy
-          param:
-            SALT_MASTER_URL:
-              type: string
-              default: "${_param:jenkins_salt_api_url}"
-            SALT_MASTER_CREDENTIALS:
-              type: string
-              default: "salt"
-            UPDATE_FORMULAS:
-              type: boolean
-              default: 'true'
\ No newline at end of file
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index f21c6f8..0d5bc95 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -20,6 +20,7 @@
     kubernetes_cniplugins_repo: https://docker-prod-local.artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/kubernetes/containernetworking-plugins
     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
 
     # component docker images
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
@@ -27,8 +28,8 @@
     kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v3.1.3
     kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v3.1.3
     kubernetes_calico_kube_controllers_image: ${_param:kubernetes_calico_kube_ctl_repo}/kube-controllers:v3.1.3
-    kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.11.2-1
-    kubernetes_pause_image: ${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.11.2-1
+    kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.11.3-2
+    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
@@ -53,6 +54,7 @@
     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
 
     kubelet_fail_on_swap: true
     kubernetes_dashboard_enabled: true
@@ -70,6 +72,9 @@
     kubernetes_metallb_enabled: false
     kubernetes_sriov_enabled: false
     kubernetes_telegraf_enabled: false
+    kubernetes_ingressnginx_enabled: false
+
+    kubernetes_ingressnginx_controller_replicas: 1
 
     # telegraf stuff
     kubernetes_telegraf_namespace: stacklight
@@ -162,6 +167,10 @@
           enabled: ${_param:kubernetes_metallb_enabled}
           controller_image: ${_param:kubernetes_metallb_controller_image}
           speaker_image: ${_param:kubernetes_metallb_speaker_image}
+        ingress-nginx:
+          enabled: ${_param:kubernetes_ingressnginx_enabled}
+          controller_image: ${_param:kubernetes_ingressnginx_controller_image}
+          controller_replicas: ${_param:kubernetes_ingressnginx_controller_replicas}
     pool:
       enabled: false
       kubelet:
diff --git a/openssh/server/team/all.yml b/openssh/server/team/all.yml
index 5daf27d..ce5270b 100644
--- a/openssh/server/team/all.yml
+++ b/openssh/server/team/all.yml
@@ -15,8 +15,3 @@
 - system.openssh.server.team.oscore_devops
 - system.openssh.server.team.k8s_team
 - system.openssh.server.team.k8s_apps_team
-# to include support team, please integrate submodule opscare into cluster model
-# https://gerrit.mirantis.com/#/admin/projects/mmo-support/reclass-opscare
-parameters:
-  _param:
-    linux_system_user_sudo: true
diff --git a/openssh/server/team/cicd.yml b/openssh/server/team/cicd.yml
index 99f6bd6..c839a22 100644
--- a/openssh/server/team/cicd.yml
+++ b/openssh/server/team/cicd.yml
@@ -1,16 +1,15 @@
 classes:
-- system.openssh.server.team.members.akomarek
+- system.openssh.server.team.members.deprecated.akomarek
 - system.openssh.server.team.members.atengler
-- system.openssh.server.team.members.fpytloun
-- system.openssh.server.team.members.jbroulik
+- system.openssh.server.team.members.deprecated.fpytloun
+- system.openssh.server.team.members.deprecated.jbroulik
 - system.openssh.server.team.members.jcach
-- system.openssh.server.team.members.jjosef
-- system.openssh.server.team.members.jpavlik
+- system.openssh.server.team.members.deprecated.jjosef
+- system.openssh.server.team.members.deprecated.jpavlik
 - system.openssh.server.team.members.mpolreich
-- system.openssh.server.team.members.rfelkl
-- system.openssh.server.team.members.tkukral
+- system.openssh.server.team.members.deprecated.rfelkl
+- system.openssh.server.team.members.deprecated.tkukral
 - system.openssh.server.team.members.psvimbersky
-
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/members/akomarek.yml b/openssh/server/team/members/akomarek.yml
deleted file mode 100644
index 1fc9f49..0000000
--- a/openssh/server/team/members/akomarek.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        newt:
-          enabled: false
-          name: newt
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/newt
-          email: mail@newt.cz
-  openssh:
-    server:
-      enabled: true
-      user:
-        newt:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3odU+3V2uDA2ptAFL9hrJRPNEEdAyztWOZFQ5Oyd9oerTGOU3p4xmrgWWjfKFKbYGhiiIUcYAol5PkTfKukGEkkjCHYA1t023soCaaAj85wCZCnw2zQNAziwxTYmAzTqgxiSvtZNMMrtJvFHRIRDzJ3M1lV0prWNWkMM1/3FAd4W49y6VT3fkMCo8uqG7CfGdgR2DgBCxf9KaNPfW5eDEPOgmE5lK8tVSEI6T+Cg7hbcTf4lFYnlFBnlQgp/0JstsM4Vbwb4B34LOpOsf2S8rrWk2xQMjwaMHXkc2s/E8iW3F5nVFuyEXYISFQIiAHw8dzC6CHgLcyHUVWwznKawZ newt@newt-dev1
-          user: ${linux:system:user:newt}
diff --git a/openssh/server/team/members/anatoliineliubin.yml b/openssh/server/team/members/anatoliineliubin.yml
index a8b1f21..9d21eb3 100644
--- a/openssh/server/team/members/anatoliineliubin.yml
+++ b/openssh/server/team/members/anatoliineliubin.yml
@@ -19,5 +19,4 @@
           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
-
+      - 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/apetrenko.yml b/openssh/server/team/members/apetrenko.yml
deleted file mode 100644
index 22ee651..0000000
--- a/openssh/server/team/members/apetrenko.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        apetrenko:
-          enabled: false
-          name: apetrenko
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disable
-          home: /home/apetrenko
-          email: apetrenko@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        apetrenko:
-          enabled: false
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDU7eLohJKXXB57H/buBlUcBTQXgsXmGXxMao0PQthdfDWhFKXc9fI+1rdsNjA8NPmq8gYdqldOgoIFAmBSwK/+z12ihIGmQJY8vRhr5jnsxee8VZczEj1bhYq/72mpN2KMxiL7Sv2l+WknviqitLzLgYZr17nJtqRdbhiqhEVQOZWKIngRZb4HIdRyA8qCpCFFbUN1etgsVuQaPMwcPdHKHHUzf2hBaELDBF+liVAJzwYlxBQ7m183K6zZ7Gs+wMKphVA5PjyPQbpA3ascF3fdottsat9QJOjrQsXlu+gekPy+fK8GkzDCrCWVcg5LHO+hj3ZnFIjEPxcPPEFo/NRF apl@MMO.mirantis.com
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC9cTDTzDVzIhZi/2F4tdEEIqewAOr8YY55Hk+zhuNZSZeI47eKVBvn09p0uiBLQIjrtO3TNh/93Bd+ts/wqwyembXdx5/hW+WdbpneRr8dRI03VEkLomHQqSsXMkr+VvegMc7i+266i5yDC1u4awX5+pR9WWzqaJrybNItmVucRGLGucx7qownV+Kp+8xXIG3lgT2fJw0qbv6hTbdvl7uw1JJ7bKhVxdeyeiv9blWLdQ7oCzQbjrQq8wlJvUfzNOGURMaFRQO4MHvecsBO99EgAaSqRmsDSLGQ/90RMH72BfP8YU/zSRwZNZDDq091oRhowgB1zfy1VgKm0/At1sswcsmfH+H/aC/RBB3NmG5GZq5uqRvgjlC4dz0GXalcJLN/NqQYywQ5WlOp518C5m2Is6t8mNvZh+is2GrmvCX97Y1gvzn65lUdfCP+Ee397mBi8XP5QZ4ojZ+SDt9efgpFUbmhbei2mNF9hpt2fhvLCv3HCayG9M/1QA9m3WdKo3gZKTBbMfKxU5mlTWsSLOt/44zMxdBLFq5gyhof7GxZiMeEllMF9v1cX0MCFlqbRSxfpqJv/0qsU3w9xRwDjWnm51uVeo69apRTlSNOyuXOsLyxzBS3n5cvlJ8L6r1cikmd0sx9LlrNw1ENxELDDIxj77BTcXNQVLfOfrEnSDIt+Q== apetrenko@mirantis.com
-          user: ${linux:system:user:apetrenko}
diff --git a/openssh/server/team/members/ashishkin.yml b/openssh/server/team/members/ashishkin.yml
deleted file mode 100644
index 4659ff5..0000000
--- a/openssh/server/team/members/ashishkin.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        ashishkin:
-          enabled: false
-          name: ashishkin
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/ashishkin
-          email: ashishkin@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        ashishkin:
-          enabled: false
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWlGbkhGN+DPrs3S/szWdwieH3Zu/E5bXnm8OCNSSS/xHbeSimqCIoAlZny58GYYabvsOmwh6qjiFmLmZq0MIlEc1RjMR95XLBWmhtpvYABRzMnUZUoFQ+cq1Lzo3ina4mLZAs2u27eEFmLLtV3sCcRAiDUnc6VoUne55NwjP4Ns+OL0Yin46Fr6SFxh6NUwi6woH58DWm1bfaisRyHzCBQJNmI3k0XKB9L9inpPMdmjzbdbitlrokHhDHE+ospLjZMBcV+8h1pK0yq/klT04ClJ58KXJeWJq2dz4nNyyVFNE2+DKwk18YUmtKLz/+BZxiaYY4Z5o6tXIttjfzf6Bn ashishkin@m83.local
-          user: ${linux:system:user:ashishkin}
diff --git a/openssh/server/team/members/astupnikov.yml b/openssh/server/team/members/astupnikov.yml
deleted file mode 100644
index 41b8e34..0000000
--- a/openssh/server/team/members/astupnikov.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        astupnikov:
-          enabled: false
-          name: astupnikov
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/astupnikov
-          email: astupnikov@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        astupnikov:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDrV6q403BYodTCb8BCsWlkW6AHxvtCH5JxI9gUANsvbQd9n8fd16xqgXVecCRBJOS4PVauLNiQPMaj6ZuFeRZ8ZXvX498eNSNa5WhBbSwk0X/DqdK1LN/MStTAtL60JQV0yQSY+BghVJkREw4MJJBksyP0X+OG5AB+ijh/bjsabYr+EQNK+WJblrsRvNNCbjiWPcjzXVMxUrzphB09CYMwWFgx1An5jS7c1EGvXrzf0aK1KkadhGnXcjPACFaMGPYmu5HNgQcRnzNXDQU6PLGeyqNnZYZjHdQWZR88cQywznqzI8y9P4qSOTVStYoKLlYsdQFRTw8sJrRpPZupgSED astupnikov@astupnikov-srv
-          user: ${linux:system:user:astupnikov}
diff --git a/openssh/server/team/members/atarasov.yml b/openssh/server/team/members/atarasov.yml
deleted file mode 100644
index 5c50be8..0000000
--- a/openssh/server/team/members/atarasov.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        atarasov:
-          enabled: false
-          name: atarasov
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/atarasov
-          email: atarasov@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        atarasov:
-          enabled: false
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSY2GXoKjTudh4iB8rXj6LP5nARndPoh4WeRYxcz57BdT9Xl9gN4E7wGn81kXoJOue5mYUNhjAvUCzKHOB2I6m/zSp5Fv6YDn6oeuD50vKhA6DkMllTVDX+UAegNRVNRRaTCeiqFlqym+2WbxaPjpuWvxuMcR9aZU5MT8H+UMWKbFpuvS83c/nD9QMC0s80bfz9e8OV/ysHsAvXmgQrkl3T0aKpV6IGU597li9k2z2DO9vLxd61rEsYsedPXpUGVn9l3NGW3Ix7dIOQPDFc/rOHVpwLu8V/Lq9zeo8g/12/50RewQ5TIOA3NPeO0D4FUUfj+yBvSjTDj4v6oTY+dyn tonyco@Tonys-MBP
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDI9aXXUufNBbexFsXVPSoaZ8S1gX9gdMGFZUNz9yGdkO5AtGp8A925UCYXZyENB1ZOO7GRFrfeWG2HZEGkcAANw/mWewdNZ1ESnLHSJa/VLtkhOp50647QdaSS5N9jvWbfJOepF6qxfuOpcSZjMj06cfFTXkv65A8jFq4iU/HV6V31csYl00WRF6aFX5u1sgpg4QzklvM4gJykNn8cw2Igi7UhjIvo74HG0UlVFt6qc4yahD2YURn8ZF8A62KVwZ26HbFejzD0S48DivldFGF4AH+tY81CCOrCfJSPs1nemoORwp9J20AnjZ7tGZR5KA9+Op+klvaJxsP4K/y1rBUH tonyco@atarasov-pc
-          user: ${linux:system:user:atarasov}
diff --git a/openssh/server/team/members/cade.yml b/openssh/server/team/members/cade.yml
deleted file mode 100644
index 692f07c..0000000
--- a/openssh/server/team/members/cade.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        cade:
-          enabled: false
-          name: cade
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/cade
-          email: cade@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        cade:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDpSYtgC/lSMXCfjjxSWFJ8WUjhGfBWLnCJ4n8AzXGw/t/x+DBjMQz40D0T4ymvn/8/vRDwZ8stISWGeTGn0G4z1H4FWM+orBbT2srPHL2/XbjKUYRQOUxp8f4wBW4VNsaTPbzjh6A1BY0d7dOee6k2N5ramIibojzbWSEkxFG9vxtXm5jDYs4gcx0rYN11+9wamsHYAdXv4VJmUMS8TEP/8p67NtRNcq1m9uuHlZE5CxTcF6CvflgnXrDrF6QrdbjPVpzXKZmvdYom0OT97FJRtcdojovsZpOo59vozmyUh2g0ycq1izpLT0uQQ3vT6mz53gc5wiUynY6yX7wedqq74/vFz/QKBYjh/OqxZMhkH4GsWXs7yGW7q4+cNEDzARyTj7ikhg/C+UrXZ5jKx7Xc7cbhyuyzHm55+AgfhPLQoiYL3trONdH539kYnY6IAAsz0213ulJRPUHN3+M0x4iEoFAqwWo3wqdkH24v8plqLga7Q3zTbLYX+FOZOv0WC9gI3elmcd9ZBHHh0SOatQEg+Eu0m3ezyLmLHQ3pidWbksz9pnkLWBxeBq3x/xSXM5geI2BgMWVV+74YhBb9+irCpaU0BPYOpX023yNskXODF5RYAt5I5fVAfogHy4S2c3xgGlYUklUEvWBtl6bFYQjQfK2xeANaFUIBKdD5hgDdhQ== cade@mirantis.com
-          user: ${linux:system:user:cade}
diff --git a/openssh/server/team/members/chnyda.yml b/openssh/server/team/members/chnyda.yml
deleted file mode 100644
index 401a416..0000000
--- a/openssh/server/team/members/chnyda.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        chnyda:
-          enabled: false
-          name: chnyda
-          sudo: true
-          full_name: disabled
-          home: /home/chnyda
-          email: chnyda@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        chnyda:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHmLTwDSFslOUVo4ViT0bqVLhSaweuLt0QNWhnIaSPgqWhHOSkdqt3+Tg4l8Vd4O4Z44Yv/rXqhmO5X1AIytNccA6+nJe4Km3JC6QzG6npS3ghtHWDU3DOGgWd5RrULviEDSIj1w1oG8oHxdycGkbfjApAkiDR/xr7NHhTcPhEuvn/q7i1raj4vpNdIrR+cr6XA3l+I4cmaizpjuWaFrag1q24RS7PVEUmcPRSODrkdwFREsrLkIlIgtIoMIIjtEDdk1RU/loiXrNwuVRI3KTLqhheFlHedQd13uzpn66KF6UVlZAm+k2y2jLdEi5IFKD3g6mmWsNH6xSZYVn6d84/XvLjMsS/UL+WHr5xetHNSi3RtQOkCPYphq1KcRAXLwH0dgtDwfyg2F+5ezG3wMsZAqD3KiaGNmDcA6R19Fpjm0S4SXa+QnX5eZcO9DS5cYTjs8F2T9Vsaspvwc0U80M6+JvOlV1PBNJYQhSxdX1Plf2p1MrrRnYhlgMdzCiPSQHsKp3tei8I+bqCvV9iScLAbLxKaW/yWdeuh74oGitTfI4R0h0HMJ1lqK+rT5wtMXyJSvFMK6Zph0GqJf3QHBhzCfs5PIto1pyNdXbI8KzfgTgyo+3gpIPAQ2VD/pf8mOD218UPNQglYWP6wniTq/hVtC2tl3DW53qx5qv10osGmw== chnyda@mirantis.com
-          user: ${linux:system:user:chnyda}
diff --git a/openssh/server/team/members/collinmay.yml b/openssh/server/team/members/collinmay.yml
deleted file mode 100644
index b944537..0000000
--- a/openssh/server/team/members/collinmay.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        cmay:
-          enabled: false
-          name: cmay
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/cmay
-          email: cmay@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        cmay:
-          enabled: false
-          public_keys: ${public_keys:cmay}
-          user: ${linux:system:user:cmay}
-  public_keys:
-    cmay:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDjJ7z4adgi3Ha/eoLV/f/Q9eKN3lXaOE/WWvLIDC4KhGzJLjrrOAC/Qbmd+rD/k2VFPg/7m9KiyRJiRpBeda58CAKIP2I+DDpKpaRAKblrTvuDRPaTPgoo52viF8KsILGp2l5IEwmI5DceCzyEZaZh4X8qa4sXgASa8XFLcVpK0JJDZ7uxYuJ8u5KRGqXFI16dO2NuB1AY1E3XPaQA3vqFEnv+PyRvYDSmmZ2Ey5nLI5x1UeszLM5OvNojYUYH6N1BovoH08p4YIzPK0vQj40AneDehldskKu1JUC7VBFeOvFjSclWjgieqavFNKQrcyj5NO3bqSUmRW0cnS8MMv00whzb/r6NHcubKkSW7zgUP6WCdyr6BK/HYCNxkKV1P/vizBAwa4cN7w9MxDHXnfSmxujjHEZ3TJaKM0RCpMs4Ss1U6dwftLptKRs/0u5ma2FAaWFp1tYLccE2joe1knwjJdlZVFY2jJu2RMt4KfAs6Dp7FiuzWBMiZV3oLsGM8oORbYaHUVtLGaoFu0doIcqogdQ02RrQLrF89HLDSGmUJph195OmauATbkejPxAwLkf9jLcGVesvPByIldENoCAhaxlE3y0Lxdm+DOlg1Sg2iqo06O9hAtEye6G0+zfv0bEdw1CYlBJWAPIRAIvuiFarx1eTH7wfT3zWgXdRlTp5eQ== cmay@Collin.May.Workstation
-
-
diff --git a/openssh/server/team/members/daniillapshin.yml b/openssh/server/team/members/daniillapshin.yml
deleted file mode 100644
index df80183..0000000
--- a/openssh/server/team/members/daniillapshin.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        dlapshin:
-          enabled: false
-          name: dlapshin
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/dlapshin
-          email: dlapshin@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        dlapshin:
-          enabled: false
-          public_keys: ${public_keys:dlapshin}
-          user: ${linux:system:user:dlapshin}
-  public_keys:
-    dlapshin:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDD8H0HjsSYujNEyR9xTM55l0mpdXyvvjKHAVqRbmep7xvRgY6fdiQmkaAEgcbtGpoopTgwTX7P5GAIbioG4Nfy2pl8l+KwqxA5nCST1AzzxzwL7XJDqpeKUDXzlzNeLZhBS9MuDkuX+NXRCt51s5Dza1wa01asaX1vgTPO42EFfp6a/TNq/db3+8qV7GOK7PHLbGN4fB8KBbPr9ygzby7C4XbDZwLTz7yjr1yTSMLLiRguasGvcun+Q2U9i6J/nHd0Tw1V/FO+CKS0p/L+QVnQ8VhjyiodA6phn4llI6Q0BzIHafFjxqzJ1oiZ30iJSchmVDi9p6Q4VnhkuDxjmNZ6Fukn9SDMEHEgPSIcRSs9yiRXbOd3eBXQaDkAQ++9jFnbyNH5mQQm/hyrwJU6Kwpye168bIl6LT76C+3KIVMSNWTDZQNAU3FWvUXxKRABxoolNrs+rkmOs0rFwWrx+PDX0rydGmwG5QrAHkA1NGZD2dhZCx/NZMfeM8VR/YaiWhL5dOas8Tk1EQpmX1uewEAwCQwQHZTDeenS6mS5AE2wqyYI60meSW1euE9aXjtC0hAlZuxslzAQ9sgShdyBy3sc4Kr3l7fxV/LXlMg/ugb8SMU8vXDgIf3Glz2wFE8jS1T+c27em5L3seTWm/SRIdylewb5GYP8HAPwm6xWLaZZmQ==
-
diff --git a/openssh/server/team/members/deprecated/akomarek.yml b/openssh/server/team/members/deprecated/akomarek.yml
new file mode 100644
index 0000000..6901e59
--- /dev/null
+++ b/openssh/server/team/members/deprecated/akomarek.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        newt:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/newt
+          name: newt
+  openssh:
+    server:
+      user:
+        newt:
+          enabled: false
+          user: ${linux:system:user:newt}
diff --git a/openssh/server/team/members/deprecated/apetrenko.yml b/openssh/server/team/members/deprecated/apetrenko.yml
new file mode 100644
index 0000000..30bf624
--- /dev/null
+++ b/openssh/server/team/members/deprecated/apetrenko.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        apetrenko:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/apetrenko
+          name: apetrenko
+  openssh:
+    server:
+      user:
+        apetrenko:
+          enabled: false
+          user: ${linux:system:user:apetrenko}
diff --git a/openssh/server/team/members/deprecated/ashishkin.yml b/openssh/server/team/members/deprecated/ashishkin.yml
new file mode 100644
index 0000000..797acfa
--- /dev/null
+++ b/openssh/server/team/members/deprecated/ashishkin.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        ashishkin:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/ashishkin
+          name: ashishkin
+  openssh:
+    server:
+      user:
+        ashishkin:
+          enabled: false
+          user: ${linux:system:user:ashishkin}
diff --git a/openssh/server/team/members/deprecated/askotnicky.yml b/openssh/server/team/members/deprecated/askotnicky.yml
new file mode 100644
index 0000000..455d382
--- /dev/null
+++ b/openssh/server/team/members/deprecated/askotnicky.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        askotnicky:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/askotnicky
+          name: askotnicky
+  openssh:
+    server:
+      user:
+        askotnicky:
+          enabled: false
+          user: ${linux:system:user:askotnicky}
diff --git a/openssh/server/team/members/deprecated/astupnikov.yml b/openssh/server/team/members/deprecated/astupnikov.yml
new file mode 100644
index 0000000..564ada1
--- /dev/null
+++ b/openssh/server/team/members/deprecated/astupnikov.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        astupnikov:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/astupnikov
+          name: astupnikov
+  openssh:
+    server:
+      user:
+        astupnikov:
+          enabled: false
+          user: ${linux:system:user:astupnikov}
diff --git a/openssh/server/team/members/deprecated/atarasov.yml b/openssh/server/team/members/deprecated/atarasov.yml
new file mode 100644
index 0000000..a1e624e
--- /dev/null
+++ b/openssh/server/team/members/deprecated/atarasov.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        atarasov:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/atarasov
+          name: atarasov
+  openssh:
+    server:
+      user:
+        atarasov:
+          enabled: false
+          user: ${linux:system:user:atarasov}
diff --git a/openssh/server/team/members/deprecated/cade.yml b/openssh/server/team/members/deprecated/cade.yml
new file mode 100644
index 0000000..4b0dc7a
--- /dev/null
+++ b/openssh/server/team/members/deprecated/cade.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        cade:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/cade
+          name: cade
+  openssh:
+    server:
+      user:
+        cade:
+          enabled: false
+          user: ${linux:system:user:cade}
diff --git a/openssh/server/team/members/deprecated/chnyda.yml b/openssh/server/team/members/deprecated/chnyda.yml
new file mode 100644
index 0000000..bf5678f
--- /dev/null
+++ b/openssh/server/team/members/deprecated/chnyda.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        chnyda:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/chnyda
+          name: chnyda
+  openssh:
+    server:
+      user:
+        chnyda:
+          enabled: false
+          user: ${linux:system:user:chnyda}
diff --git a/openssh/server/team/members/deprecated/collinmay.yml b/openssh/server/team/members/deprecated/collinmay.yml
new file mode 100644
index 0000000..d4d64dc
--- /dev/null
+++ b/openssh/server/team/members/deprecated/collinmay.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        cmay:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/cmay
+          name: cmay
+  openssh:
+    server:
+      user:
+        cmay:
+          enabled: false
+          user: ${linux:system:user:cmay}
diff --git a/openssh/server/team/members/deprecated/daniillapshin.yml b/openssh/server/team/members/deprecated/daniillapshin.yml
new file mode 100644
index 0000000..179899b
--- /dev/null
+++ b/openssh/server/team/members/deprecated/daniillapshin.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        dlapshin:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/dlapshin
+          name: dlapshin
+  openssh:
+    server:
+      user:
+        dlapshin:
+          enabled: false
+          user: ${linux:system:user:dlapshin}
diff --git a/openssh/server/team/members/deprecated/dmitrygoloshubov.yml b/openssh/server/team/members/deprecated/dmitrygoloshubov.yml
new file mode 100644
index 0000000..7185952
--- /dev/null
+++ b/openssh/server/team/members/deprecated/dmitrygoloshubov.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        dgoloshubov:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/dgoloshubov
+          name: dgoloshubov
+  openssh:
+    server:
+      user:
+        dgoloshubov:
+          enabled: false
+          user: ${linux:system:user:dgoloshubov}
diff --git a/openssh/server/team/members/deprecated/dszeluga.yml b/openssh/server/team/members/deprecated/dszeluga.yml
new file mode 100644
index 0000000..0b6fd58
--- /dev/null
+++ b/openssh/server/team/members/deprecated/dszeluga.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        dszeluga:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/dszeluga
+          name: dszeluga
+  openssh:
+    server:
+      user:
+        dszeluga:
+          enabled: false
+          user: ${linux:system:user:dszeluga}
diff --git a/openssh/server/team/members/deprecated/ecantwell.yml b/openssh/server/team/members/deprecated/ecantwell.yml
new file mode 100644
index 0000000..12a9f22
--- /dev/null
+++ b/openssh/server/team/members/deprecated/ecantwell.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        ecantwell:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/ecantwell
+          name: ecantwell
+  openssh:
+    server:
+      user:
+        ecantwell:
+          enabled: false
+          user: ${linux:system:user:ecantwell}
diff --git a/openssh/server/team/members/deprecated/ekozhemyakin.yml b/openssh/server/team/members/deprecated/ekozhemyakin.yml
new file mode 100644
index 0000000..0156356
--- /dev/null
+++ b/openssh/server/team/members/deprecated/ekozhemyakin.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        ekozhemyakin:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/ekozhemyakin
+          name: ekozhemyakin
+  openssh:
+    server:
+      user:
+        ekozhemyakin:
+          enabled: false
+          user: ${linux:system:user:ekozhemyakin}
diff --git a/openssh/server/team/members/deprecated/fpytloun.yml b/openssh/server/team/members/deprecated/fpytloun.yml
new file mode 100644
index 0000000..c0dbffe
--- /dev/null
+++ b/openssh/server/team/members/deprecated/fpytloun.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        filip:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/filip
+          name: filip
+  openssh:
+    server:
+      user:
+        filip:
+          enabled: false
+          user: ${linux:system:user:filip}
diff --git a/openssh/server/team/members/deprecated/fsoppelsa.yml b/openssh/server/team/members/deprecated/fsoppelsa.yml
new file mode 100644
index 0000000..1d92a3b
--- /dev/null
+++ b/openssh/server/team/members/deprecated/fsoppelsa.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        fsoppelsa:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/fsoppelsa
+          name: fsoppelsa
+  openssh:
+    server:
+      user:
+        fsoppelsa:
+          enabled: false
+          user: ${linux:system:user:fsoppelsa}
diff --git a/openssh/server/team/members/deprecated/jbroulik.yml b/openssh/server/team/members/deprecated/jbroulik.yml
new file mode 100644
index 0000000..bed7c03
--- /dev/null
+++ b/openssh/server/team/members/deprecated/jbroulik.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        jbroulik:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/jbroulik
+          name: jbroulik
+  openssh:
+    server:
+      user:
+        jbroulik:
+          enabled: false
+          user: ${linux:system:user:jbroulik}
diff --git a/openssh/server/team/members/deprecated/jjosef.yml b/openssh/server/team/members/deprecated/jjosef.yml
new file mode 100644
index 0000000..0c340a4
--- /dev/null
+++ b/openssh/server/team/members/deprecated/jjosef.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        jjosef:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/jjosef
+          name: jjosef
+  openssh:
+    server:
+      user:
+        jjosef:
+          enabled: false
+          user: ${linux:system:user:jjosef}
diff --git a/openssh/server/team/members/deprecated/jpavlik.yml b/openssh/server/team/members/deprecated/jpavlik.yml
new file mode 100644
index 0000000..740311e
--- /dev/null
+++ b/openssh/server/team/members/deprecated/jpavlik.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        jpavlik:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/jpavlik
+          name: jpavlik
+  openssh:
+    server:
+      user:
+        jpavlik:
+          enabled: false
+          user: ${linux:system:user:jpavlik}
diff --git a/openssh/server/team/members/deprecated/kkushaev.yml b/openssh/server/team/members/deprecated/kkushaev.yml
new file mode 100644
index 0000000..8ff8d0c
--- /dev/null
+++ b/openssh/server/team/members/deprecated/kkushaev.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        kkushaev:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/kkushaev
+          name: kkushaev
+  openssh:
+    server:
+      user:
+        kkushaev:
+          enabled: false
+          user: ${linux:system:user:kkushaev}
diff --git a/openssh/server/team/members/deprecated/krzysztoffranckowski.yml b/openssh/server/team/members/deprecated/krzysztoffranckowski.yml
new file mode 100644
index 0000000..02b0187
--- /dev/null
+++ b/openssh/server/team/members/deprecated/krzysztoffranckowski.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        kfranckowski:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/kfranckowski
+          name: kfranckowski
+  openssh:
+    server:
+      user:
+        kfranckowski:
+          enabled: false
+          user: ${linux:system:user:kfranckowski}
diff --git a/openssh/server/team/members/deprecated/matthewroark.yml b/openssh/server/team/members/deprecated/matthewroark.yml
new file mode 100644
index 0000000..d51a8b7
--- /dev/null
+++ b/openssh/server/team/members/deprecated/matthewroark.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mroark:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/mroark
+          name: mroark
+  openssh:
+    server:
+      user:
+        mroark:
+          enabled: false
+          user: ${linux:system:user:mroark}
diff --git a/openssh/server/team/members/deprecated/mceloud.yml b/openssh/server/team/members/deprecated/mceloud.yml
new file mode 100644
index 0000000..c25d778
--- /dev/null
+++ b/openssh/server/team/members/deprecated/mceloud.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        marco:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/marco
+          name: marco
+  openssh:
+    server:
+      user:
+        marco:
+          enabled: false
+          user: ${linux:system:user:marco}
diff --git a/openssh/server/team/members/deprecated/michaelpetersen.yml b/openssh/server/team/members/deprecated/michaelpetersen.yml
new file mode 100644
index 0000000..81e3d49
--- /dev/null
+++ b/openssh/server/team/members/deprecated/michaelpetersen.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mpetersen:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/mpetersen
+          name: mpetersen
+  openssh:
+    server:
+      user:
+        mpetersen:
+          enabled: false
+          user: ${linux:system:user:mpetersen}
diff --git a/openssh/server/team/members/deprecated/mrelewicz.yml b/openssh/server/team/members/deprecated/mrelewicz.yml
new file mode 100644
index 0000000..d23e3ae
--- /dev/null
+++ b/openssh/server/team/members/deprecated/mrelewicz.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mrelewicz:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/mrelewicz
+          name: mrelewicz
+  openssh:
+    server:
+      user:
+        mrelewicz:
+          enabled: false
+          user: ${linux:system:user:mrelewicz}
diff --git a/openssh/server/team/members/deprecated/mwilson.yml b/openssh/server/team/members/deprecated/mwilson.yml
new file mode 100644
index 0000000..64d3e03
--- /dev/null
+++ b/openssh/server/team/members/deprecated/mwilson.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mwilson:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/mwilson
+          name: mwilson
+  openssh:
+    server:
+      user:
+        mwilson:
+          enabled: false
+          user: ${linux:system:user:mwilson}
diff --git a/openssh/server/team/members/deprecated/myatsenko.yml b/openssh/server/team/members/deprecated/myatsenko.yml
new file mode 100644
index 0000000..2e16fd4
--- /dev/null
+++ b/openssh/server/team/members/deprecated/myatsenko.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        myatsenko:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/myatsenko
+          name: myatsenko
+  openssh:
+    server:
+      user:
+        myatsenko:
+          enabled: false
+          user: ${linux:system:user:myatsenko}
diff --git a/openssh/server/team/members/deprecated/nkabanova.yml b/openssh/server/team/members/deprecated/nkabanova.yml
new file mode 100644
index 0000000..2c1bb7c
--- /dev/null
+++ b/openssh/server/team/members/deprecated/nkabanova.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        nkabanova:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/nkabanova
+          name: nkabanova
+  openssh:
+    server:
+      user:
+        nkabanova:
+          enabled: false
+          user: ${linux:system:user:nkabanova}
diff --git a/openssh/server/team/members/deprecated/nkondra.yml b/openssh/server/team/members/deprecated/nkondra.yml
new file mode 100644
index 0000000..b8d42de
--- /dev/null
+++ b/openssh/server/team/members/deprecated/nkondra.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        nkondra:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/nkondra
+          name: nkondra
+  openssh:
+    server:
+      user:
+        nkondra:
+          enabled: false
+          user: ${linux:system:user:nkondra}
diff --git a/openssh/server/team/members/deprecated/osergiyuk.yml b/openssh/server/team/members/deprecated/osergiyuk.yml
new file mode 100644
index 0000000..41a0ef9
--- /dev/null
+++ b/openssh/server/team/members/deprecated/osergiyuk.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        osergiyuk:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/osergiyuk
+          name: osergiyuk
+  openssh:
+    server:
+      user:
+        osergiyuk:
+          enabled: false
+          user: ${linux:system:user:osergiyuk}
diff --git a/openssh/server/team/members/deprecated/osmola.yml b/openssh/server/team/members/deprecated/osmola.yml
new file mode 100644
index 0000000..c4c2c37
--- /dev/null
+++ b/openssh/server/team/members/deprecated/osmola.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        osmola:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/osmola
+          name: osmola
+  openssh:
+    server:
+      user:
+        osmola:
+          enabled: false
+          user: ${linux:system:user:osmola}
diff --git a/openssh/server/team/members/deprecated/pjediny.yml b/openssh/server/team/members/deprecated/pjediny.yml
new file mode 100644
index 0000000..cb6ac87
--- /dev/null
+++ b/openssh/server/team/members/deprecated/pjediny.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        pjediny:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/pjediny
+          name: pjediny
+  openssh:
+    server:
+      user:
+        pjediny:
+          enabled: false
+          user: ${linux:system:user:pjediny}
diff --git a/openssh/server/team/members/deprecated/pmathews.yml b/openssh/server/team/members/deprecated/pmathews.yml
new file mode 100644
index 0000000..98b94d9
--- /dev/null
+++ b/openssh/server/team/members/deprecated/pmathews.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        pmathews:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/pmathews
+          name: pmathews
+  openssh:
+    server:
+      user:
+        pmathews:
+          enabled: false
+          user: ${linux:system:user:pmathews}
diff --git a/openssh/server/team/members/deprecated/renesoto.yml b/openssh/server/team/members/deprecated/renesoto.yml
new file mode 100644
index 0000000..33adfea
--- /dev/null
+++ b/openssh/server/team/members/deprecated/renesoto.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        rsoto:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/rsoto
+          name: rsoto
+  openssh:
+    server:
+      user:
+        rsoto:
+          enabled: false
+          user: ${linux:system:user:rsoto}
diff --git a/openssh/server/team/members/deprecated/rfelkl.yml b/openssh/server/team/members/deprecated/rfelkl.yml
new file mode 100644
index 0000000..1655bd3
--- /dev/null
+++ b/openssh/server/team/members/deprecated/rfelkl.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        rfelkl:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/rfelkl
+          name: rfelkl
+  openssh:
+    server:
+      user:
+        rfelkl:
+          enabled: false
+          user: ${linux:system:user:rfelkl}
diff --git a/openssh/server/team/members/deprecated/rsafonov.yml b/openssh/server/team/members/deprecated/rsafonov.yml
new file mode 100644
index 0000000..9805d7c
--- /dev/null
+++ b/openssh/server/team/members/deprecated/rsafonov.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        rsafonov:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/rsafonov
+          name: rsafonov
+  openssh:
+    server:
+      user:
+        rsafonov:
+          enabled: false
+          user: ${linux:system:user:rsafonov}
diff --git a/openssh/server/team/members/deprecated/rsatek.yml b/openssh/server/team/members/deprecated/rsatek.yml
new file mode 100644
index 0000000..7aa75c5
--- /dev/null
+++ b/openssh/server/team/members/deprecated/rsatek.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        rsatek:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/rsatek
+          name: rsatek
+  openssh:
+    server:
+      user:
+        rsatek:
+          enabled: false
+          user: ${linux:system:user:rsatek}
diff --git a/openssh/server/team/members/deprecated/samstoelinga.yml b/openssh/server/team/members/deprecated/samstoelinga.yml
new file mode 100644
index 0000000..b0b51b2
--- /dev/null
+++ b/openssh/server/team/members/deprecated/samstoelinga.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        sstoelinga:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/sstoelinga
+          name: sstoelinga
+  openssh:
+    server:
+      user:
+        sstoelinga:
+          enabled: false
+          user: ${linux:system:user:sstoelinga}
diff --git a/openssh/server/team/members/deprecated/scottmachtmes.yml b/openssh/server/team/members/deprecated/scottmachtmes.yml
new file mode 100644
index 0000000..f56ef1d
--- /dev/null
+++ b/openssh/server/team/members/deprecated/scottmachtmes.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        smachtmes:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/smachtmes
+          name: smachtmes
+  openssh:
+    server:
+      user:
+        smachtmes:
+          enabled: false
+          user: ${linux:system:user:smachtmes}
diff --git a/openssh/server/team/members/deprecated/sovsianikov.yml b/openssh/server/team/members/deprecated/sovsianikov.yml
new file mode 100644
index 0000000..6fa24dc
--- /dev/null
+++ b/openssh/server/team/members/deprecated/sovsianikov.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        sovsianikov:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/sovsianikov
+          name: sovsianikov
+  openssh:
+    server:
+      user:
+        sovsianikov:
+          enabled: false
+          user: ${linux:system:user:sovsianikov}
diff --git a/openssh/server/team/members/deprecated/tkukral.yml b/openssh/server/team/members/deprecated/tkukral.yml
new file mode 100644
index 0000000..3b89b7b
--- /dev/null
+++ b/openssh/server/team/members/deprecated/tkukral.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        tkukral:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/tkukral
+          name: tkukral
+  openssh:
+    server:
+      user:
+        tkukral:
+          enabled: false
+          user: ${linux:system:user:tkukral}
diff --git a/openssh/server/team/members/deprecated/vmikes.yml b/openssh/server/team/members/deprecated/vmikes.yml
new file mode 100644
index 0000000..83a0848
--- /dev/null
+++ b/openssh/server/team/members/deprecated/vmikes.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        vmikes:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/vmikes
+          name: vmikes
+  openssh:
+    server:
+      user:
+        vmikes:
+          enabled: false
+          user: ${linux:system:user:vmikes}
diff --git a/openssh/server/team/members/deprecated/vzach.yml b/openssh/server/team/members/deprecated/vzach.yml
new file mode 100644
index 0000000..6d3cdf7
--- /dev/null
+++ b/openssh/server/team/members/deprecated/vzach.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        vzach:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/vzach
+          name: vzach
+  openssh:
+    server:
+      user:
+        vzach:
+          enabled: false
+          user: ${linux:system:user:vzach}
diff --git a/openssh/server/team/members/deprecated/zahedkhurasani.yml b/openssh/server/team/members/deprecated/zahedkhurasani.yml
new file mode 100644
index 0000000..f9ac538
--- /dev/null
+++ b/openssh/server/team/members/deprecated/zahedkhurasani.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        zkhurasani:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/zkhurasani
+          name: zkhurasani
+  openssh:
+    server:
+      user:
+        zkhurasani:
+          enabled: false
+          user: ${linux:system:user:zkhurasani}
diff --git a/openssh/server/team/members/dmitrygoloshubov.yml b/openssh/server/team/members/dmitrygoloshubov.yml
deleted file mode 100644
index ab76658..0000000
--- a/openssh/server/team/members/dmitrygoloshubov.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        dgoloshubov:
-          enabled: false
-          name: dgoloshubov
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/dgoloshubov
-          email: dgoloshubov@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        dgoloshubov:
-          enabled: false
-          public_keys: ${public_keys:dgoloshubov}
-          user: ${linux:system:user:dgoloshubov}
-  public_keys:
-    dgoloshubov:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3k+8GqLyioUc3bEYRHvId62f+KnOvZvVRQH71q1iynbG6ELOZVoxs2AuVjej7weEI7SBsrTKraHkZ7DumKHFMqDG6hiVW2YxJWtX1smcHyapL0k4Tq61MjdwZ6QzNcVstPh/fnbAQCdBEzL8pxbxgRj3xmgPm8pP3RAyBFZOuovfa+VmJXx8kdu8bhieWHTTlrBuhlBc0tM5RBm3WFK0jIK1qO0UJ5Ji0I1hhdg6ti5hEY76Binwzh0A75UDAQ7RmJxWwXiXs/RJOR1c9Wsr4FlLJ5bfMT6bpdYQcPtq3WEkgT0xZTZ5u4hOLsZNJDET+wH/4nL/3/ejtADujQaUJ
-
diff --git a/openssh/server/team/members/dstremkouski.yml b/openssh/server/team/members/dstremkouski.yml
index ba3233b..d283c07 100644
--- a/openssh/server/team/members/dstremkouski.yml
+++ b/openssh/server/team/members/dstremkouski.yml
@@ -5,7 +5,7 @@
         dstremkouski:
           enabled: true
           name: dstremkouski
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Dzmitry Stremkouski
           home: /home/dstremkouski
           email: dstremkouski@mirantis.com
diff --git a/openssh/server/team/members/dszeluga.yml b/openssh/server/team/members/dszeluga.yml
deleted file mode 100644
index b035f42..0000000
--- a/openssh/server/team/members/dszeluga.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-##Disabled user
-parameters:
-  linux:
-    system:
-      user:
-        dszeluga:
-          enabled: false
-          name: dszeluga
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/dszeluga
-          email: dszeluga@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        dszeluga:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEEFoCOaivah6AjFZmPIDlDlp8mUfsh9UFrjgLL8vqVYoyVnuZ5DQZTeZsCgFCPxodEsgHDkSEFwkB6hbyqEXszGIL8dWwSBR3QfNJD2cjZ8ZYqXsKN63RzHGAjTXMjlCB7TZtcui1SWpKjGd+x3gQ0KkHZI9V9WVYDcC75kyEAHZptM2N9jlwbhr9lXZ77gZacjaGoKN0Agb/ydd1TyhQ1F3g56pnvgZtkOe/bStwjpz2NS0FqiqAR3wOeZZUGsR3TCP70oYfaeJvpCDVRR/gVXqqvcBAiNYTGC/tMlKuECKPtOOAP8Oc+bt1eOrbiPVJ5NfoOIpmMCDUUSnFoNGN damjanek@cocaine.local
-          user: ${linux:system:user:dszeluga}
diff --git a/openssh/server/team/members/ecantwell.yml b/openssh/server/team/members/ecantwell.yml
deleted file mode 100644
index 6003b15..0000000
--- a/openssh/server/team/members/ecantwell.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        ecantwell:
-          enabled: false
-          name: ecantwell
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/ecantwell
-          email: ecantwell@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        ecantwell:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYAORp6uIs68C7P2QbNh/Jd58NudtLZrCLir/iGbHx8w1kV4yHG+o1N2wS5PYTkvIAl1/bMexniQiBKSmHvT8GnLJjyNBZL9PcLvCdYQQyQsXtd9LMUAaQehwQnQhB59CDOpTyIwrUuG+z8W5DFx47wKh6yVWCAwTVDJ3bRcL4bv16TE2A3PfCUNxFy8q6Z2RbL1YdIJwsywBBTj8wT1HuEImhefRmC0PuWPzoZZdezRQs05+fgNjw3gcVh3vdzWg6Klfz2FTQl0CgXOVaFWGIE8mi+uh/g0ML5JVQNEpqGxtHtHADykZvac+ozOTthSu+JaQEgUhc8bwV/31Hzh/9r3hOlkMj/Gmsprd+JWyeKewbBKVmaCVFsN7h8WSmBoSkk4uK7yPpR3xkC+Fs5vtXGqEBYFO/44b2WNgwZNE/gEgaxQFqAvg/E2bJVLwQ8ePUxIYoZN2qv2yIvqHCmWSDs6clTz+TGPPh92Txsp2/iTodhDk1muHfS4NGf9wkSMJQPuHFR+izsC5byPYKT4QfpWOrFDa1hHEgO4Hf/zpfAS4yIeo+hNIpE740w6tZINE9RJLutiTq+datt7M9qzqMVq9xEON/I8zBmfY5Srky9gTNhSdViWVPB6Tb8xiIXHZAx4YcJ1waZNZP6Yqn0WsEkAYC3vCXqpeRNcCVu3NIkw==
-          user: ${linux:system:user:ecantwell}
diff --git a/openssh/server/team/members/ekozhemyakin.yml b/openssh/server/team/members/ekozhemyakin.yml
deleted file mode 100644
index 70dc2b2..0000000
--- a/openssh/server/team/members/ekozhemyakin.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        ekozhemyakin:
-          enabled: false
-          name: ekozhemyakin
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/ekozhemyakin
-          email: ekozhemyakin@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        ekozhemyakin:
-          enabled: false
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnQ3OD1g35wYDnHwnNKuA/daYMJ7YmMsGoucOG8Y4HFXv9JXMd7MgqpfgyRc22y3VqV6G7ddGgjI0TDzENAzxUAd6pjIhl8GPtwBRY0q5LDPZwatkX8KH1T/da5EDM3iwekftd50s8hsUKRhmCfuFlgC9R0eVAVbzLMsB+OgtasLygoCrfWa5chZ6exbIkDnQRN+SDxBEHjpAK22OGeDuW4Vuf8DS74cNgX2zZBkcQEwxfzGBi3AsJhUEm91d1JJqYtD4nwcRSIUEEiKLroW/AKACko8GihHXCRxmgLSFNhMLwV9g5LE4E9O/MMN8E7ik2JnmAVuhjttsa4tzj62raAlrUBvA/4KBwwocXgR6lLZ/dLBcCdbSZ8UQJy3IM9rwa/r9v/T6qGWm1GwTqL7MWAp4XKPpUbHvykSh9XqQm0Zs2/eTsa387Oxo40IuLcJk8tOlZwYiu2wdnrhnex90dMweMEHTe9lBi0JOqz48uFDYa3NsNQ6ZhkZGYgGblH1Ip3Z75K69HDZJUrM++4bDRuN2y5BL3K1M2GKZVnSwVvkcw7wCL7KyEMzX5uyHc1IiBtpZjPGorIQvJvmUzNe/IDSwVwu2Lm8YsYyMmboyiQ+NZex9+9ZW7htyREYGKNJZHAB+YIgvXRKJOjw0JyCXDqkNOeMDOlkfwYEcrhsN7A8= evg@ThinkPad
-          user: ${linux:system:user:ekozhemyakin}
diff --git a/openssh/server/team/members/fpytloun.yml b/openssh/server/team/members/fpytloun.yml
deleted file mode 100644
index 70f8b73..0000000
--- a/openssh/server/team/members/fpytloun.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        filip:
-          enabled: false
-          name: filip
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/filip
-          email: filip@pytloun.cz
-  openssh:
-    server:
-      enabled: true
-      user:
-        filip:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCcuHTjJ3CoWdkmvtag07bIWeyAMqFLAN+QApat7TXUcDYmm/neK4Asg3m/UicofZnB80cI4tjnB84Z8WazLHMxVTLwHbEqTVbXVeKebiZ5yn0yo4ndRzmppUfSvs0xcMysBwu+hYAnIDXTedctbciMSYKbuQ+b9XZ4mFZ/2RHG4QBA/dPUxJdCwvkBu7AOV+6zaRSR99UETr5nxICQUGVJBTy6VkCsch4mK3/K2SrujODUhytcROg+6ejV/aZHWH9xIFRBLfhmSFeOC6oneBWo4QBQ2tTZgb7Go744JpkhkoMfWQnR2s6cCgUN60BJ6j5snqmbv9/2CmgbI4UprC+E6lL04K/Jbgjv+fi3KqnCIpRiQzahmjSeeYdPducWme3BVDceUSb5EzF/RjSDi4yHcTWJS0TcPf195p42O1G6tLw5zfmIu2+PWUq1L4pLualboUbaDtwqg0WaLWKONi9tJkOS1OMz4hxqEbWBAtFNJLHC5K+OXcV8Yt6C7iB2dEZ4c26MAi1pdMqhFjxYiCGYKZ4lyV9xo8tWcs5fiUIi2PKyLQ9SMRQbhXIcb9ENby2D/ijh5AVpbBew8iaUQQKg83Yo0z2PwTWyNFuXECAl667XaTNZEMVUjo5yU/OtktVZiH6ZfvEFwj+7OpLBiZ3sFgp/7EHcGXa0FL6BcXuwfQ== filip@pytloun.cz
-          user: ${linux:system:user:filip}
diff --git a/openssh/server/team/members/fsoppelsa.yml b/openssh/server/team/members/fsoppelsa.yml
deleted file mode 100644
index 7921474..0000000
--- a/openssh/server/team/members/fsoppelsa.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        fsoppelsa:
-          enabled: false
-          name: fsoppelsa
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/fsoppelsa
-          email: fsoppelsa@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        fsoppelsa:
-          enabled: false
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCs1bA1kgjstOfTVlS5+COuv3U1UYmAkDkTHHCw188XmZKQwmjrHQdbxA91fi/LmGNO87r9S3Sy6bmwYeBd8MUycYKXYPvHaS2JnflgtOy8L1xxubOgA+bpaziHImC0Xf6AQZRbVNlegVG5dVxZ1b1gNIaxufO8BmR4X/apG7TBXAhd+IYRzXsHlZVyrnZyUHNWJWQaUt+640ziR2+1mQZMktgfC9X3G9FxXtCEl6zvkHv8I2XOuzAfHFyoZlv32fo7BF1SjJnMkAhU5jMaliKQNt9Z3G3zcW0yA4D2IruueCJ7HNbXP2wxxiCpTxfpadfglUhm4U0wvTluippKlC1j fsoppelsa@yoda.local
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDTui9BfPuQgiGH0MkOrjWAkveC2J6Kh8zWmPMj3x2QIlHaXoMjnOTsfYqSSzlXIdswU6+46MMOG2jn1D78/hOEqNOFhOp+jtrjAhNUsufDdHclcMQJXPh/m/OaKyJq5UeNdFpq7UdhwA6E8Z9w4Jld/MzoV675RvI2OrzjSw8/K8pxf5YDOPrsxohFTwHaosbqrt/Owjiyqsh8NnJkEnNoFjvVNebpiKDZB2hOTOGjSOmHExQ7rmWNcdUISe/jwLrl5oR7ciwg4BnvcBye1W8l68w5vJ1dlUH8k3NNx010nnKal4MvL0mSYVqd32m5stBLSwZ57UBVVTJl6i3aSQz fsoppelsa@darthvader.local
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkuI6Hfp6dXFHNtL4c3GaIJM13fAJMaUyTatWJ8//qhJz5brbdeF9IQBykPkA59mtWJ6hx81jWgrzp8rHauAQdVEOsn+ZfcTA8zcQaqEv0qe2FxJKN7Ex7YTtXa90uLUiiGTJFy8D9rjKVQLqWjtqo1n94XIvJncw/HmX/RK7lMVmEjUAJmBRo7yCr0N/6i7ITN7Nnn8bB/eKy27TGao5Sw/2fdWKlh+XPvDskpxKL0/jcoBOg5QiB0zT/XTq3ZL6xCTOQ9JUDKmIvHQIJ2ykxyZE/Kh1yHwU0sifz6PLi+z5OhOFpEEFyAtSLeOyZj+gnBtw4DjsglZ10+Q2uJ0Ir fsoppelsa@anakin.msk.mirantis.com
-          user: ${linux:system:user:fsoppelsa}
diff --git a/openssh/server/team/members/jbroulik.yml b/openssh/server/team/members/jbroulik.yml
deleted file mode 100644
index 6b25ae9..0000000
--- a/openssh/server/team/members/jbroulik.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        jbroulik:
-          enabled: true
-          name: jbroulik
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Jiri Broulik
-          home: /home/jbroulik
-          email: jbroulik@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        jbroulik:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCBPHunnzTMg2I88ZIaiQ5eJYJRq/hQcB5UtDZTC7hO0ce+oEpftcLQiQ69xKbOPb5xiK6VMJd6a53gZykabMTov6y+nECMr4B1i6tgK1NPCU/sGhvsUKeiRo7ZVMScRPuJuTGRLjR6Ac3pRrwrWpmoRvJtLnbrvjEYlt9V7ui/VFkl7uiPQc3AjNiSkgBekDGtrqZktjUstEosucjfriF/PVtlZqha7d3rHLpK1KBzzaSMNMxCgBitEtqjgHLtcR1H/KgPQpYAwkokmvAGH8/fqcd+tpmp6hiH3k2Haf8EjVBTcw71fbmqC0rpL8/r74jyYAmkfPG8LISb/T9gPcV jiri@jiri-Mirantis
-          user: ${linux:system:user:jbroulik}
\ No newline at end of file
diff --git a/openssh/server/team/members/jjosef.yml b/openssh/server/team/members/jjosef.yml
deleted file mode 100644
index df6d0dd..0000000
--- a/openssh/server/team/members/jjosef.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        jjosef:
-          enabled: true
-          name: jjosef
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Jakub Josef
-          home: /home/jjosef
-          email: jakub.josef@gmail.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        jjosef:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkK55PVyvnhW2XiIyDUTWOaW1frsd7g9t8SLRmjtEjKqJOBaRk48bSUfcV2twGcSOq3E2dUikh3URobYIZ6WBEiWrl1e7MYCJJAE+8qzVoskk01mC6tp9HGbsSRKrZTgpjzReM+kN6jffi/P1rSqgeg4U0O99N2aWqdfc7UJPFM09z9nqfB1Gj4HUnBkC1X+di4U3S6W8q62JLgxuK2MAry3xSnPztFVH5OXXbBltdVIxshOHj9i8wyof9iFHGdjFNvB+c5I3RJ2HRmmmHm3zey9iHU7PNIppXKglUFZ0EKIB4LsDjL6xrEjo2A5tfCaVZLNJgP95tdbGEcYQuDv3N jakub.josef@gmail.com
-          user: ${linux:system:user:jjosef}
\ No newline at end of file
diff --git a/openssh/server/team/members/jorgesorondo.yml b/openssh/server/team/members/jorgesorondo.yml
index 38ecf77..9ffbb4c 100644
--- a/openssh/server/team/members/jorgesorondo.yml
+++ b/openssh/server/team/members/jorgesorondo.yml
@@ -15,8 +15,6 @@
       user:
         jsorondo:
           enabled: true
-          public_keys: ${public_keys:jsorondo}
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYN/Y6PeKVaW+ouilurh9jyi2k+PDn097LPXxi82ODgPJ+p/qzr6oBYIWDNtudMhNTWA1uV2ZnMbbl67REWAc8V++NFQWtAX9lmtQ4S5w/CvWutgGqrUr7gjJJoq/ySMMFE1F3sekdPM90y2JS4K1L300de5UviAwgPMo48wq292MaESqq6/X7CV3VHDy5srA1VFI1oZMv66NpOO2mHzElKMtVISTHF8/W4yg1P7LvjlcH2vB2clfO6UtOZfcDaAibAyE+bClUYzK6YSRejni5hWaRYFOvza3PyIF6YvjznPxtTU4aclmiZrtMm5gLZB/euvkijXuBOPFO0xgDw6Q9
           user: ${linux:system:user:jsorondo}
-  public_keys:
-    jsorondo:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYN/Y6PeKVaW+ouilurh9jyi2k+PDn097LPXxi82ODgPJ+p/qzr6oBYIWDNtudMhNTWA1uV2ZnMbbl67REWAc8V++NFQWtAX9lmtQ4S5w/CvWutgGqrUr7gjJJoq/ySMMFE1F3sekdPM90y2JS4K1L300de5UviAwgPMo48wq292MaESqq6/X7CV3VHDy5srA1VFI1oZMv66NpOO2mHzElKMtVISTHF8/W4yg1P7LvjlcH2vB2clfO6UtOZfcDaAibAyE+bClUYzK6YSRejni5hWaRYFOvza3PyIF6YvjznPxtTU4aclmiZrtMm5gLZB/euvkijXuBOPFO0xgDw6Q9
diff --git a/openssh/server/team/members/jpavlik.yml b/openssh/server/team/members/jpavlik.yml
deleted file mode 100644
index 4474062..0000000
--- a/openssh/server/team/members/jpavlik.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        jpavlik:
-          enabled: false
-          name: jpavlik
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/jpavlik
-          email: jpavlik@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        jpavlik:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAylDZDzgMuEsJQpwFHDW+QivCVhryxXd1/HWqq1TVhJmT9oNAYdhUBnf/9kVtgmP0EWpDJtGSEaSugCmx8KE76I64RhpOTlm7wO0FFUVnzhFtTPx38WHfMjMdk1HF8twZU4svi72Xbg1KyBimwvaxTTd4zxq8Mskp3uwtkqPcQJDSQaZYv+wtuB6m6vHBCOTZwAognDGEvvCg0dgTU4hch1zoHSaxedS1UFHjUAM598iuI3+hMos/5hjG/vuay4cPLBJX5x1YF6blbFALwrQw8ZmTPaimqDUA9WD6KSmS1qg4rOkk4cszIfJ5vyymMrG+G3qk5LeT4VrgIgWQTAHyXw== pavlk.jakub@gmail.com
-          user: ${linux:system:user:jpavlik}
diff --git a/openssh/server/team/members/kkushaev.yml b/openssh/server/team/members/kkushaev.yml
deleted file mode 100644
index 978c6f1..0000000
--- a/openssh/server/team/members/kkushaev.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        kkushaev:
-          enabled: true
-          name: kkushaev
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Kairat Kushaev
-          home: /home/kkushaev
-          email: kkushaev@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        kkushaev:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqsPMcXdObuEZCBqw3t+AutfjA6mxNJ9o4jZb+ov4Tatw0mlGZtpQXyOnn1kkvIW0TAmMdT8dXeSHusc/Ujd8MHFBDSnvGid/jtSpA7q4Op0VNo4cOFx1fw5KqnsZyymhafiVQywgj6UQOEYNpX7VHgPOMLL2Ymm3i9RF986jLpLqXJHWbJuy+0rOHzjFh127QuTV01AYONOaiDdcwZlHyFZgWShL5NSJCMhmREPLn118JTEsN8w+r10a51plzrrV3Tqcz6q7znfftBKlzKrPACVmbMdOzOQ+XBMuN3VmsFxtS//qcqd7y+YAgG1CJ+E+nk4JUYU5fxeiUWntvqFKl
-          user: ${linux:system:user:kkushaev}
diff --git a/openssh/server/team/members/krzysztoffranckowski.yml b/openssh/server/team/members/krzysztoffranckowski.yml
deleted file mode 100644
index 9d8a95c..0000000
--- a/openssh/server/team/members/krzysztoffranckowski.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        kfranckowski:
-          enabled: false
-          name: kfranckowski
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Krzysztof Franckowski
-          home: /home/kfranckowski
-          email: kfranckowski@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        kfranckowski:
-          enabled: false
-          public_keys: ${public_keys:kfranckowski}
-          user: ${linux:system:user:kfranckowski}
-  public_keys:
-    kfranckowski:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVoTlgIijwEHGDbkKD3IBQHjHOjaM3z9VtIPxFZx0uTzyQ2qgeCS1Nd4VTFM1u677SspcAeZkgoMhuKqPcD+JypApA9bfmELu7QrDdnzro2bW/Sj5fMbfCR5V2KfqCj4nQmzcBLlx0Lj+JRQgzx4NThveOZHRQfO1tFSRNJMM/DmxCZsUCs3tl3WYyWEZkKYx/vPWoGe+Hf7VU/tsH/Yp1syhfJBNwyuCmfsobrUrvcVL+troX7hefXNJOuum6KvTDAPM9XzJvR0TU63bkGpOpACPr7axXOjJ0Y3X2qrXRRXc+IGaWY1O+MQ55jxOJX7SD74lbdy8WRxdmHt6V6QRL
-
diff --git a/openssh/server/team/members/matthewroark.yml b/openssh/server/team/members/matthewroark.yml
deleted file mode 100644
index ef6f755..0000000
--- a/openssh/server/team/members/matthewroark.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        mroark:
-          enabled: false
-          name: mroark
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Matthew Roark
-          home: /home/mroark
-          email: mroark@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        mroark:
-          enabled: false
-          public_keys: ${public_keys:mroark}
-          user: ${linux:system:user:mroark}
-  public_keys:
-    mroark:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwCoVNR4+UdV2GQDUHYxy34cNFr/mdcHn0LjEzoJfm/qqFzRFOw7KUvBiDgW1J6TKTOu74gZADlwem5hDHlW+Z60CiSCx1xdOxtmMI8667mrtnD8m3LRWVDAoJzGpP8e2qiq7sBA+U973pQH3+5x3aHJXWoA/zDZzCdsweWIDhHiMbs24/flzXsnpS9BRmbyRoh+wrnM7h+iGRCzDuOZYJkcABvXy9Hs9ZZhDL16mqDJv8WdEF28/aUvVE62AJHLQuSy4mvDL+57XkFlSyMbK1jCJaRzU1B/4TBOtsBCbVNP0VonZEh0vK3d1fu83MwYhAvv+tf+cVvZ6Xn+VXpWcn
-
diff --git a/openssh/server/team/members/mceloud.yml b/openssh/server/team/members/mceloud.yml
deleted file mode 100644
index a00afb8..0000000
--- a/openssh/server/team/members/mceloud.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        marco:
-          enabled: false
-          name: marco
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/marco
-          email: mceloud@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        marco:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmrJJsRR1dIqaomk83+sn5OnRLvVqrxtROT2uO83W0C4036t3OfJEBL2COJ4Z1iQmyoQUcIpRdJns+Ft8GpVEEQ+mW4eo33jhVEkfLBzRTE7f/WqDmMeDbdxO7LdUNlIIc40KBPcnJWvEorqV2z2UF0+xqittTE34A3CgF82BI2Nx6vCNhgnJJnCyYisD+wT4f+Ovor3Rm2s6zdnJRqcLgx5lkNx6fM2ffkD36MjyPyVYWvFqw68kEsBPcpB0EmiINKQRg3A/iPvUgRWMl9nSvSMVopkbTOBpSK3H9hzGCLiQJvE8pGjHhb7SOix0p0sFdNrNRiC5ayaGQUDQgWH8h marco@marco-MS-7699
-          user: ${linux:system:user:marco}
diff --git a/openssh/server/team/members/michaelpetersen.yml b/openssh/server/team/members/michaelpetersen.yml
deleted file mode 100644
index e19ed2f..0000000
--- a/openssh/server/team/members/michaelpetersen.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        mpetersen:
-          enabled: false
-          name: mpetersen
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Michael Petersen
-          home: /home/mpetersen
-          email: mpetersen@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        mpetersen:
-          enabled: false
-          public_keys: ${public_keys:mpetersen}
-          user: ${linux:system:user:mpetersen}
-  public_keys:
-    mpetersen:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJzKgMddHiRYBewGuS9aIHJWrwoz3lTms0obWttyKCFCr9ULwVvok8NbFQQPPoh0uZIMLh6q7Uu1iJLgrRcPfEuzzwujdy8uZ4EN+xRDpcBJJs8laaRrigwjLEfOjayytHddgS6CnzL4zYmkd2mnvmB6YwWGid0NEAHTHmTS1LOxkn+YYUvHjWi4HZnAyjX0/udDDHYRCE/dcSpG6t2wXmddPJGcgUbniwEDEGlwM0nSEvi4K9hUcP53d8zkn7Klc9NC2DGnFKelTiNoizKGrimB7PKUuVJ38/OMwodMt0VAQmBeObKvNEmsz3thWv2UM21RvPNYDISf1f5YxDpMLQF9A8YwODhLQjS7Gb/7eiZhcEjNKVkKiSyqdohV2ZTZCaBfpeW/yzXaNC1oGDEWJPX3KmBsQaT5w9NSl5oj7qtMTSVH/qY2QQIgz1cNhQDRrH48YRykVt+3iu/qToB8FFe5MPixKvxnGlk0weLCn1liasNDu2LjWALD8WTV+ksi80OwVUtrMkI1d5+doXKtf4+4zNGZT8G2EnenkkFyBfe+T7de9NXGdiMorsukf0Iq6OXMYWIi5nO/bnuU9p0dFCk5U9jfxdlLKFLUI5Web1xVfm5qlYyMjhfkP9JAZViA80+WUUx1cIcI2KR7Sd8uwxdyscF8dWj2ouyluLwHpmsw==
-
diff --git a/openssh/server/team/members/mkarpin.yml b/openssh/server/team/members/mkarpin.yml
index 32cc689..dc504d3 100644
--- a/openssh/server/team/members/mkarpin.yml
+++ b/openssh/server/team/members/mkarpin.yml
@@ -5,7 +5,7 @@
         mkarpin:
           enabled: true
           name: mkarpin
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Mykyta Karpin
           home: /home/mkarpin
           email: mkarpin@mirantis.com
@@ -17,4 +17,4 @@
           enabled: true
           public_keys:
             - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCcO+qMO4z5O75JmeoyHQKNjq72psAMO2lebEMl5MbgVs7BAOT3PChamRId3xhwX2X5R0vS1ZSgRm0XC4br2OpJ9DsBhOBbPRK/EyjAm5aTBW8eZZ69NDFam/hLJ6Xq+jZDdlBT8iK7CPxTJD+0wz1KqpIgYlUNkix5EEj2wfUAfw3j6lGiEVQ0Cpbejey9sYlUSitKcYs/EAX5byBBqkFCLL4/D77fLOIuWfDzAAStUR/wbOJnWNiIScifu4EUdcSdHra9RoQaRgo31ALq+BeYVpvqnyHTOw9t2q04sZVDN4anhUMAFh0n1CkbY/2HWpX/RYWt1bV6XtDeoCpsC5Ar nkarpin@nkarpin-pc
-          user: ${linux:system:user:mkarpin}
\ No newline at end of file
+          user: ${linux:system:user:mkarpin}
diff --git a/openssh/server/team/members/mrelewicz.yml b/openssh/server/team/members/mrelewicz.yml
deleted file mode 100644
index 144379b..0000000
--- a/openssh/server/team/members/mrelewicz.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-##Disabled user
-parameters:
-  linux:
-    system:
-      user:
-        mrelewicz:
-          enabled: false
-          name: mrelewicz
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Maciej Relewicz
-          home: /home/mrelewicz
-          email: mrelewicz@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        mrelewicz:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCsB8R/Sv7hI7kHnOa7slfRQUhx3uVo3lDT7SLZw6m5Xnc7JVmQBmsO3s0lLHWRcxBUNso8P5xd8XG30VaW2MPrHGEMy6TbwxJmoFb8+zZaETjcaXvXig2RAQe/I3GAplptCz76GFM9SQavXtqb4D7wPi/AGs7yTFBa1rlVPdmhnlQ2woZoF/Hb5vPpFbK8ucR79eopNyd+g9mhLALJGRIUkRh6q66LCUAbMHA/Lm01IV//mGFUS1Sh0lcM34LOl99SyRVKW7kbql4vWE/4ZSxX1GJC4WVxxBitdWAypGuq3PY8L/+JDjXK7hXSrYaVWygrrluQh+ZXY8S1zx1SoPEG8uzyqdei8VxDPJd+3Y+w3YvWiYI2QA7fdtf4AW57OjZJrCgC2SpUuO6TNGcQ3gxV2/IChHQMHUV6IYc+ENaKuFIXVfvFBa/VMVRoTFXKVdE1cycDR3mgygGxE9QWxLmsJf7ZaK6A0zQjxTQs0GJi6Id9dgjDsh90uPIaVJWGKZZqDH+/cbXqN1AOTK3ecVji2fOfL3JQfY4wTFt/WmGa2VrdTfv/d9bcvEvhHYaCUs3sWy3sobJXwYCiXwuZVTTLj4EvN6L+jt8I9nG/6OWILUPVjrx84ikZ3Ig1Tbts2giIuB8JpQRup1mrEtpxoeOga1ts5ZGF8XfIKOpqaBpTsw== mrelewicz@mirantis.com
-          user: ${linux:system:user:mrelewicz}
diff --git a/openssh/server/team/members/mwilson.yml b/openssh/server/team/members/mwilson.yml
deleted file mode 100644
index 9f2d63d..0000000
--- a/openssh/server/team/members/mwilson.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        mwilson:
-          enabled: false
-          name: mwilson
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Mike Wilson
-          home: /home/mwilson
-          email: mwilson@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        mwilson:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3ltgS2MbSWR6c/V60oEHtUnLQ3bm5sSqnjFEvL00Y/aVuNL6VCnPCrWXlYSbp6P70UYuD+ngD4x7aW8jg13ii9rw2RntlaPfmttIOb6REDFohOhC4T3BPdeCd5wVe9p/ioyiFCqNi6/m/RWL7Iv8IlR/2IetQHL14VWwTgGd62sqExdb6oZM3Yux/S4jSTcMYBzt49t+QKTLiYTvQJl7Tzv8RJNzAWMsgBwo9M1N73Zqa0hA46sGkbwmWXoBhnJwowGD38q54P+WaSrar/9FT7l+uCXMwbsyYDpoRJH8SQOOpKrymEeyKCjXQUVtLopmfZMZ6COBpLsTSq1BCytwQw== /home/mwilson/.ssh/id_rsa
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDV6H07IEV9merlHUFV8O/Y7sczYXNZjysTBg4TkUW3mWzvW0PJMKnP6Fc1XfFE53fR71N09gkmnVlEtbHa8PTXoS89JVuUHTnitAbDdINShm0pFNWsi/3f00nbfQ8hjaxEWeZ4VlwYzP4v5IPVtpDug+epK65clIG8Xfxlp+CcckyeDdBNSztHHDuQiholzmPicN6EFM6bVUqUZSGnmxiOCrYUOMXBbYChBc3otfeF6vO3WvnKF77nixgOGGmuS0+t96vPKLB3cl5GYpTFyOmrt3tu7JPlTsqwUa0yqDa3ny+5BToIpnROhAqTZV5fV3LHgtObcWYRGANdjVWyPiNOiywiDzsw7/xzuuqV2wLeLnFG1Z+G550F1Ed4lrsPYKc7+qxZYLquI0iJoIjg5WPzNw5QBLdb1srL9zo+0A91Asx8U95IjIMWumowWjDN3Mn0qJwxW5d8SUign3wksIu2FlkLCT4u95CEIebDVEhTQQR0AOP00/KLKtBDn9a5H0UnJZZSTG4+prU3CnqyXqyp6dano86fGEkkcP2PDi/SUwoxdBvMVbdZxYpPYm+8Oe0TjLWPlwu4kYCwVnl3EYgJZAHjT6wVHOjyXcJYezPvvXY8B/VR8UfupetHg5/mVjoQQy2+Nl34AaDN2TLQLXRuG+U+hZqV5Jzc3JO+KKfDUw== mwilson@mwilson-ThinkPad-W530
-          user: ${linux:system:user:mwilson}
diff --git a/openssh/server/team/members/myatsenko.yml b/openssh/server/team/members/myatsenko.yml
deleted file mode 100644
index 839a868..0000000
--- a/openssh/server/team/members/myatsenko.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        myatsenko:
-          enabled: false
-          name: myatsenko
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/myatsenko
-          email: myatsenko@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        myatsenko:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3wCjIm2PVzViGp5NFxeDHLVLxSq67gR+mm4jarHyDVb8wz9kfSG6cWGXNZhrqse7NgpDZpurFunFddXQBOgR6LmOfo9sDlcl4oT0+OnWHgyK6RMYcigkVYVYI5W2f5M+3Dz/KjV1S/VmRYlh/tz46PECV+Y93RaUUXS/91Uv19SAzuCd3Rj0l43HY5ROZNK0VZSrIsnhOqLZxF71v0jY/AbFxswooMH0NCM7XFqVBsRjwclfQjIGkV1j4xeWGM1xWkvvHCSEz2JdeAR5w3C7mhCzPpQJXvQGJNuccyZzoNbHPgDdFPx76MGj/VdmeUu5yKnFSnNNoQ1CcbxmaYeJ7 myatsenko@myatsenko-pc
-          user: ${linux:system:user:myatsenko}
diff --git a/openssh/server/team/members/nkabanova.yml b/openssh/server/team/members/nkabanova.yml
deleted file mode 100644
index fdbb827..0000000
--- a/openssh/server/team/members/nkabanova.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        nkabanova:
-          enabled: true
-          name: nkabanova
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Nadezhda Kabanova
-          home: /home/nkabanova
-          email: nkabanova@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        nkabanova:
-          enabled: true
-          public_keys: ${public_keys:nkabanova}
-          user: ${linux:system:user:nkabanova}
-  public_keys:
-    nkabanova:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuI74hcXTCbbvWoWHNLkng0nDBBwEzZJu8APmKVBukr9Lldz5r8n4OLRzlMI9oKbzvOuY082Cwp+9f5w5ViF/wmmEBa5sktUOBI5Jsi+g5ulb1i2HQOiaRibFJZZcoW03YRQCqQ8D9H4QcuXkT4oNuL5Wcj0UKPQT5r6N2kvuNXlJfEezQQim4nVRymel2USPt/AhlN4AUfBShR8Ykaky2Me4pt5xi0fLOJ9ZDWlEa4dl19Jd4tPz66+dLPiWql+6dgd9GiN+f7NLdDOv3RfOBH6n/It4y/fI+2/UY57X13dWauQNIQHQHDTpCCRiB+XOHwoCRaV81XTHbR865+/sP
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTOke7Y9PB9lbFxaOHVq/YriVzPWsjH+Ie/KiqfjkeLLy3HsUIAJGrxeDbT1YB8Y6OBEKrCk45ECgsRu6MS6jMx4CmJPEV2QNf05Y7g3XBoTeNZwUQtW1aUER6ZXALiBon81cAvVhHDIRHDwTxrSMUTyY0m4sInSt+M6yg22nW24BJLNbRvKwMvO0bdVFzCHrTWbODAOGNplQf63eWlYC2t87PsqTT8CVHgv40QGLIbmGFCyMhnTk2TUMW8d8qMLzHAQU8Cd50HLW6mCEF1oW5QNffpemqeW0oA8vi2iLcRV0lbD5yuwaojYRMpudXOzMttkfjz/+ok/d+qWpiUzep root@Nadezhda
-
-
diff --git a/openssh/server/team/members/nkondra.yml b/openssh/server/team/members/nkondra.yml
deleted file mode 100644
index 33685eb..0000000
--- a/openssh/server/team/members/nkondra.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        nkondra:
-          enabled: false
-          name: nkondra
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/nkondra
-          email: nkondra@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        nkondra:
-          enabled: false
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9A6qJfHEIegIcHHgbBFONf3Yld5cbvhvylqDsy+Cu0vSkGHjMRATQJcTeMuG9HGOirVFMzmlKZHPJoQyFGo7FsJS81ZHwPCnh4UnQ3AL5CBp2nofeeXjOInA1CBJfqXgPhwjPexN1k/P7a7psmZ6nD61BHHeHR8U8SHy0Q0SxQPW9S2aFUxt1HVeZYTdWsSe4TIANepZomokcNi2s5GbfAzYo11ga0i56+ZHP0plrQXu8HYHPBjpHctFgE1NpE7vvrIo3c8E154jkxPj8vD+snHsQjpwUmK5lbbkOq9clchPtRtiTu83qZO0/es4zwyohrbqiqvKUITnzz/NcKPbD root@nazaros
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4UpJRI+XeVqSU8ENSgQwQyqEKwmuV+xsr1xqd6hm8cIGTImnJQSAKKHErgW0Dm5LIaZFOzYEhrxuFxPymQ5jBCyh9kK/SpeFYZNn7PUo7QLvRE12eze2EfEIS8OeLeyew3UJE+ropP7sZTBUbO9ZeOjVN0sU0GT1XMGOr3AcKB5R6P84ZIzL8KX+vw7VRGoWqgNmM4ZSM1JIp1n6S//2Is78hmoQjaw6SqcDJxqfNT4VtLnV8BDFJyiiu/ufWZ1FwSoFOSUpUYkI+Bg8zF0hHP2mf0gr/8hlTubM5UGtIWO6K849D7H43LF2QxlOXqisMJTYnIzIEVlSz9QWyRmAD nazaros@nazaros
-          user: ${linux:system:user:nkondra}
-
diff --git a/openssh/server/team/members/omolchanov.yml b/openssh/server/team/members/omolchanov.yml
index 61289ed..85b8ccf 100644
--- a/openssh/server/team/members/omolchanov.yml
+++ b/openssh/server/team/members/omolchanov.yml
@@ -13,7 +13,7 @@
     server:
       enabled: true
       user:
-        myatsenko:
+        omolchanov:
           enabled: true
           public_keys:
             - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCulNT7qgpJtIoLshljGonHfWk5IYh/MhzO2PEh3GnzrsnI8Mgv2W8TCD4ZB7RbSP6Jt74T7P6F4Mgzag/Nxjwimh7cUJoJZQH54QC4GVBN+YG+CRjEhIDn/OEM9q+6fnAWqBLBf/k0pzeRxWM4mLpcU+6DSPS57qjEKG5OfLCgFbBFg+4EdGP9HNVTLcMBglo7vTWtvzaGjJgH0XFXjx1fXW9JftEmwMzNdoYpQ/a19JYC2x5vu0cGWUjdMWmrzJbnTJ7SwnVYfD2mhUYDi8WGy/nCk67tb6qKCAUN5kvCEWrMPDhVEcBfvyhXU2wVnZHJbOoZxrBiici9q2U7KDYT alex@alex-B85M-DS3H
diff --git a/openssh/server/team/members/osergiyuk.yml b/openssh/server/team/members/osergiyuk.yml
deleted file mode 100644
index 01fe7f9..0000000
--- a/openssh/server/team/members/osergiyuk.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        osergiyuk:
-          enabled: true
-          name: osergiyuk
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Oleg Sergiyuk
-          home: /home/osergiyuk
-          email: osergiyuk@mirantis.com
-  openssh:
-    server:
-      user:
-        osergiyuk:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmdJA5DWI9BQuvIzaPSdLDoK1QwUOI0Z1XjlXlaySFUuknDpYOZpBCi8SyNxS3uR8G1iO069tQ7e72cTxwP3lBJGSjgo0sg3lBuaXfunZo4D1dcjpOgKSIRMVZSB2W1pWzVuk5wjLSxePj6yaUUcCemWuELzMix3Ew8GBeWYVfgcAZPtXy4l5slxvK7lRxZZGwX1HTja0uN3UbR3J3pGDDsFN+qLdqnAtbofu9wlpXd7ffshB5dWUXHk9SEh20V/HVk1K7mDCEpKTYRC/vRlPaovauoldHEzwGcEnToXmWSmS8wrCYCTAmCw3jVHDNcYJ+kjDkaJsyTQ+KrLcSYzgMc2efRE5L98ShLZCWQMEd8ldSZ5FIynbTPhJ+9KzS4fnwoX+wCpwYGwpYKkw6zs/N+oXw2CTk5tmc2br84qHkY6spr2+ydTn0cbsMxN/XlPIz5Zn6A5O4yBZA0LRf4A+bKMijn596/XH/TPuy+LdTwEbhA13v2o6beA5xlt1TSxmvumzwXfvzMpmzWlyC+xjUR/2x6ak1RxIi1zlDnULyZRtrHdAxz/SiEgRUVmet8uGhwYKno/GMa45UfzzAX+6w2M6rFBfqvia5Wmg19UheVVvVP08ssm4Cb6l7I58sMkFcLnazf918T8uxqE+1E82ZhbkXi2X3c6C7jY2UkVf3dw== osergiyuk@mirantis.com
-          user: ${linux:system:user:osergiyuk}
diff --git a/openssh/server/team/members/osmola.yml b/openssh/server/team/members/osmola.yml
deleted file mode 100644
index 2083ddf..0000000
--- a/openssh/server/team/members/osmola.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        osmola:
-          enabled: true
-          name: osmola
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Ondrej Smola
-          home: /home/osmola
-          email: osmola@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        osmola:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDGcF8AI/8hOeKlda4vniFVBbD3wOK4D2+/z+pB7kK0JyxfVC3XccYbpqQioWjt96JwDX8dSio07OUAFqOWQH2cTp6wjqNmpIaAODo44kQgKDXrjEq61fYW+L6JYZHxsFUPLvlNlwQwND2F5HU8oWbsneGu+Psb/COQebcGDdT1v/f2G9r5br2O43P/XPx8+YGKd+OiHPIN4Fk8fZzCGX7oJ7GGGr8YTL/Y8ULF3WiTXbQEWusU52Sf7/Is0A6BQOH+OuBGrVCT+j2XI9QBMyVSYtaKCnRDlEGessnGIGRGrNza/xYivWBw8IsVziDC8x7zZByAwmctWoWED6wWs4YU7SqoonEaYEog32J6Uw9tGtTgvkRC1mpMtgR2eenjNax8Fpoc6uTb/l0gevaRE6IqNMS0FBIIbkCYcoxfj7zIsYms/9IhsXGk1lW5ZrouCFICGEVa7zJ2F+3DvyQDCSuqsk/bfUQZEFw1FdAYIsZYQR+LIOSVQplapGVyqhlbkeUEVdILzgdMAfkPa80ZnGvTO729G/8uP78k1QhZUHAypkeWQ/aJfOKrxXyAxtMZiuyK31zf4OZdKSDS9bAWlmyKkohp7cEjLU0ex4AYDS231Y6JywL+RnucMJ4gFqSfSYfkM6+23gFbYfP7NcEKrkCaim/9RMU1RsunBk8As2K5gw== ondrej.smola@tcpcloud.eu
-          user: ${linux:system:user:osmola}
\ No newline at end of file
diff --git a/openssh/server/team/members/pjediny.yml b/openssh/server/team/members/pjediny.yml
deleted file mode 100644
index 968ec33..0000000
--- a/openssh/server/team/members/pjediny.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        pjediny:
-          enabled: true
-          name: pjediny
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Petr Jediny
-          home: /home/pjediny
-          email: pjediny@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        pjediny:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAgEAgPX2oPwcmBMjf46UC+1vUBnKn9iBG88VD7lNiMN2UGBNihfCfSt4vOSNcVotyCSTrgm1dzHWN3nDt/fYiWvEimVE8VrawU9nJQ48o+M546SMCSYL9jqm+j+oSTd9CP7TeMgRw7hob+/vXREJVmol9cynsQei7HoFeo6iw7ZYMqgI1qOtHwN5Xep/7XZbQ0znweQY4hvywl47dK1GxnoQQUi1v30MzKRVIasf3cCMVr3qJ3ECxyQ2+Po/899jYLDdeJvJeG6dJQf1aDEDSHkoEjVup4jl5xu8y3jAYxOfKwMPe+Lb6lF3zRCB9QRZN71cxLVm+w7LfLtgLfsKv3xPeNpvvOvEQOdFg5jx9Z8w1KRkU2Zkc4fRTcWis89/9va3QL7W1pini3fM+WrpFatc02i7KjoJApeNQt0pwFl33DW+Zz8bQQZT7PT7LWNZjuvB4YmZYA6t9hj5rzUdUN2IyD2mNvPeNykdCLuFh7N7A67tpFSh48UHGld2ckdNmPQR8Ev50Fxu9jj13Cs4l3VMxzOF5I6VOS7g5vEKcCpIyDTtjSk4fGZhyeea5l8unCQzMw9UjkZjgy4nTZvxeqdRNnXSMrb0SzNuqbSM1J67GAUPxfxjb5HSmCYK/KSK3RXHrhwrW+t6B5x72KCCmYYJfUwofm6GIPEYGDxPL/VWGKM= pjediny key
-          user: ${linux:system:user:pjediny}
\ No newline at end of file
diff --git a/openssh/server/team/members/pmathews.yml b/openssh/server/team/members/pmathews.yml
deleted file mode 100644
index 749fed7..0000000
--- a/openssh/server/team/members/pmathews.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        pmathews:
-          enabled: false
-          name: pmathews
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Paul Mathews
-          home: /home/pmathews
-          email: pmathews@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        pmathews:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAIAQCt98sNV0lNpOK3HBAdv44hGv+0INrqfZsaZgTdGsJi1aZp8QymbusSW/86XnuQLrJKqPe8xrJn3/PBCqSgEXnye2J5cculBHoW3ehTwlQk/SSlM4GqeSEhn+6r07Gt3Y41EbsbgJYDFUZe395DVfAp5I/HBEG0Hf4b9zamzDX4OGXiBNhIDMjmnBHTbVAiYJ/igrGtDKTt1qNfDX7b7ViLSNv3nw2F2vBBzXQashGW6e/qJWjrdxjR6WNldmq2/KjxFec2k4J1RhItxEFNaPPAULkUUwXZugyid1fDxUlrpMryG+edCXtIMKD3caGTJD1S4QX6wQlPL/dOn+U+qu2Aa2tG5fKF3ECrfgQapOND239XRANm4+lSFgR8ucD4VO7EcYNLwS9DBNNvvnZWcVtgWwR9ULx0Cr85uySVJr+Wzj5GmX6m0uzeTFyUITn3CpQf2ONSi4g06Vwguvm0NxiMwjnirrkwlw9tVgbZpGAo/rlIa6t1brKKKkZQhm4JpK/xFd0qUWva1pME/G1AkRYAGm8EQsR3N6nEHFW3eJci9/Y/vHigxfXhN9rCJranKogP4v24gv00fVPPrFzxnC9/pfSrbpbh+5RsiZ8ZdUc+rrAM0qSauH1TvD+x6Al2R03ABtnKbhQhw2wkCMPiUpb7MeIYcYw0NTLhF/KocKamRQx/dDr9zzvNkMsbFs9eUipHAQoDcDgYPvYaR3q1kGZpteUO1qMYCMNxmAkUte+ggsorZQ/avwa87nd6KBUSjRraxyZKxZMLbTIYKE5ElduySq3ltZLkwnjiHCmJ934rlOyZro/pREi24L1cYdy1oUsckEiDmR8p715Idh4crxSfcvT8h1MNPV9bvdKsjKO1CtWz4xaSXG1DZ7PmByHqMzJi8mNZI2f/ZbCXNFA1S5bT5NeUO3x5Aw3lD49fQIxFc8WSvD0bBuGk+1DaLjCMNQnBSFJaCB79HQXYqVkNoUH+V4HEnvinoqXOKI5jVy3vNkm8C9DSnJQHUotbyGw+yikXTLg3EFAxJC7eeC/aPblF21TZDmaYGh0y7UNrV/RAVSLO87DOdELCij/GUqW0ANsgJIE/GVDog1AGIM8S+7kwzWDHZSlb1VC8gEk1xL8FIPdUmxHi0Azk5aWUqzXqC+0Qwx4UKsLwjLgRhW35u+3wDzlphgO3+4DR26daUp8RynfUnoHoj7WIy+B3mfE4bTGHUIr0WFoV5kkcOYdYdbLDD7sWJk3XPBqaCr7WJPOCOof7iyVSsH5sZ1/l6UCwfkuSCLwSMw1MYRRkQ8qqRB02auG8uYZ5ismyqfSJHH6bIXnUxpw4PabM7KmpNKXO0ZQi80QhnwY4yshfBESWJDpcfjqlEUSbLY5nqoQ99N2LHahr43/FO8P6iuARuVxaDv0VOkWaOFL2Zmj5udk0U6osODK+Uj+DE3Y0AuTGlMLh634ycx6fp5kdnBjmlvVMSmJCoi47AaTJFXLvsfXvafIfglouVuFtAWmriU1BIPq+uoTwqgZAZkTySGvvFZLyTMES9NTexodkrOdhJM3yGfCkTCq1C90VywdmsyPIeajEhlDcLFZIkUzIxlaJplGF/1DHg6ZafFnQSBNBfr9GMem4FnW2EUNM7WUFZSXvA85DYs4B1oKTU1chqIk+cg6MxX3xA6NSL1RhqhW+x8Dt6EWT6g3WTQM8ychO2GUNRR8VFpt/mVbxkiH0h9MRFwu9uQTLZR/c/TT1DIh6eyIIneIbPkHDhRIHiURW5deELMtsMq21o3heCNk1Qa4wIjQ9e6Ikn4BxMRHeuW5VL2oaHxgT88tCKjGETqYDKE0e++ZaS93GMOMeesApM88rySIOqcidQE2Jh0DRHQ1A5FsoSw69zPgZYYiVLYW7MupimmiWcBGoB+SWQl3OLytDX8/MC4KHZf8oxUiWdORXWplEULy9P3mYV7K3hSU9Wb28EoDYnusdyu3I5peqIV8DAfOsCOOXvKbfd4hogV79y8ul4EnTrKZXEa96Nl8+BQ+xXa28MufAZOmODfKE48/ywzc1H2dXhZZWtXxNZez+qmkqVsIMGG32YlpwdTdH4FGxg9d64fHAtPGqY2stmHWyFUB6+ky2A7XvoqSR1k1cLKaEM5dZe9sWCsHalsA1yd+s+VL14OFB1tgaA2y6GMaPftYELnvvGvAaeBRVpdHNel3TKbQXCl0wGdJ2BzreG9kIzSntjl0/3hkrl32+l3xfdZGJetYtyO8fdzF70J1kBft2CbewwJdC6X1Nkr+nUspHCAkWtB8TcO08xnrpQKnXiXidfCtmcbZa51e7mzSmZTCAKlV2eM6B/G97COezG1+SenKh4YeD22jSuXa/ZW+9RswKzCwXXA9poncIRHMMwkQUq87GGG/WAOZ0CkvJwfw2eGtQ8L2eikEi6x7DyWczzJxAeJ3uFj4S0iZrR7XVnRb+x4DsEo/FPRH/+L103R6nTmtkZw6XAMXEjNuaPOBV9FaQ6neeBab8a+Gfe3+9Gzv2tspgcl1fK56UtCoL3NDAMMGpxK8KykPnkQcMeu6B8H8f6xxAtNQHW3y+vZrkWma/VBriCKv67Uaxj8yF2Kqn/VDZskcBGwvOYIfJPOQHKDYyBoS10WmP6vk5l9s3LhuBJfartbC5NIZb5mJ9a/nHhcdzKnJ+yJk2I6YcOECwBXz2rJ4Y+IfwDJaRl1god8DGLvEPvWko3WinHERC+e7VXyb1CQ==
-          user: ${linux:system:user:pmathews}
diff --git a/openssh/server/team/members/psvimbersky.yml b/openssh/server/team/members/psvimbersky.yml
index 2fc10b1..9ed28ce 100644
--- a/openssh/server/team/members/psvimbersky.yml
+++ b/openssh/server/team/members/psvimbersky.yml
@@ -5,7 +5,7 @@
         psvimbersky:
           enabled: true
           name: psvimbersky
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Pavel Svimbersky
           home: /home/psvimbersky
           email: psvimbersky@mirantis.com
diff --git a/openssh/server/team/members/renesoto.yml b/openssh/server/team/members/renesoto.yml
deleted file mode 100644
index e05a090..0000000
--- a/openssh/server/team/members/renesoto.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        rsoto:
-          enabled: false
-          name: rsoto
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/rsoto
-          email: rsoto@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        rsoto:
-          enabled: false
-          public_keys: ${public_keys:rsoto}
-          user: ${linux:system:user:rsoto}
-  public_keys:
-    rsoto:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCSmved/uNo6pkce9z52wiapxXXQ6nRadSzQhcYqegltYRbvDbAPe5oh/LGUoxybyIP6OAormVJlb85JojG1s7Aom6YtiFNTlddORWXZ1fuxqg7ue2++wQW3Zf2uJMFGKPAByucF8Oqix5WmLd8X8wpTEhX0x4aP9AwDNg2AdPqCGwb0ulwJ6Q6E8UBtHgFq/xF5mNX6NkefemhdxguQDiC2nGedSBuxXzSs7W6DIgL29N3IP2M9N5SjoFsY9cB/kbESchxnbKi7lQOmF0SsTxsshBjO3quHzYVvbSfeAmGb1stF5QHw1fMDGpBpM+yBLAIByQalpz6nkIT5ZgtlML
-
diff --git a/openssh/server/team/members/rfelkl.yml b/openssh/server/team/members/rfelkl.yml
deleted file mode 100644
index a2151f9..0000000
--- a/openssh/server/team/members/rfelkl.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        rfelkl:
-          enabled: true
-          name: rfelkl
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Richard Felkl
-          home: /home/rfelkl
-          email: rfelkl@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        rfelkl:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlvQKWbEQ8bM2rtE35sA5+y//YKMLNJ48d+/RxWlUx6G8xJusUhrKZuMRMgN5NqJQ92Z0Yd2lulsPeKEfSbqAxBxmNZ+mAAy8w8P/BHlQImi2HgMpWtQ5yExsAvCUAqq6KclJBhzjArg4+ztmKmNvjM8ZktJYeCM8VJ+qT01B8/3+frgltIDCDcC8YpRwbAt7aLjuB2Jk5Q9daQbtZ4XyXwHgPDpyZUkcuueUk/iklUBkAh9P3CFJBpttXEyKI0+cJAtM9vCXXPWmWt7nFAyQ8nH9+lTv/ZuD+pipKJBW2sp8+fFUWJ/Z6GzWhyh2KxiY7eK3kgabg1i7FtLFtRbZj richard@richard-inspiron
-          user: ${linux:system:user:rfelkl}
\ No newline at end of file
diff --git a/openssh/server/team/members/rsafonov.yml b/openssh/server/team/members/rsafonov.yml
deleted file mode 100644
index 75eac67..0000000
--- a/openssh/server/team/members/rsafonov.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        rsafonov:
-          enabled: false
-          name: rsafonov
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/rsafonov
-          email: rsafonov@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        rsafonov:
-          enabled: false
-          public_keys: ${public_keys:rsafonov}
-          user: ${linux:system:user:rsafonov}
-  public_keys:
-    rsafonov:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCaVDVMjNUXR+SP4xjH4vX9zfqzYHosQRO4MlVxE8uJPIIQdF1+iPWtggLrsRDZTSQ0JNzCYGXPv8fK6iKBQ/cX5KgMnVPQmFn4Q+Ip/oWotkbVZtR1F0ZVw01KNBYE0LMXrV9dxhX6qUFCO0IV9inbOZ+6zhYOLPddG2WVc8htz8XH7xdWqGbU1GBwyEoRFjITZ9GAYMRNrSjlzPsoBVkQwGKNtvh8uCFZasfAMr2mV1XVFcJlK52T6bNqIXOYPmRc9mSoQoD0UHRRYwlWAZHzW+2e8SABT+NRT1Cc/BoioRC2SBKj9tsZgy9nhq5O0EfuvWVL3ZCM6+RviNxkEL7Z roman@roman
-
diff --git a/openssh/server/team/members/rsatek.yml b/openssh/server/team/members/rsatek.yml
deleted file mode 100644
index fb394e1..0000000
--- a/openssh/server/team/members/rsatek.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        rsatek:
-          enabled: false
-          name: rsatek
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/rsatek
-          email: rsatek@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        rsatek:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC63DK9CdBB2WNHcbgzReBlcVY7YDvVKBJI4P5O8N3lg/T+01ROL99/6k8drFYFJjdeXJaMkCg7UM17yIyouDijBHB9G9AM7jkefBZrGDF7QaWJeGvpxB9W3BQnhotCeuP363CNBup+oUfPwXVnkE5iGuLJAGS8SENpVZpZsF0gXAUuVtvl5D8h1wIqQtFveJSV6qJkjVIudZYJfOMDBfiyS5nEwKmboP5jFtrm3e64HpxDhm2J5irNtzw3hOO8cq2ssnZ0ZAHFf2FfnPAzZ2L0Z1MpZcEPdzBonsdO8/cfxdbov9hW4iLmpJF80KxgPyHU0R304uyfnsfkC164l0Rx rsatek@Rudolfs-MacBook-Pro.local
-          user: ${linux:system:user:rsatek}
diff --git a/openssh/server/team/members/samstoelinga.yml b/openssh/server/team/members/samstoelinga.yml
deleted file mode 100644
index e4e45a4..0000000
--- a/openssh/server/team/members/samstoelinga.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        sstoelinga:
-          enabled: true
-          name: sstoelinga
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Sam Stoelinga
-          home: /home/sstoelinga
-          email: sstoelinga@mirantis.com
-  openssh:
-    server:
-      user:
-        sstoelinga:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDh3j+qNzTJJJrbgWaNEJ4/wF0HZB8jFlz8jO3tA4QJCPJGT76LeFZgeFK1Avp0rRHD4dnHyDvjynJpE5TckBEFiQ2kbyRRiv4SmJe+cEaSz+okoXSuW4ZbsiOhX7IZfWqhR9ra0uxviiaecWOIwoci55EPob34stthIbLPlcSYS81kdivhJLUZwRTvVX4rRf6gFiAjYyv5Zc4ckwwtkIG0A6XiuoHEpO7lDlps12GfN9DEsNUfzFGrEWzucGsPIBIDmHiods4kMv3UNYKImX0EltLF5bGlSDOsy6t65Qr/zCXyB23yF4oU7991/yIjMWzSwUJzcmcHk+0Fr0b1WHh/
-          user: ${linux:system:user:sstoelinga}
-
diff --git a/openssh/server/team/members/scottmachtmes.yml b/openssh/server/team/members/scottmachtmes.yml
deleted file mode 100644
index 0daf80f..0000000
--- a/openssh/server/team/members/scottmachtmes.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        smachtmes:
-          enabled: false
-          name: smachtmes
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/smachtmes
-          email: smachtmes@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        smachtmes:
-          enabled: false
-          public_keys: ${public_keys:smachtmes}
-          user: ${linux:system:user:smachtmes}
-  public_keys:
-    smachtmes:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHGFStJ/pZhZP1c28yubmxGvkCI6UqcxIYZ4oi1QBP0yir2fib/2K8MJcqmRwYhrhw09DAaTnMWhssBhvvgVKX2wS1VhHDo82yRftgN6boo+55zi9Y9o/8IXme1vVTGp8MZV9UCPJMPYrhGxFwOBWIdIYtI0ayDVic54EsTVHUld0ED5NHOBBTJIIz2nXxX8GKC86qPrAlV28VM+Bq8yTNmj18lBTqNXoTswHALNbG8zeV0s8LiDH8LyHgaF8hlmI9EMfGidVQN5txG7x077SQ8Sgs/UfX3q7INyriAVBA5okNoLb0bR9QcRUtQrynOdPp89PoyzNT9JTwmVUWFYkd
-
diff --git a/openssh/server/team/members/sovsianikov.yml b/openssh/server/team/members/sovsianikov.yml
deleted file mode 100644
index cab343e..0000000
--- a/openssh/server/team/members/sovsianikov.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        sovsianikov:
-          enabled: false
-          name: sovsianikov
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/sovsianikov
-          email: sovsianikov@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        sovsianikov:
-          enabled: false
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC728opxEr1QAil48NXPoA1QH4qzbGy8OjEq0s+JuovWYg6eRxf4UEhZgtxW3z3vls0xV5fNpoGa1j2xIDYRIxdZV05X9J+CZ9hxUfE0tIi8iS8/r5x+SFeWQmf4zVOwQMRwXujNsmKBDQVpP/y/2wlYHk3RPrPLGZAH5LkO29W4iTKDciOF4p9uGw55CCR7Iaw/S3fq/CV3rSbtsxXpnYzJ0JZEYIVhO8ZRN9kP1upmTOGeC3g8ahSWgkWOD4xLbrUjoaOTqZjEVIUxDf0bLT2/ztihgqvKG9CTObKrHM8/V3tPqns9Xhu+uDc+h0pplxrVAlVtGiC9yx/R3e3gahJ sovsianikov@sovsianikov-nbook
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqe1+ymHcc750HopiD17J79Yh2P3Bdg7csJi1C/1B8Xk09rOoo5eIGGdo+7EqO2alRqzdan8Um7eSd6sH2sGUakHXApz0ig1xyqDcKpbla+13kJ9bEYyI3+7kXdm5/iAIzRmQVBYbtf6MK7GwLv6+5h+QKA4yiHr1xj2mXgmakU8B5r7GZXCq+DDEDXL+7r9h68DqOuQacKesbQZHPUBLCjINigLHA24Z+8Fglk0BkH+EiuBj91/QBT7Wy003njMz4/ecx0t1jRE6yMImDq62h/L7dS17no2ghVhZbFfDTBoyGuMp200tnhIP9Dwuisy0TuGBjiSVO/QJ2o0aAptwl sovsianikov@sovsianikov-lin
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDd1/kdx3SIx6BxEMpO1+t05ZLVqYGlxxS0oPcpnMAR+t6dBjdmYqMIUb817easmPFDpC38DgClqAzAHoCoPSj5LymiKpkVI0qinyS3b+V/9AK3fdlkE5lUIi7Ij/aCIO197teo1rhUbOjwXVRRqCWPAsAZ1v3ljmHVdBIjva5RraCHM1HDt12c1QdnQdNyQuXXKCx18DpfHcfICVYBXDubEjyGxjomk2nAwF4wH1Zol7I3+djOZcKOw0AVhI8VHb73MIaPSF3/oadsVle6XIlr6HJq8PlmmZ2Bs6cCM8ndRvPycKO+d2Rhm2qGiCWQzz4bLJuEqP9ez1bUQ+1VcJpR sovsianikov@Serhiis-PC.local
-          user: ${linux:system:user:sovsianikov}
diff --git a/openssh/server/team/members/tkukral.yml b/openssh/server/team/members/tkukral.yml
deleted file mode 100644
index 915af8b..0000000
--- a/openssh/server/team/members/tkukral.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        tkukral:
-          enabled: false
-          name: tkukral
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/tkukral
-          email: tkukral@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        tkukral:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRM6WquKic6i6v/JbNR2XuMqCCYqlfyGU1K7XHK7tWFordRLz2/o4S76sZULBTXR0rLHtynvHM4QHlloE1/XJnd0BtI/3y8aY0OkXyu6PHvTC8Az8SyGj2XAcaiPlaT2f+oTJHoPc9rxLhMMD7OTwias6QeVKB3UrT0OaHfy2wWCF7t8cQeofi2ldEHKeCsC1jrT1vaVuoThQgZ00h0rNk4COPZEW34FXdmdJFUmZcUIDMa71HtYgnn4gmE8sUiJ/j6ardvPaycCDT9j1GW1Yu6UVLBWOoMMCb04bDJiidlvY1fQqbM/G4cR4ZPHFZ0RQiM2+wnRaB5RCmBVgNT0Tj
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDIcEZKBvsDAVOeUyucpTXH7nubNjXxlQSMf6oXmcXW5EFzQ7bcBjUJIC2/w4NV2v+/qbbvax1BiI5wU3TWM+LKx6VyhexwrnGQ4p9xprbAIiYaDAbT4KsSOyFnItmbD3qo5JzYruF/jxpus2fV/rBjfsgENHSDSL7ZNO5XLRhdfdcjGrReYf6MU+Py90mOxIcafJQ0nI2PkZ4JURtiJmd/lBp+QJH+6JpQ4Fjm1C0stJFLZfyn0r9YtMXs7j3LK5QaypbZO63NvBKp/1GhZUbC48Cb19SqIoBfQl8JroT93PFzhcQaXd/iXbbBg1WPhEJLAaJEJ7aHGVN+93YHoukP+AFobrpCES3LPFrwbRXpjZNCbKtQCMS1oZHLNBrIsa6uuvAhd9ni3Q/iJq4O6uZ8g0gW69+VI3FT7l3adBCBlOQUVvN51k2k3Q18oeFZAuVPoH49gUDXgxaUHjA5nE0hgPd6KaZkh5UGs/8jyvDLRLVRCUGYfVZcXlMAa5uc1SaUGR3XZgciUlY9DWAGTS8mA4ZnD6mXdnQmjDqhaI2S9jFmuO1Z4YAlHCs+qqMmnFBwbIZuIJaTgl9blr2pi8g6SVQGOE8eA9SDZYTH2EM741ZgVxBPTC/QjMcRtERWNTzfK+R6nZgsdozi9w8MMlmLgvjhney+YuhPhBI2YUwafV2wngqcz7qKP35Jx4E0AeI/Z6z2duuP4JHtaswkR7Zwk4/ebRm1DGIvImh4UxucumEMpXrNOyPZqyJwOb1GM7U5w/kfGSU10y6Y2/db23eYvIb2c1aIbKcGI+Db+1UuED9KcmI9JuYnxqzQZe66T56s+jOi0zyjQDlx9gu2ib/ORE+XVuKqvqii/WF4dTK42YgzTY1RX4wag4mNOEhY4hX+VA6eEFLruqIE+zQ9L+vjf4w2jqpC2CTtY+UtgAbkpZWn9/00CqS9EAh3cmYVgL8se+mfo9iQkcOrHoJ/hN9wyWOK8yQXACMtm/zdFyMtCzhWeSvz03SPz4o1L5QcS3VG+FF6XE5jb0KCWH2C0U6ufgKhpna+LXmG1nXGtay7KqUkQeIwOXq2nq2xehPwgfM25xIPHJ+t1dQMstXrR/h0Bs9lHM7V7mTcgA4MtuYM1mwUpuK9QYantvWE7aq1KtFwFBaP/4swtSoxWsotIDv9GxJhWRJ8aUJIAbsN2znMlbtsIDGTMlWLW3pbpr+1ANAZx6YiQOSCkDDzk4eaFMhlGaa+4sBVfIU0QwnO9swOjQMQH+3/qaeGl9LOZEf87kwFKnQDpMEdDl4vmpsSwzcyGT8AIFl/ybrrl///v3cvCZe1lDJZxPag6KT4BOwycoWTKfL5ll06v+JzW67XqkQT
-          user: ${linux:system:user:tkukral}
diff --git a/openssh/server/team/members/vmikes.yml b/openssh/server/team/members/vmikes.yml
deleted file mode 100644
index 5a1b6de..0000000
--- a/openssh/server/team/members/vmikes.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        vmikes:
-          enabled: false
-          name: vmikes
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/vmikes
-          email: vmikes@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        vmikes:
-          enabled: false
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXng0oUbSGMlZCamlSWuc4jzgTym+p9u0ukbQvaWW2cneOhLw6QbVkOgRETBIfXitiIB+5nNqTYy7lrYqc3wofjZJzonR07oFoNcyhITLnKjLHV9eZ8aRhwKL2PONyp8d61cdm5zqeth1tMP8uBB+SOn+aD12Hu5tfTJjQeH286p+Xt75Llo/bHybfYmt2HaV9Ts6qb/Kw3Eom0Jkjh8837navek/PnFF7WAkM8GvP5Taqzp4Tmu2UfLeMv4459q+ZiS56WRbcixBQGb7uUUy4jkuis0batBNoY0pwMaaTj8KzSwrQ8shc/LuU2QhR7xwXVIgZR/Yqa/Ojw/U36N4t v.mikes@tcpisek.cz
-          user: ${linux:system:user:vmikes}
diff --git a/openssh/server/team/members/zahedkhurasani.yml b/openssh/server/team/members/zahedkhurasani.yml
deleted file mode 100644
index 423828a..0000000
--- a/openssh/server/team/members/zahedkhurasani.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        zkhurasani:
-          enabled: false
-          name: zkhurasani
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: disabled
-          home: /home/zkhurasani
-          email: zkhurasani@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        zkhurasani:
-          enabled: false
-          public_keys: ${public_keys:zkhurasani}
-          user: ${linux:system:user:zkhurasani}
-  public_keys:
-    zkhurasani:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdj43vCWri1SfE0/z24blmTG229kdbwmkK4R5ZzGx63r9Elj1NeOj7Bu7o3QwdtusAEq24dnIs3bSJEgMm+vsYyKcHMoPzrEeD4b42SEZnINBvUTaYHKjZKw9JvaNL8ZibfubiMeDVsefHX0/swAGPosCVNDiTYlIWUT2gKoFcHH8vyRzCC+KOxXvkWQtmJHML5lVHkTVhpgQln8G7aAmyvLMNFzDkOASkMU29uAA/9fWLqtc4T3fA3AUVEcClVI8fFYcDZDP6Y7HZP+hDZYe8vFxHEEpOM7CCq38M22p6nf00ITia60QyYGjpm2cgJPv1DmPZ4cwrbSCpMcvFu7kt
-
diff --git a/openssh/server/team/members/mcp-scale-jenkins.yml b/openssh/server/team/members_ci/mcp-scale-jenkins.yml
similarity index 100%
rename from openssh/server/team/members/mcp-scale-jenkins.yml
rename to openssh/server/team/members_ci/mcp-scale-jenkins.yml
diff --git a/openssh/server/team/mmo_devops.yml b/openssh/server/team/mmo_devops.yml
index 986c5e3..e85f8fe 100644
--- a/openssh/server/team/mmo_devops.yml
+++ b/openssh/server/team/mmo_devops.yml
@@ -1,14 +1,14 @@
 ## DEPRECATED, this class will be removed 01/2018
 classes:
 # DevOps/SRE Team
-- system.openssh.server.team.members.cade
+- system.openssh.server.team.members.deprecated.cade
 - system.openssh.server.team.members.jmosher
-- system.openssh.server.team.members.ecantwell
+- system.openssh.server.team.members.deprecated.ecantwell
 - system.openssh.server.team.members.lmercl
-- system.openssh.server.team.members.mwilson
-- system.openssh.server.team.members.osmola
+- system.openssh.server.team.members.deprecated.mwilson
+- system.openssh.server.team.members.deprecated.osmola
 - system.openssh.server.team.members.pcizinsky
-- system.openssh.server.team.members.pmathews
+- system.openssh.server.team.members.deprecated.pmathews
 - system.openssh.server.team.members.pmichalec
 # Missing- team members still in flux
 # - system.openssh.server.team.members.bpiotrowski
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index d89b227..bd60788 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -1,6 +1,6 @@
 classes:
-- system.openssh.server.team.members.mceloud
-- system.openssh.server.team.members.pjediny
+- system.openssh.server.team.members.deprecated.mceloud
+- system.openssh.server.team.members.deprecated.pjediny
 - system.openssh.server.team.members.skreys
 - system.openssh.server.team.members.smatov
 - system.openssh.server.team.members.ivasilevskaya
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index ce7bddd..b2ef7eb 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -8,7 +8,7 @@
 - system.openssh.server.team.members.ikolodyazhny
 - system.openssh.server.team.members.ohryhorov
 - system.openssh.server.team.members.ogrudev
-- system.openssh.server.team.members.kkushaev
+- system.openssh.server.team.members.deprecated.kkushaev
 - system.openssh.server.team.members.sgarbuz
 - system.openssh.server.team.members.oshyshko
 - system.openssh.server.team.members.pshchelo
diff --git a/openssh/server/team/presales.yml b/openssh/server/team/presales.yml
index 8361a39..41e0220 100644
--- a/openssh/server/team/presales.yml
+++ b/openssh/server/team/presales.yml
@@ -1,5 +1,5 @@
 classes:
-- system.openssh.server.team.members.samstoelinga
+- system.openssh.server.team.members.deprecated.samstoelinga
 - system.openssh.server.team.members.sachintripathi
 - system.openssh.server.team.members.ryanday
 - system.openssh.server.team.members.pmichalec
diff --git a/openssh/server/team/qa_scale.yml b/openssh/server/team/qa_scale.yml
index 2013d07..af797d9 100644
--- a/openssh/server/team/qa_scale.yml
+++ b/openssh/server/team/qa_scale.yml
@@ -4,7 +4,7 @@
 - system.openssh.server.team.members.obasov
 - system.openssh.server.team.members.mikhailkraynov
 - system.openssh.server.team.members.prazumovsky
-- system.openssh.server.team.members.mcp-scale-jenkins
+- system.openssh.server.team.members_ci.mcp-scale-jenkins
 
 parameters:
   _param:
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
index 046aa9b..bb8382b 100644
--- a/openssh/server/team/support.yml
+++ b/openssh/server/team/support.yml
@@ -8,44 +8,44 @@
 - system.openssh.server.team.members.aleksandrrubtsov
 - system.openssh.server.team.members.anatoliineliubin
 - system.openssh.server.team.members.antonrodionov
-- system.openssh.server.team.members.collinmay
+- system.openssh.server.team.members.deprecated.collinmay
 - system.openssh.server.team.members.danilakhmetov
 - system.openssh.server.team.members.deniskostriukov
-- system.openssh.server.team.members.dmitrygoloshubov
+- system.openssh.server.team.members.deprecated.dmitrygoloshubov
 - system.openssh.server.team.members.javierdiaz
 - system.openssh.server.team.members.jorgesorondo
 - system.openssh.server.team.members.josuepalmerin
-- system.openssh.server.team.members.krzysztoffranckowski
-- system.openssh.server.team.members.matthewroark
+- system.openssh.server.team.members.deprecated.krzysztoffranckowski
+- system.openssh.server.team.members.deprecated.matthewroark
 - system.openssh.server.team.members.maximefimov
 - system.openssh.server.team.members.mikhailkraynov
-- system.openssh.server.team.members.renesoto
-- system.openssh.server.team.members.rsafonov
+- system.openssh.server.team.members.deprecated.renesoto
+- system.openssh.server.team.members.deprecated.rsafonov
 - system.openssh.server.team.members.mmazepa
-- system.openssh.server.team.members.scottmachtmes
-- system.openssh.server.team.members.zahedkhurasani
+- system.openssh.server.team.members.deprecated.scottmachtmes
+- system.openssh.server.team.members.deprecated.zahedkhurasani
 # L2OPS
 - system.openssh.server.team.members.aepifanov
-- system.openssh.server.team.members.apetrenko
-- system.openssh.server.team.members.atarasov
+- system.openssh.server.team.members.deprecated.apetrenko
+- system.openssh.server.team.members.deprecated.atarasov
 - system.openssh.server.team.members.dklepikov
 - system.openssh.server.team.members.dsutyagin
-- system.openssh.server.team.members.ekozhemyakin
+- system.openssh.server.team.members.deprecated.ekozhemyakin
 - system.openssh.server.team.members.enikanorov
-- system.openssh.server.team.members.fsoppelsa
+- system.openssh.server.team.members.deprecated.fsoppelsa
 - system.openssh.server.team.members.manashkin
-- system.openssh.server.team.members.nkondra
-- system.openssh.server.team.members.nkabanova
+- system.openssh.server.team.members.deprecated.nkondra
+- system.openssh.server.team.members.deprecated.nkabanova
 - system.openssh.server.team.members.obryndzii
 - system.openssh.server.team.members.oliemieshko
-- system.openssh.server.team.members.sovsianikov
-- system.openssh.server.team.members.cade
+- system.openssh.server.team.members.deprecated.sovsianikov
+- system.openssh.server.team.members.deprecated.cade
 - system.openssh.server.team.members.jmosher
-- system.openssh.server.team.members.ecantwell
+- system.openssh.server.team.members.deprecated.ecantwell
 - system.openssh.server.team.members.lmercl
-- system.openssh.server.team.members.osmola
+- system.openssh.server.team.members.deprecated.osmola
 - system.openssh.server.team.members.pcizinsky
-- system.openssh.server.team.members.pmathews
+- system.openssh.server.team.members.deprecated.pmathews
 - system.openssh.server.team.members.pmichalec
 parameters:
   _param:
diff --git a/openssh/server/team/tcpcloud.yml b/openssh/server/team/tcpcloud.yml
index 5f9af00..9c96881 100644
--- a/openssh/server/team/tcpcloud.yml
+++ b/openssh/server/team/tcpcloud.yml
@@ -1,68 +1,25 @@
 classes:
-- system.openssh.server.team.members.akomarek
+- system.openssh.server.team.members.deprecated.akomarek
+- system.openssh.server.team.members.deprecated.chnyda
+- system.openssh.server.team.members.deprecated.fpytloun
+- system.openssh.server.team.members.deprecated.jbroulik
+- system.openssh.server.team.members.deprecated.jjosef
+- system.openssh.server.team.members.deprecated.jpavlik
+- system.openssh.server.team.members.deprecated.mceloud
+- system.openssh.server.team.members.deprecated.osmola
+- system.openssh.server.team.members.deprecated.rfelkl
+- system.openssh.server.team.members.deprecated.tkukral
+- system.openssh.server.team.members.deprecated.vmikes
+- system.openssh.server.team.members.deprecated.askotnicky
+- system.openssh.server.team.members.deprecated.vzach
+- system.openssh.server.team.members.deprecated.pjediny
 - system.openssh.server.team.members.atengler
 - system.openssh.server.team.members.dcech
-- system.openssh.server.team.members.fpytloun
-- system.openssh.server.team.members.jbroulik
 - system.openssh.server.team.members.jcach
-- system.openssh.server.team.members.jjosef
-- system.openssh.server.team.members.jpavlik
 - system.openssh.server.team.members.lmercl
-- system.openssh.server.team.members.mceloud
 - system.openssh.server.team.members.mpolreich
-- system.openssh.server.team.members.osmola
 - system.openssh.server.team.members.pcizinsky
-- system.openssh.server.team.members.pjediny
 - system.openssh.server.team.members.pmichalec
-- system.openssh.server.team.members.rfelkl
+- system.openssh.server.team.members.psvimbersky
 - system.openssh.server.team.members.skreys
 - system.openssh.server.team.members.smatov
-- system.openssh.server.team.members.tkukral
-- system.openssh.server.team.members.vmikes
-- system.openssh.server.team.members.psvimbersky
-- system.openssh.server.team.members.chnyda
-parameters:
-  _param:
-    linux_system_user_sudo: true
-  linux:
-    system:
-      user:
-        root:
-          enabled: true
-          name: root
-          home: /root
-        askotnicky:
-          enabled: true
-          name: askotnicky
-          sudo: true
-          full_name: Adam Skotnicky
-          home: /home/askotnicky
-        vzach:
-          enabled: true
-          name: vzach
-          sudo: true
-          full_name: Vlastimil Zach
-          home: /home/vzach
-      group:
-        libvirtd:
-          enabled: true
-          name: libvirtd
-  openssh:
-    server:
-      enabled: true
-      user:
-        askotnicky:
-          enabled: true
-          public_keys:
-          - ${public_keys:askotnicky}
-          user: ${linux:system:user:askotnicky}
-        vzach:
-          enabled: true
-          public_keys:
-          - ${public_keys:vzach}
-          user: ${linux:system:user:vzach}
-  public_keys:
-    askotnicky:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO6EnDYaGdF/Nn6lntxDNnKanCsheZRdh8kA/6ImyeRSjT2cgepm1Fsgv7wXBYoy0OxhB5wgCp5Az/Pj4oLkG3g+G05sUPUxxGCGRiwjcnyQ/FTz4TzHglAVqgbdgWoQYf9Hg6EKZovvPcH3STbEwcl+MhLqvxz0wm5+StE+wvp6I9dEfRV+2/e1uepauOTZ1+Ui1DMNXiMefTlbiIBHzUk7RiwJWgqzQXBndgunmbJWSed8zC0Ug97waDOFIX/oKZmAmsv0NLJ2e/kC3oUTuziGT74F9sh7Pqiw/9HZxvP45hJwEvytfUjfuiikIBbmYdF7Je93czaG/qjXGN8YvP== a.skotnicky@tcpisek.cz
-    vzach:
-      key: AAAAB3NzaC1yc2EAAAABJQAAAQEAn4MJUkXbiZPPEcdKijB4MqnjPGk80x5W+8XsMvZuUqElmuLgB30kdCnSCBgipYPor3m8wakdJTTwiY6P50yhtp/tD2b4t1TC1djPwiNS/6JwjZawj30bS5ZrVKeTHtOq6E0tf927svXgEE21/ADgWpMoDeQ/pKlbt0m/U8YGBCmJ7cBa8ggGHhvJIwCNhpELn02vKV8Qfx44rk+DoxLBwQUHQ8PsEwtoSCLMIulpLflptak1pgvN6ggA5p15i36OyJkobI1yR9YEgtb+8yQqofu2DZ+v+9Qhbb+C0446RnyGzfvk/DreCeI4rJh5/6QZjwv3XfYDER5LbNCnoOQAsQ== v.zach@tcpcloud.eu
diff --git a/xtrabackup/client/single.yml b/xtrabackup/client/single.yml
index cbe1123..25fa6d2 100644
--- a/xtrabackup/client/single.yml
+++ b/xtrabackup/client/single.yml
@@ -1,3 +1,9 @@
 classes:
 - service.xtrabackup.client.single
-- system.openssh.client.root
\ No newline at end of file
+- system.openssh.client.root
+parameters:
+  _param:
+    xtrabackup_client_throttle: 0 # disabled
+  xtrabackup:
+    client:
+      throttle: ${_param:xtrabackup_client_throttle}