diff --git a/openssh/server/team/members/aignatov.yml b/openssh/server/team/members/aignatov.yml
new file mode 100644
index 0000000..6b68f82
--- /dev/null
+++ b/openssh/server/team/members/aignatov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        aignatov:
+          enabled: true
+          name: aignatov
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Alexander Ignatov
+          home: /home/aignatov
+          email: aignatov@mirantis.com
+  openssh:
+    server:
+      user:
+        aignatov:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJFYznIFlCdxu5UXzThjYZlZfvXKCcDN0QxDEn7U7dNkK17SyzIJswQcxF7pTlvcuZ7XEskEqyXC8E6P5XyvBJO2xLGrFDJ4U3vf7MKsfwSFEj3NPUzV5bGTrKeKIHTL94L7lwMm1INE7lZzciiwvTxcKv//A+FgG8o1MDhefK56cBH4a9TSjEd+5ImcnCc5sf8B+csyWFPnksnv1zwu//T9aYXRITocdVzrfRHmEiZDpL3mNwpGT3O3XUTiMwdVpN2ImAqSF6XlQl0HlUkBT2idCIoXUR9lcGUx2Q+LSd62JgcVmQHCOmbUENj7NIDgWixgSJYLzsi//YNqJ9jccR aignatov@mirantis.com
+          user: ${linux:system:user:aignatov}
diff --git a/openssh/server/team/members/akasatkin.yml b/openssh/server/team/members/akasatkin.yml
new file mode 100644
index 0000000..1992386
--- /dev/null
+++ b/openssh/server/team/members/akasatkin.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        akasatkin:
+          enabled: true
+          name: akasatkin
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Aleksey Kasatkin
+          home: /home/akasatkin
+          email: akasatkin@mirantis.com
+  openssh:
+    server:
+      user:
+        akasatkin:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJFOEwYid83klmXcQs9QBDJwb1EG6Ly7DpJ32aH8gB8uguUPVO3rS/08GNav7+6GFLwlbWHVDe1MIFeNvyqh778B2piCzoajIT8aZFiutjbGtVPfkGkt94mibVutjO36eSEjEDW8GYQ2boisibha6B2mlz126y7nJN1VDSUr05Ro719i696vdN0fglu5DlT6qnOSei16EqkgQcMdyoxCfUOy9zBe3p1jGd2XKCOy3aGkhixEj6oaWSFRcA48SgqNSUO9A5NHTmWT/3j76Jsk92yw4e5OenWJbVx0BkU8q6U5fIncxkIQRYFUqB0X1TT9PnktDD4iJwNMXY7W2hYN2/ aleksey@aleksey-ThinkPad
+          user: ${linux:system:user:akasatkin}
diff --git a/openssh/server/team/members/asamoylov.yml b/openssh/server/team/members/asamoylov.yml
index 63bfdd3..a63d542 100644
--- a/openssh/server/team/members/asamoylov.yml
+++ b/openssh/server/team/members/asamoylov.yml
@@ -11,7 +11,6 @@
           email: asamoylov@mirantis.com
   openssh:
     server:
-      enabled: true
       user:
         asamoylov:
           enabled: true
diff --git a/openssh/server/team/members/ataraday.yml b/openssh/server/team/members/ataraday.yml
new file mode 100644
index 0000000..e8d18ca
--- /dev/null
+++ b/openssh/server/team/members/ataraday.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        ataraday:
+          enabled: true
+          name: ataraday
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Anna Taraday
+          home: /home/ataraday
+          email: ataraday@mirantis.com
+  openssh:
+    server:
+      user:
+        ataraday:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9Tl4w3FVLfzTrm+P0ziWlSn74sbwycPUXY2eKdBtzLvvd8Vs7Gh8sEL9q8aeg9hY613LWjPvqgnaoosGJ52ckDnArYfpe3AG1Zamr9/Ncq7qC6U+W8lKwiuiS1QQIILm72+me7jzTanOfbpNl64+tIIcJXgPLtQK4dcpHWMXZQw8Fjp5PP7+k0P35yYNRtoHazxlE/lt/6XsQ+NnldRYB2TCtK3uU1ATHg5Sc7Qr1o+obfxDwWglasxfSd7fGqAZjszrm9q4pmKXTpKNlSqGCs7Hp4Hstr//GKLaXucyTtsb/uU40at6X3INGUU/u9txZkLwAGx8kb4XB6F5MwRH/ akamyshnikova@akamyshnikova
+          user: ${linux:system:user:ataraday}
diff --git a/openssh/server/team/members/deprecated/akuznetsova.yml b/openssh/server/team/members/deprecated/akuznetsova.yml
new file mode 100644
index 0000000..a7a11df
--- /dev/null
+++ b/openssh/server/team/members/deprecated/akuznetsova.yml
@@ -0,0 +1,17 @@
+parameters:
+  linux:
+    system:
+      user:
+        akuznetsova:
+          enabled: false
+          name: akuznetsova
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: disabled
+          home: /home/akuznetsova
+          email: disabled
+  openssh:
+    server:
+      user:
+        akuznetsova:
+          enabled: false
+          user: ${linux:system:user:akuznetsova}
diff --git a/openssh/server/team/members/deprecated/eezhova.yml b/openssh/server/team/members/deprecated/eezhova.yml
new file mode 100644
index 0000000..4208785
--- /dev/null
+++ b/openssh/server/team/members/deprecated/eezhova.yml
@@ -0,0 +1,18 @@
+parameters:
+  linux:
+    system:
+      user:
+        eezhova:
+          enabled: false
+          name: eezhova
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: disabled
+          home: /home/eezhova
+          email: disabled
+  openssh:
+    server:
+      user:
+        eezhova:
+          enabled: false
+          public_keys:
+          user: ${linux:system:user:eezhova}
diff --git a/openssh/server/team/members/ibumarskov.yml b/openssh/server/team/members/ibumarskov.yml
index ba87f1e..6617c95 100644
--- a/openssh/server/team/members/ibumarskov.yml
+++ b/openssh/server/team/members/ibumarskov.yml
@@ -11,7 +11,6 @@
           email: ibumarskov@mirantis.com
   openssh:
     server:
-      enabled: true
       user:
         ibumarskov:
           enabled: true
diff --git a/openssh/server/team/members/ichukhnakov.yml b/openssh/server/team/members/ichukhnakov.yml
new file mode 100644
index 0000000..070e924
--- /dev/null
+++ b/openssh/server/team/members/ichukhnakov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        ichukhnakov:
+          enabled: true
+          name: ichukhnakov
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Ilya Chukhnakov
+          home: /home/ichukhnakov
+          email: ichukhnakov@mirantis.com
+  openssh:
+    server:
+      user:
+        ichukhnakov:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIc4N1/KTRWKoWoM83hqRaSvk+tIX7mt8fWG4HKngB08PxXGBJElGuMvzEa3mYyKptwSYO/5wgRI/+cD+Sgbr2BGs9HJy23eYPRPwcKdcskandBjVNWrDd4op2s3wGOrwGg/P88JaGqhL8mwM/5UUK4P4gP7uoZdEK9ptHzy/OvBB0Jd6/qkzWv29k8x5ExgNehvfL8PZzcFWwajdv2y53nj1lO4Bw1i3gKVOl9DEe0JkLB8ryiJ4hIKmq7zgBcduPF8xOWUt2F7TA6/o9rXR9+NU6EnSYmOszqTHQ6P5itGogp57SGqoG1PZzXapQnZPwzDX4jMkxmdu1Ji+TJhXd
+          user: ${linux:system:user:ichukhnakov}
diff --git a/openssh/server/team/members/ivasilevskaya.yml b/openssh/server/team/members/ivasilevskaya.yml
index bc50441..f4240be 100644
--- a/openssh/server/team/members/ivasilevskaya.yml
+++ b/openssh/server/team/members/ivasilevskaya.yml
@@ -11,7 +11,6 @@
           email: ivasilevskaya@mirantis.com
   openssh:
     server:
-      enabled: true
       user:
         ivasilevskaya:
           enabled: true
diff --git a/openssh/server/team/members/mrasskazov.yml b/openssh/server/team/members/mrasskazov.yml
index 23926e8..825c150 100644
--- a/openssh/server/team/members/mrasskazov.yml
+++ b/openssh/server/team/members/mrasskazov.yml
@@ -11,7 +11,6 @@
           email: mrasskazov@mirantis.com
   openssh:
     server:
-      enabled: true
       user:
         mrasskazov:
           enabled: true
diff --git a/openssh/server/team/members/obondarev.yml b/openssh/server/team/members/obondarev.yml
new file mode 100644
index 0000000..4e603ac
--- /dev/null
+++ b/openssh/server/team/members/obondarev.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        obondarev:
+          enabled: true
+          name: obondarev
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Oleg Bondarev
+          home: /home/obondarev
+          email: obondarev@mirantis.com
+  openssh:
+    server:
+      user:
+        obondarev:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDca1gqXe14l9uho3t4mZT52lXmSuUxKVOCcSO9Dy+BAmtaVK39+t7la081S5c0H+oTPIXFb32/kO37+qpEgwyOv1zimWIqcR56xrr42gW/QzVLyY64qVnQ9QFiXlvXXBW4YgBuT//SE8upOshLYnznKHOi4IkoKrAE37K34Cz/DGQzFV6sKQSmP6fjJzli0Nzu+YPdBSZW9VH1m7IKxliGoZcjdIkJ+L92+h/mPuN95Bitfe+aoexBQq3u4WjYVVsCE/9TrwLoGlr3zd7VAyVdADJf6phfIMHGDxn8W8125r9UWp4X/36yAIudVC7kHLyr0AHTfYqCVH10nEJvUwRz obondarev@Olegs-MacBook-Pro.local
+          user: ${linux:system:user:obondarev}
diff --git a/openssh/server/team/members/svasilenko.yml b/openssh/server/team/members/svasilenko.yml
new file mode 100644
index 0000000..5cb5650
--- /dev/null
+++ b/openssh/server/team/members/svasilenko.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        svasilenko:
+          enabled: true
+          name: svasilenko
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Sergey Vasilenko
+          home: /home/svasilenko
+          email: svasilenko@mirantis.com
+  openssh:
+    server:
+      user:
+        svasilenko:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbNUC2UJiVk0bHmbVBHd4L22M3Mc3HVPdZZja7gzzUJDI/MIGoTSX8/Q38olBHg6i/9ePzroMqQS70x/LvuEgfKMDUcEBhggq22zea/wohMmMPwiGTEJ3j0CfckXM2cfjRHweHu4U//4SiSgLHi3nnEhYJUvFkOq10qOtZd2iT76sbKpnIEcRVfDcIy01G/wZQLX0SiCk8hWh9ERBqnW2OjNhwG/a2SdoPN25T1HmHAhLJykcGXb7BmrMNe7XFcNsqleMsopTXcqtZBu+ysEbNywPQKUiJrwqOtzkncQwwuKlr53EaXwBY5UHQwoFSXXi28JjmvEZAzA+UBMrPDHrx svasilenko@mrnt
+          user: ${linux:system:user:svasilenko}
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index bd60788..a7d8871 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -1,6 +1,4 @@
 classes:
-- 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
@@ -11,112 +9,17 @@
 - system.openssh.server.team.members.asamoylov
 - system.openssh.server.team.members.mrasskazov
 - system.openssh.server.team.members.ibumarskov
+- system.openssh.server.team.members.obondarev
+- system.openssh.server.team.members.ichukhnakov
+- system.openssh.server.team.members.aignatov
+- system.openssh.server.team.members.ataraday
+- system.openssh.server.team.members.svasilenko
+- system.openssh.server.team.members.akasatkin
+# Deprecated users
+- system.openssh.server.team.members.deprecated.pjediny
+- system.openssh.server.team.members.deprecated.akuznetsova
+- system.openssh.server.team.members.deprecated.eezhova
+- system.openssh.server.team.members.deprecated.mceloud
 parameters:
   _param:
     linux_system_user_sudo: true
-  linux:
-    system:
-      user:
-        aignatov:
-          enabled: true
-          name: aignatov
-          sudo: true
-          full_name: Alexander Ignatov
-          home: /home/aignatov
-          email: aignatov@mirantis.com
-        ataraday:
-          enabled: true
-          name: ataraday
-          sudo: true
-          full_name: Anna Taraday
-          home: /home/ataraday
-          email: ataraday@mirantis.com
-        eezhova:
-          enabled: true
-          name: eezhova
-          sudo: true
-          full_name: Elena Ezhova
-          home: /home/eezhova
-          email: eezhova@mirantis.com
-        ichukhnakov:
-          enabled: true
-          name: ichukhnakov
-          sudo: true
-          full_name: Ilya Chukhnakov
-          home: /home/ichukhnakov
-          email: ichukhnakov@mirantis.com
-        ivasilevskaya:
-          enabled: true
-          name: ivasilevskaya
-          sudo: true
-          full_name: Inessa Vasilevskaya
-          home: /home/ivasilevskaya
-          email: ivasilevskaya@mirantis.com
-        obondarev:
-          enabled: true
-          name: obondarev
-          sudo: true
-          full_name: Oleg Bondarev
-          home: /home/obondarev
-          email: obondarev@mirantis.com
-        akuznetsova:
-          enabled: true
-          name: akuznetsova
-          sudo: true
-          full_name: Anastasiia Kuznetcova
-          home: /home/akuznetsova
-          email: akuznetsova@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        aignatov:
-          enabled: true
-          public_keys:
-          - ${public_keys:aignatov}
-          user: ${linux:system:user:aignatov}
-        ataraday:
-          enabled: true
-          public_keys:
-          - ${public_keys:ataraday}
-          user: ${linux:system:user:ataraday}
-        eezhova:
-          enabled: true
-          public_keys:
-          - ${public_keys:eezhova}
-          user: ${linux:system:user:eezhova}
-        ichukhnakov:
-          enabled: true
-          public_keys:
-          - ${public_keys:ichukhnakov}
-          user: ${linux:system:user:ichukhnakov}
-        ivasilevskaya:
-          enabled: true
-          public_keys:
-          - ${public_keys:ivasilevskaya}
-          user: ${linux:system:user:ivasilevskaya}
-        obondarev:
-          enabled: true
-          public_keys:
-          - ${public_keys:obondarev}
-          user: ${linux:system:user:obondarev}
-        akuznetsova:
-          enabled: true
-          public_keys:
-          - ${public_keys:akuznetsova}
-          user: ${linux:system:user:akuznetsova}
-  public_keys:
-    aignatov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJFYznIFlCdxu5UXzThjYZlZfvXKCcDN0QxDEn7U7dNkK17SyzIJswQcxF7pTlvcuZ7XEskEqyXC8E6P5XyvBJO2xLGrFDJ4U3vf7MKsfwSFEj3NPUzV5bGTrKeKIHTL94L7lwMm1INE7lZzciiwvTxcKv//A+FgG8o1MDhefK56cBH4a9TSjEd+5ImcnCc5sf8B+csyWFPnksnv1zwu//T9aYXRITocdVzrfRHmEiZDpL3mNwpGT3O3XUTiMwdVpN2ImAqSF6XlQl0HlUkBT2idCIoXUR9lcGUx2Q+LSd62JgcVmQHCOmbUENj7NIDgWixgSJYLzsi//YNqJ9jccR aignatov@mirantis.com
-    ataraday:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9Tl4w3FVLfzTrm+P0ziWlSn74sbwycPUXY2eKdBtzLvvd8Vs7Gh8sEL9q8aeg9hY613LWjPvqgnaoosGJ52ckDnArYfpe3AG1Zamr9/Ncq7qC6U+W8lKwiuiS1QQIILm72+me7jzTanOfbpNl64+tIIcJXgPLtQK4dcpHWMXZQw8Fjp5PP7+k0P35yYNRtoHazxlE/lt/6XsQ+NnldRYB2TCtK3uU1ATHg5Sc7Qr1o+obfxDwWglasxfSd7fGqAZjszrm9q4pmKXTpKNlSqGCs7Hp4Hstr//GKLaXucyTtsb/uU40at6X3INGUU/u9txZkLwAGx8kb4XB6F5MwRH/ akamyshnikova@akamyshnikova
-    eezhova:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9WND1z5CWjYrcUmEoao3sR29iqgw+i/osdFeYetGZYCaKSLWHXgvVLf19oYnFSNrsjAhpL6krcMc9luN4Uj1/qoigGQcLnV5KQo8AnkvdCDvBBVg/Y3fbgYmcEx6yPC3bbVB9gsfr8yvgrz3vE3gWApvf9uR2dDljL+TsdrVlWzIFVjKi6PEFErKxExYlQa+BeTmiHVjyKr1l+zNOOZN56nH33G3YYa/vxDO5ejio84LcG0Akul+MI+jZohNsvD/Y9EPm9CB6mmWeqpptVkXP+2HlfjyTG9s+KHvM/wcsW71vT+FR5N0OJAhcjYHsXSKDucD3+VzFTyFjpptRKGTJ eezhova@tiresh.local
-    ichukhnakov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIc4N1/KTRWKoWoM83hqRaSvk+tIX7mt8fWG4HKngB08PxXGBJElGuMvzEa3mYyKptwSYO/5wgRI/+cD+Sgbr2BGs9HJy23eYPRPwcKdcskandBjVNWrDd4op2s3wGOrwGg/P88JaGqhL8mwM/5UUK4P4gP7uoZdEK9ptHzy/OvBB0Jd6/qkzWv29k8x5ExgNehvfL8PZzcFWwajdv2y53nj1lO4Bw1i3gKVOl9DEe0JkLB8ryiJ4hIKmq7zgBcduPF8xOWUt2F7TA6/o9rXR9+NU6EnSYmOszqTHQ6P5itGogp57SGqoG1PZzXapQnZPwzDX4jMkxmdu1Ji+TJhXd
-    ivasilevskaya:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJk2ip+Rn73D4vt47pe/Hv42ylKJv6JIzeF0k3OflH+RyliVelvo05KMcozfsmmvOKhwgDokBj3KjQ10ewDwD7Fz5H3tosa8JFOs36cuHx9aHrsEmj1oIcIyThrIBwSZGFApqJqj27sLtReVLQJPlYR59RJGw61TogkA/QooOABi+KHzuwPFjAcA1SMfFT8LwiaNPkyUdRb5EQeKCOHniRAEPGNIwskA0sxz25qbB1EU2XBFjkxRE1b5GHfUYL+c2YhAwRWTJbD2JbbcHI6HpsmJutzkS6YIkEn1CK4JuA40OQTYFSEutCk2uPPR0G+77Fec2+vD/8H+ncPxPeDqNR ina@ina-ThinkPad-X240
-    obondarev:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDca1gqXe14l9uho3t4mZT52lXmSuUxKVOCcSO9Dy+BAmtaVK39+t7la081S5c0H+oTPIXFb32/kO37+qpEgwyOv1zimWIqcR56xrr42gW/QzVLyY64qVnQ9QFiXlvXXBW4YgBuT//SE8upOshLYnznKHOi4IkoKrAE37K34Cz/DGQzFV6sKQSmP6fjJzli0Nzu+YPdBSZW9VH1m7IKxliGoZcjdIkJ+L92+h/mPuN95Bitfe+aoexBQq3u4WjYVVsCE/9TrwLoGlr3zd7VAyVdADJf6phfIMHGDxn8W8125r9UWp4X/36yAIudVC7kHLyr0AHTfYqCVH10nEJvUwRz obondarev@Olegs-MacBook-Pro.local
-    akuznetsova:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD033EOpc2jeEYkKPzmJL4j081hmt3Ml5hlrfJWYY7RRoKBugT1gF9zggI9GaFGn5F29g+92dYfLLH4yfkL91dkNtbsutl7XiHZYW5NIL5n8kHtb8Bahclid8ERMpLYlctqW/4RM5wfMyzh71TxbutN9ZjcbtAQ0bIaCoTyWRrIDiMeW/+Btf7bPpe7zyQMjkQu+F2iYxd6nERiMnVLq080XAqwuSGMy9NFBLvG+VoJV1w49f2Hf19TD1ILev/pttPYem/15/zAnwwR+nye91jBtBBaFI6V4aaYjgsrjEinNy48tfhMpbuELW5Nn3o8c+3Xfi2rRxtkNcfdpc/yvFz/