diff --git a/openssh/server/team/k8s_apps_team.yml b/openssh/server/team/k8s_apps_team.yml
index de1ca26..c98e553 100644
--- a/openssh/server/team/k8s_apps_team.yml
+++ b/openssh/server/team/k8s_apps_team.yml
@@ -1,11 +1,9 @@
 classes:
+- system.openssh.server.team.members.deprecated.mzhnichkov
+- system.openssh.server.team.members.deprecated.sreshetnyak
 - system.openssh.server.team.members.apavlov
 - system.openssh.server.team.members.slukjanov
-- system.openssh.server.team.members.sreshetnyak
 - system.openssh.server.team.members.ytaraday
-# Deprecated users
-- system.openssh.server.team.members.deprecated.mzhnichkov
-
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/k8s_team.yml b/openssh/server/team/k8s_team.yml
index fdb3dd3..dcc3deb 100644
--- a/openssh/server/team/k8s_team.yml
+++ b/openssh/server/team/k8s_team.yml
@@ -1,28 +1,26 @@
 classes:
-- system.openssh.server.team.members.ashestakov
-- system.openssh.server.team.members.vjigulin
-- system.openssh.server.team.members.skolekonov
-- system.openssh.server.team.members.pskamruk
-- system.openssh.server.team.members.ishvedunov
-- system.openssh.server.team.members.jnowak
-- system.openssh.server.team.members.loles
-- system.openssh.server.team.members.vryzhenkin
-- system.openssh.server.team.members.vnaumov
-- system.openssh.server.team.members.apavlov
-- system.openssh.server.team.members.slukjanov
-- system.openssh.server.team.members.sreshetnyak
-- system.openssh.server.team.members.ytaraday
-- system.openssh.server.team.members.ekhomyakova
-- system.openssh.server.team.members.sskripnick
-# Deprecated users
 - system.openssh.server.team.members.deprecated.dshulyak
 - system.openssh.server.team.members.deprecated.mattymo
 - system.openssh.server.team.members.deprecated.mkwiek
 - system.openssh.server.team.members.deprecated.psiwczak
+- system.openssh.server.team.members.deprecated.pskamruk
 - system.openssh.server.team.members.deprecated.sgolovatiuk
 - system.openssh.server.team.members.deprecated.slagun
+- system.openssh.server.team.members.deprecated.sreshetnyak
 - system.openssh.server.team.members.deprecated.vefimova
-
+- system.openssh.server.team.members.apavlov
+- system.openssh.server.team.members.ashestakov
+- system.openssh.server.team.members.ekhomyakova
+- system.openssh.server.team.members.ishvedunov
+- system.openssh.server.team.members.jnowak
+- system.openssh.server.team.members.loles
+- system.openssh.server.team.members.skolekonov
+- system.openssh.server.team.members.slukjanov
+- system.openssh.server.team.members.sskripnick
+- system.openssh.server.team.members.vjigulin
+- system.openssh.server.team.members.vnaumov
+- system.openssh.server.team.members.vryzhenkin
+- system.openssh.server.team.members.ytaraday
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/maintenance.yml b/openssh/server/team/maintenance.yml
index d27d870..6df16f0 100644
--- a/openssh/server/team/maintenance.yml
+++ b/openssh/server/team/maintenance.yml
@@ -1,12 +1,12 @@
 classes:
 - system.linux.system.sudo
+- system.openssh.server.team.members.deprecated.msamoylov
 - system.openssh.server.team.members.dmeltsaykin
-- system.openssh.server.team.members.omolchanov
-- system.openssh.server.team.members.vkhlyunev
 - system.openssh.server.team.members.dtsapikov
-- system.openssh.server.team.members.rlubianyi
-- system.openssh.server.team.members.msamoylov
+- system.openssh.server.team.members.omolchanov
 - system.openssh.server.team.members.pglazov
+- system.openssh.server.team.members.rlubianyi
+- system.openssh.server.team.members.vkhlyunev
 - system.openssh.server.team.members.vsakharov
 parameters:
   _param:
diff --git a/openssh/server/team/mcp_qa.yml b/openssh/server/team/mcp_qa.yml
index 2fd001c..ac069bc 100644
--- a/openssh/server/team/mcp_qa.yml
+++ b/openssh/server/team/mcp_qa.yml
@@ -8,26 +8,26 @@
 - system.openssh.server.team.members.deprecated.okosse
 - system.openssh.server.team.members.deprecated.rkhozinov
 - system.openssh.server.team.members.deprecated.rpromyshlennikov
+- system.openssh.server.team.members.deprecated.sandriichenko
 - system.openssh.server.team.members.deprecated.schipiga
+- system.openssh.server.team.members.deprecated.snovikov
 - system.openssh.server.team.members.deprecated.ssokolov
+- system.openssh.server.team.members.deprecated.sturivnyi
 - system.openssh.server.team.members.deprecated.yshapovalov
-- system.openssh.server.team.members.mshalamov
-- system.openssh.server.team.members.sandriichenko
 - system.openssh.server.team.members.abaraniuk
 - system.openssh.server.team.members.aminasyan
-- system.openssh.server.team.members.imenkov
 - system.openssh.server.team.members.ddmitriev
 - system.openssh.server.team.members.dkalashnik
 - system.openssh.server.team.members.dtyzhnenko
 - system.openssh.server.team.members.ekhomyakova
+- system.openssh.server.team.members.imenkov
+- system.openssh.server.team.members.mshalamov
 - system.openssh.server.team.members.obutenko
 - system.openssh.server.team.members.sgudz
-- system.openssh.server.team.members.snovikov
 - system.openssh.server.team.members.tleontovich
 - system.openssh.server.team.members.vgusev
 - system.openssh.server.team.members.vnaumov
 - system.openssh.server.team.members.vryzhenkin
-- system.openssh.server.team.members.sturivnyi
 - system.openssh.server.team.members.ylobankov
 parameters:
   _param:
diff --git a/openssh/server/team/members/achuprin.yml b/openssh/server/team/members/achuprin.yml
deleted file mode 100644
index 1fb3b4b..0000000
--- a/openssh/server/team/members/achuprin.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        achuprin:
-          email: achuprin@mirantis.com
-          enabled: false
-          full_name: Alexey Chuprin
-          home: /home/achuprin
-          name: achuprin
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        achuprin:
-          enabled: false
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDho9gTE/kal/lx/edEa073OgsS5Fa+G3ffGUuhPKpqdXp3TfCKchAK1J13TsqW9lLpPLtnDo2OhgJSUwdr0pfNwVEBPldw0KblW/JQIImR/9nojU+IvribDdusRTOJh6i9hSzcLLFtrF8pkZ7S7oyGsOpD7pHoy+qNiDBO1eJ1fkOxkxztpqSjFFg6BaFtA40zLULsqgKIM0EsSgn3vFAQ2zsDWaGynnm/+tQvBj3ogrxblo94uZ+uUK6Z6v+jkZJKA5Nz+w76HAd51A646X3gF05i2LdyPpkWBp0Oqr5PVW66IGfyc+sY0ID35k+wT9tzv/aW4KOFtig5zf/Xv3nDbX0SlIrV5AMzk3pql2aCSE03JSkHb/Gujf1gqQ6ZqqbVFl7CSj2nIZ1DpWhGqw1lF6YH1pf/xbmg7qRAmDCelf/gCZaj9Pe6nA1a6CP5NJt5l3W20blaT5hYxHDqiBPOfTh8YGI16P1p7pV6VfBiQYZk5KGmOqVjIUfQH9axZcOgZjVmrFW8zZCg1VIA4qhYvVfFokL12ty3AiYkdIcDek3GH83LnLrkTX4D6PPzl6lF5f8bAiUfSjH5Yr2EmRxFWizi3LGiNe7QIxVQgB+B71luHG0ymy1Z080XJqZKMs/wosGxOJUiEvjd1i/jkImCNqlta3sBxnjJQRuzX3mUiQ== achuprin@mirantis.com
-          user: ${linux:system:user:achuprin}
diff --git a/openssh/server/team/members/akiseleva.yml b/openssh/server/team/members/akiseleva.yml
deleted file mode 100644
index 3f606c6..0000000
--- a/openssh/server/team/members/akiseleva.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        akiseleva:
-          email: akiseleva@mirantis.com
-          enabled: true
-          full_name: Alena Kiseleva
-          home: /home/akiseleva
-          name: akiseleva
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        akiseleva:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyxzlFKlCcfwagnnmCg1r9SUVfAgy/IdPSxsnpELjCRaz3FI66sYa1F1RdZngoXmYxe5qlmkiRQ0rCjIYk12I08du5FJGYQvMttJEgmVeHtFKW0o3uGBIKNJ5nCni3lR8idPTRXqhwdXYeA4A9+COQO4MGcaJZrqHgEviZt4jQrYy90WdqbKTD4meBRy4MC9+TOUs719kTxK54tmMHBq2l/ukmv3FwgtLz2xMeNW7htiS/1rzA9CEerjkvpc0mOxc4DCY4bH8sR2Ts3Y33Rx6aUN8shTij2aX2v8UvUay2JPqQTJicY+IsYl4D8w/XPx00Oj/3b54f6kTLlzzoNDq5 alena@alena-Lenovo-V580c
-          user: ${linux:system:user:akiseleva}
diff --git a/openssh/server/team/members/akurenyshev.yml b/openssh/server/team/members/akurenyshev.yml
deleted file mode 100644
index f075d11..0000000
--- a/openssh/server/team/members/akurenyshev.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        akurenyshev:
-          enabled: true
-          name: akurenyshev
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Alexander Kurenyshev
-          home: /home/akurenyshev
-          email: akurenyshev@mirantis.com
-  openssh:
-    server:
-      user:
-        akurenyshev:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDss1dA5rxJdgySDys0lJybCeIBT9mMUAV/KN0egSYRMIzAQKuy0Dg/e/HHwjLCeZn6Fjcb/W3+y+FMSmPnbbCLCJ59F4chivyU82iKnSs36BMdlUJH2tw2Bca88PibbE5oG620Qd8WZWZ/q8oN5G7onIx2pGv0SEwLHcGjex6bVPsNAXucn0VZE2SPlmEjWvTVpEWFpTQL1DjF4ARsD+hWm7z49JluG2cr+sfGa3b9M/ci9nMiRXJqMey5pD5xI/npVbwYEwUE7DcxedqmjEuxqZhjvcIAnHHeWz0+vtR/Ng4l1wDEqwJA8OfoXeuGnXEEgjJ9uJe0n8sNVb3dIDED akurenyshev@alex-pc
-          user: ${linux:system:user:akurenyshev}
diff --git a/openssh/server/team/members/anatoliineliubin.yml b/openssh/server/team/members/anatoliineliubin.yml
deleted file mode 100644
index 23dfe59..0000000
--- a/openssh/server/team/members/anatoliineliubin.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        aneliubin:
-          email: aneliuubin@mirantis.com
-          enabled: true
-          full_name: Anatolii Neliubin
-          home: /home/aneliubin
-          name: aneliubin
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        aneliubin:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCSj7OItCm3z4PerRp+KIh50YpYMzE2QV6xq+PnqrK4otDqjrXWRSEXiimsyWM7s3a9XsgGC9Tc1SUPX2r1ZLsKZUVpP0V8Amz1YTKAw9dJ43rhTMQEIPCsr5Bk3/b/criaWSWly7jsRDonqGor+EJAfQg/mEyYpa04wRZ2TYQKhM0o2mx7BKDV/Xc2QqskT4Vqimp91F/OXwDsLUP+NDSPtyG/AalNBez0p7PDPV1J/S8MipgPUGvQLddvvJ8VYxH66WpNt4IJVrc5YBp0ty8lj+WPFFxgaQ0yWHvjmlatGeAI70F8M/szdbIyn3ph9t7aXaGhOnWumqZkwqSWvY0F aneliuubin@mirantis.com
-          user: ${linux:system:user:aneliubin}
diff --git a/openssh/server/team/members/deprecated/achuprin.yml b/openssh/server/team/members/deprecated/achuprin.yml
new file mode 100644
index 0000000..ee82964
--- /dev/null
+++ b/openssh/server/team/members/deprecated/achuprin.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        achuprin:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/achuprin
+          name: achuprin
+  openssh:
+    server:
+      user:
+        achuprin:
+          enabled: false
+          user: ${linux:system:user:achuprin}
diff --git a/openssh/server/team/members/deprecated/ahecko.yml b/openssh/server/team/members/deprecated/ahecko.yml
index a6f9c87..9c4db6f 100644
--- a/openssh/server/team/members/deprecated/ahecko.yml
+++ b/openssh/server/team/members/deprecated/ahecko.yml
@@ -4,7 +4,7 @@
       user:
         ahecko:
           email: disabled
-          enabled: true
+          enabled: false
           full_name: disabled
           home: /home/ahecko
           name: ahecko
@@ -12,7 +12,5 @@
     server:
       user:
         ahecko:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGRD/zStceB/CAJu8bnsWs9VPWY8W1F6fz2AvX2BiyEXCE2W4uMY11In+qHQtIaWeyWVR/XmoCw0mZxk7emTz91Y1FioinEgumkhpNPLY0fPdDHzwu3atCjAc7B3ZCCXusiUC6k99aCa9YXIZ0/0/75kqilRmIcxGeneL9S2+iuFn/HSpNR7IZN03AEzWgIfXEhB4lyNs9n3RHf+XXy2wxAKkcKpMyocEO9gc3uLY5OdUhGFHRKhEZwgz3K6ysDOCIOTkiiJ8KXMM07FIDLjs5pjUjnVkZ1kWq+virLMbhhyCbMR8zrPvWMjP5oYGm9U9aEeUMA5iMCa7K+qs2AM3 adamheczko@mirantis
+          enabled: false
           user: ${linux:system:user:ahecko}
diff --git a/openssh/server/team/members/deprecated/aheczko.yml b/openssh/server/team/members/deprecated/aheczko.yml
index 65e5a0e..dee893b 100644
--- a/openssh/server/team/members/deprecated/aheczko.yml
+++ b/openssh/server/team/members/deprecated/aheczko.yml
@@ -4,7 +4,7 @@
       user:
         aheczko:
           email: disabled
-          enabled: true
+          enabled: false
           full_name: disabled
           home: /home/aheczko
           name: aheczko
@@ -12,7 +12,5 @@
     server:
       user:
         aheczko:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGRD/zStceB/CAJu8bnsWs9VPWY8W1F6fz2AvX2BiyEXCE2W4uMY11In+qHQtIaWeyWVR/XmoCw0mZxk7emTz91Y1FioinEgumkhpNPLY0fPdDHzwu3atCjAc7B3ZCCXusiUC6k99aCa9YXIZ0/0/75kqilRmIcxGeneL9S2+iuFn/HSpNR7IZN03AEzWgIfXEhB4lyNs9n3RHf+XXy2wxAKkcKpMyocEO9gc3uLY5OdUhGFHRKhEZwgz3K6ysDOCIOTkiiJ8KXMM07FIDLjs5pjUjnVkZ1kWq+virLMbhhyCbMR8zrPvWMjP5oYGm9U9aEeUMA5iMCa7K+qs2AM3 adamheczko@Adams-MacBook-Pro.local
+          enabled: false
           user: ${linux:system:user:aheczko}
diff --git a/openssh/server/team/members/deprecated/akiseleva.yml b/openssh/server/team/members/deprecated/akiseleva.yml
new file mode 100644
index 0000000..e672470
--- /dev/null
+++ b/openssh/server/team/members/deprecated/akiseleva.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        akiseleva:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/akiseleva
+          name: akiseleva
+  openssh:
+    server:
+      user:
+        akiseleva:
+          enabled: false
+          user: ${linux:system:user:akiseleva}
diff --git a/openssh/server/team/members/deprecated/akurenyshev.yml b/openssh/server/team/members/deprecated/akurenyshev.yml
new file mode 100644
index 0000000..1148ce6
--- /dev/null
+++ b/openssh/server/team/members/deprecated/akurenyshev.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        akurenyshev:
+          enabled: false
+          name: akurenyshev
+          full_name: disabled
+          home: /home/akurenyshev
+          email: disabled
+  openssh:
+    server:
+      user:
+        akurenyshev:
+          enabled: false
+          user: ${linux:system:user:akurenyshev}
diff --git a/openssh/server/team/members/deprecated/anatoliineliubin.yml b/openssh/server/team/members/deprecated/anatoliineliubin.yml
new file mode 100644
index 0000000..3eb7f01
--- /dev/null
+++ b/openssh/server/team/members/deprecated/anatoliineliubin.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        aneliubin:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/aneliubin
+          name: aneliubin
+  openssh:
+    server:
+      user:
+        aneliubin:
+          enabled: false
+          user: ${linux:system:user:aneliubin}
diff --git a/openssh/server/team/members/deprecated/dklepikov.yml b/openssh/server/team/members/deprecated/dklepikov.yml
new file mode 100644
index 0000000..c74a66b
--- /dev/null
+++ b/openssh/server/team/members/deprecated/dklepikov.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        dklepikov:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/dklepikov
+          name: dklepikov
+  openssh:
+    server:
+      user:
+        dklepikov:
+          enabled: false
+          user: ${linux:system:user:dklepikov}
diff --git a/openssh/server/team/members/deprecated/dsutyagin.yml b/openssh/server/team/members/deprecated/dsutyagin.yml
new file mode 100644
index 0000000..597f25f
--- /dev/null
+++ b/openssh/server/team/members/deprecated/dsutyagin.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        dsutyagin:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/dsutyagin
+          name: dsutyagin
+  openssh:
+    server:
+      user:
+        dsutyagin:
+          enabled: false
+          user: ${linux:system:user:dsutyagin}
diff --git a/openssh/server/team/members/deprecated/ivasilevskaya.yml b/openssh/server/team/members/deprecated/ivasilevskaya.yml
new file mode 100644
index 0000000..5bbea72
--- /dev/null
+++ b/openssh/server/team/members/deprecated/ivasilevskaya.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        ivasilevskaya:
+          enabled: false
+          name: ivasilevskaya
+          full_name: disabled
+          home: /home/ivasilevskaya
+          email: disabled
+  openssh:
+    server:
+      user:
+        ivasilevskaya:
+          enabled: false
+          user: ${linux:system:user:ivasilevskaya}
diff --git a/openssh/server/team/members/deprecated/javierdiaz.yml b/openssh/server/team/members/deprecated/javierdiaz.yml
new file mode 100644
index 0000000..c8c2dc1
--- /dev/null
+++ b/openssh/server/team/members/deprecated/javierdiaz.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        jdiaz:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/jdiaz
+          name: jdiaz
+  openssh:
+    server:
+      user:
+        jdiaz:
+          enabled: false
+          user: ${linux:system:user:jdiaz}
diff --git a/openssh/server/team/members/deprecated/jorgesorondo.yml b/openssh/server/team/members/deprecated/jorgesorondo.yml
new file mode 100644
index 0000000..2556e32
--- /dev/null
+++ b/openssh/server/team/members/deprecated/jorgesorondo.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        jsorondo:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/jsorondo
+          name: jsorondo
+  openssh:
+    server:
+      user:
+        jsorondo:
+          enabled: false
+          user: ${linux:system:user:jsorondo}
diff --git a/openssh/server/team/members/deprecated/mmatuszkowiak.yml b/openssh/server/team/members/deprecated/mmatuszkowiak.yml
new file mode 100644
index 0000000..355a8ec
--- /dev/null
+++ b/openssh/server/team/members/deprecated/mmatuszkowiak.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mmatuszkowiak:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/mmatuszkowiak
+          name: mmatuszkowiak
+  openssh:
+    server:
+      user:
+        mmatuszkowiak:
+          enabled: false
+          user: ${linux:system:user:mmatuszkowiak}
diff --git a/openssh/server/team/members/deprecated/msamoylov.yml b/openssh/server/team/members/deprecated/msamoylov.yml
new file mode 100644
index 0000000..c6a4e25
--- /dev/null
+++ b/openssh/server/team/members/deprecated/msamoylov.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        msamoylov:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/msamoylov
+          name: msamoylov
+  openssh:
+    server:
+      user:
+        msamoylov:
+          enabled: false
+          user: ${linux:system:user:msamoylov}
diff --git a/openssh/server/team/members/deprecated/obryndzii.yml b/openssh/server/team/members/deprecated/obryndzii.yml
new file mode 100644
index 0000000..cc587a3
--- /dev/null
+++ b/openssh/server/team/members/deprecated/obryndzii.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        obryndzii:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/obryndzii
+          name: obryndzii
+  openssh:
+    server:
+      user:
+        obryndzii:
+          enabled: false
+          user: ${linux:system:user:obryndzii}
diff --git a/openssh/server/team/members/deprecated/pskamruk.yml b/openssh/server/team/members/deprecated/pskamruk.yml
new file mode 100644
index 0000000..da73012
--- /dev/null
+++ b/openssh/server/team/members/deprecated/pskamruk.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        pskamruk:
+          enabled: false
+          name: pskamruk
+          full_name: disabled
+          home: /home/pskamruk
+          email: disabled
+  openssh:
+    server:
+      user:
+        pskamruk:
+          enabled: false
+          user: ${linux:system:user:pskamruk}
diff --git a/openssh/server/team/members/deprecated/sandriichenko.yml b/openssh/server/team/members/deprecated/sandriichenko.yml
new file mode 100644
index 0000000..a182506
--- /dev/null
+++ b/openssh/server/team/members/deprecated/sandriichenko.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        sandriichenko:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/sandriichenko
+          name: sandriichenko
+  openssh:
+    server:
+      user:
+        sandriichenko:
+          enabled: false
+          user: ${linux:system:user:sandriichenko}
diff --git a/openssh/server/team/members/deprecated/sgarbuz.yml b/openssh/server/team/members/deprecated/sgarbuz.yml
new file mode 100644
index 0000000..2638a80
--- /dev/null
+++ b/openssh/server/team/members/deprecated/sgarbuz.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        sgarbuz:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/sgarbuz
+          name: sgarbuz
+  openssh:
+    server:
+      user:
+        sgarbuz:
+          enabled: false
+          user: ${linux:system:user:sgarbuz}
diff --git a/openssh/server/team/members/deprecated/snovikov.yml b/openssh/server/team/members/deprecated/snovikov.yml
new file mode 100644
index 0000000..1e0484d
--- /dev/null
+++ b/openssh/server/team/members/deprecated/snovikov.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        snovikov:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/snovikov
+          name: snovikov
+  openssh:
+    server:
+      user:
+        snovikov:
+          enabled: false
+          user: ${linux:system:user:snovikov}
diff --git a/openssh/server/team/members/deprecated/sreshetnyak.yml b/openssh/server/team/members/deprecated/sreshetnyak.yml
new file mode 100644
index 0000000..edf4f92
--- /dev/null
+++ b/openssh/server/team/members/deprecated/sreshetnyak.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        sreshetnyak:
+          enabled: false
+          name: sreshetnyak
+          full_name: disabled
+          home: /home/sreshetnyak
+          email: disabled
+  openssh:
+    server:
+      user:
+        sreshetnyak:
+          enabled: false
+          user: ${linux:system:user:sreshetnyak}
diff --git a/openssh/server/team/members/deprecated/sturivnyi.yml b/openssh/server/team/members/deprecated/sturivnyi.yml
new file mode 100644
index 0000000..16abba2
--- /dev/null
+++ b/openssh/server/team/members/deprecated/sturivnyi.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        sturivnyi:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/sturivnyi
+          name: sturivnyi
+  openssh:
+    server:
+      user:
+        sturivnyi:
+          enabled: false
+          user: ${linux:system:user:sturivnyi}
diff --git a/openssh/server/team/members/deprecated/vnogin.yml b/openssh/server/team/members/deprecated/vnogin.yml
new file mode 100644
index 0000000..9597e92
--- /dev/null
+++ b/openssh/server/team/members/deprecated/vnogin.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        vnogin:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/vnogin
+          name: vnogin
+  openssh:
+    server:
+      user:
+        vnogin:
+          enabled: false
+          user: ${linux:system:user:vnogin}
diff --git a/openssh/server/team/members/dklepikov.yml b/openssh/server/team/members/dklepikov.yml
deleted file mode 100644
index 7db4a2b..0000000
--- a/openssh/server/team/members/dklepikov.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        dklepikov:
-          email: dklepikov@mirantis.com
-          enabled: true
-          full_name: Denys Klepikov
-          home: /home/dklepikov
-          name: dklepikov
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        dklepikov:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7yxcnhYEf/Gjbxp9T7NiA00UQsl13K8dGDjcc38HAQ0tdFs4SIMpsfAXHO4aOuo6fHH0fZ+f+tpWfmgzPVG8zblRxD6hhydvWMDUCUy/1ASAZaXeWeeikOXSIammoZHQ7oASK1tYpDkfByMyN0vvLJ2bBZlZWqz7H/07EF2eOTqvKhPkdTKX0pei9ezE4F7lrV5AxDfPR1lhuZRkZkVlKz/dEotbwnTTSNvwzVIDMpOi8ufG7kMszUO+QIUd1FwJLvtu8ccSiqzhAG/UfKfe+j4oJbgdNW9Yrg6GyuYshdKUJi5XlVmsmWC3ZuXozMmZXvitCdXOZBZ7muT/xpPnr dklepikov@dlkepikov-ws
-          user: ${linux:system:user:dklepikov}
diff --git a/openssh/server/team/members/dsutyagin.yml b/openssh/server/team/members/dsutyagin.yml
deleted file mode 100644
index 937fbaf..0000000
--- a/openssh/server/team/members/dsutyagin.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        dsutyagin:
-          email: dsutyagin@mirantis.com
-          enabled: true
-          full_name: Dmitry Sutyagin
-          home: /home/dsutyagin
-          name: dsutyagin
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        dsutyagin:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDdI8HkSB2RUOpkgBhn00UX0Vm78e2JXpMbyi1Qbh2c3dMcXdtY0kIFio/jfuR9rxKmN/oeV+E92YZviq7kg3/2qWfAR5fxlOCe7tDxR5lbkYUye9Y/SGzU5dLPMs4GjLWNk8hX9Wyf49TWC0lEIR05g/aIo7ZrH9sZwdQ9kte9GpID282O0KsJvy/UR3pBKECh/QZ4et4mgzZOFWldJrfs62Y6R4ZUaCxWbHpi+56AqwRSW4+FxepcJDUBC3+o8Xe1Jgcq7bHpHz1StWJmMi4U/b7dtANvp9m1VMe21a5bdt91EkyjL5ArhO7jMB49v7Pm5/EAN7BDtmqs9m/9CQ7vfVrM8XLTH4Ob0MIBwuo1JJR1NqSgWAkxLQWe2KIN6kCwi1z2pZ4iSB78/5RX/ZPBN7I1OHkbO50aFqJO3/2keYpTG5f1eFwDOsslrSzzcrNvQiYo3n75m+Skdv/ziBW504cCgwdAwxSrd+urUuk9KdNAckzR/S8/qrO0Vh4ZDkJ93TtxqDghyvtdqH4VNaWf8BJmVFCoM5jPpEQYsLBdvLRUtKP2CTtxXoZQap6pvl5N84o1zcnDZW74JeOXrpjClgx0KhKJjPjbtl0EtPOB2rsz+92XtU3aocqChwzR2IGrXfdSzXAvHc3PpYWunzRlFO7eJCdOE7vgCSo18iIlAw== dsutyagin@mirantis.com - office laptop
-          user: ${linux:system:user:dsutyagin}
diff --git a/openssh/server/team/members/ivasilevskaya.yml b/openssh/server/team/members/ivasilevskaya.yml
deleted file mode 100644
index f4240be..0000000
--- a/openssh/server/team/members/ivasilevskaya.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        ivasilevskaya:
-          enabled: true
-          name: ivasilevskaya
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Inessa Vasilevskaya
-          home: /home/ivasilevskaya
-          email: ivasilevskaya@mirantis.com
-  openssh:
-    server:
-      user:
-        ivasilevskaya:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJk2ip+Rn73D4vt47pe/Hv42ylKJv6JIzeF0k3OflH+RyliVelvo05KMcozfsmmvOKhwgDokBj3KjQ10ewDwD7Fz5H3tosa8JFOs36cuHx9aHrsEmj1oIcIyThrIBwSZGFApqJqj27sLtReVLQJPlYR59RJGw61TogkA/QooOABi+KHzuwPFjAcA1SMfFT8LwiaNPkyUdRb5EQeKCOHniRAEPGNIwskA0sxz25qbB1EU2XBFjkxRE1b5GHfUYL+c2YhAwRWTJbD2JbbcHI6HpsmJutzkS6YIkEn1CK4JuA40OQTYFSEutCk2uPPR0G+77Fec2+vD/8H+ncPxPeDqNR ina@ina-ThinkPad-X240 
-          user: ${linux:system:user:ivasilevskaya}
diff --git a/openssh/server/team/members/javierdiaz.yml b/openssh/server/team/members/javierdiaz.yml
deleted file mode 100644
index 2de968b..0000000
--- a/openssh/server/team/members/javierdiaz.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        jdiaz:
-          email: jdiaz@mirantis.com
-          enabled: true
-          full_name: Javier Diaz
-          home: /home/jdiaz
-          name: jdiaz
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        jdiaz:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/2Kwi/+MO2AowwwQ5S4x3tif+6L8bCHKDV+BNfxezn55j0CMGUNMXSH6p384Zu5DuCWhU8AmdZ+rczGgc9vsdgb8Kukdi19C7vaXLIkjw1ztEkB8xgpXwDrx6O6GNtCmNq2FF1LTHTgs+r6VTKxl3yDGPd01m/fuf7Kq/hb+5out7soXC0eePKwYgFtIngxaFEiGA5sNNETrp8wys4EI2u1Az7C37cchR2qAUILRz01zt7Mp2ma+LNaZx3/bbIHI34EKypCYCFFQq+fodMDiwG15xhsdU8FEVj1NREN1kSOO2xr9IujalNskIfaXsIu7tE/6B4rI0Sl7W/PVw+cFr
-          user: ${linux:system:user:jdiaz}
diff --git a/openssh/server/team/members/jorgesorondo.yml b/openssh/server/team/members/jorgesorondo.yml
deleted file mode 100644
index c21a8df..0000000
--- a/openssh/server/team/members/jorgesorondo.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        jsorondo:
-          email: jsorondo@mirantis.com
-          enabled: true
-          full_name: Jorge Sorondo
-          home: /home/jsorondo
-          name: jsorondo
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        jsorondo:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYN/Y6PeKVaW+ouilurh9jyi2k+PDn097LPXxi82ODgPJ+p/qzr6oBYIWDNtudMhNTWA1uV2ZnMbbl67REWAc8V++NFQWtAX9lmtQ4S5w/CvWutgGqrUr7gjJJoq/ySMMFE1F3sekdPM90y2JS4K1L300de5UviAwgPMo48wq292MaESqq6/X7CV3VHDy5srA1VFI1oZMv66NpOO2mHzElKMtVISTHF8/W4yg1P7LvjlcH2vB2clfO6UtOZfcDaAibAyE+bClUYzK6YSRejni5hWaRYFOvza3PyIF6YvjznPxtTU4aclmiZrtMm5gLZB/euvkijXuBOPFO0xgDw6Q9
-          user: ${linux:system:user:jsorondo}
diff --git a/openssh/server/team/members/mmatuszkowiak.yml b/openssh/server/team/members/mmatuszkowiak.yml
deleted file mode 100644
index 43fb88e..0000000
--- a/openssh/server/team/members/mmatuszkowiak.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        mmatuszkowiak:
-          email: mmatuszkowiak@mirantis.com
-          enabled: true
-          full_name: Mateusz Matuszkowiak
-          home: /home/mmatuszkowiak
-          name: mmatuszkowiak
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        mmatuszkowiak:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDC6TGCQAH3FGNSOhSbovhwODabOAsgVqG71rEDdXvDSShwyNB3RIICefas3mdSLsG7+1K9mZ1jicWzNbotvePwzrM/MESzntzp4QZ5J/9L3BMiqWWKL2u6BQ65LGe0YMzMmdSkqMAj0uxt3+OiFDPDrwqH6qN0hwxAJM+byeUlQW8uWQYm/pmWMD60GUrnjYUfKfEa/S3symaZBHQvjtp26De8D6u/jr4TWi5VJpKqVREqU7Z4IKwn8JvHMmUbRO4endW3cRiv35Qb7s66rO6TD0KlDFnnTxOtFvLhL51j58X4MrV9FHUI6czoqjAgEDe9CW7DzZ1xMj03d6IAipgL
-          user: ${linux:system:user:mmatuszkowiak}
diff --git a/openssh/server/team/members/msamoylov.yml b/openssh/server/team/members/msamoylov.yml
deleted file mode 100644
index 70ddb80..0000000
--- a/openssh/server/team/members/msamoylov.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        msamoylov:
-          email: msamoylov@mirantis.com
-          enabled: true
-          full_name: Mikhail Samoylov
-          home: /home/msamoylov
-          name: msamoylov
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        msamoylov:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvWBvRN2uYS0eolhaXRbsp8w5QM0B4ebpuTK3cT60ZLnxr99HrzBqwH6KjGkt9/V0xdUo6wuSjh+r6xuCUae7owC6T8fnUYuVt6Fyd9Wh33tjMIfj+EZBZLrmQW3X0OqwY1x3/YIzzfLlrtF9JwHvGcbt9nv7h+2jAh0iPB8p+1ITrzkJ9UZK6LSmeB1w6HVqJDqLZuz/R6pyRciSbIc5uTVXy8RJAp4Tsak6SDXJcZMm8WQT5g2ZHVRriVmca/Iy++xNuPIqL3TwX9y3KHksQY2E3yiOURn3b5hovVXHuTuRLMZo4yuT4nKSRylsRnPX0HH9cdgI6/DIRL+52HLAv msamoylov@msamoylov
-          user: ${linux:system:user:msamoylov}
diff --git a/openssh/server/team/members/obryndzii.yml b/openssh/server/team/members/obryndzii.yml
deleted file mode 100644
index 28ebf03..0000000
--- a/openssh/server/team/members/obryndzii.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        obryndzii:
-          email: obryndzii@mirantis.com
-          enabled: true
-          full_name: Oleksandr Bryndzii
-          home: /home/obryndzii
-          name: obryndzii
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        obryndzii:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCHoSxtdURZfgjJbbcKDA4TUUTixKVcRkGfgISYu55IF3scjoFRynaFP4zjBIitcTzxuvo7ZlE5ymxMHC0UNm5HU8tjmVscKcQs73lrjTr7jT24dZ8mr27nEbuTOa73FotPoIH5ao0wSSDc7PDXRUvJNI3xoZAd2KW1NZVRFFJ5jo/byuIfqIJLIAvOBTyUDoIrbL+3/WFIjdZ8MPlfyC8Bi09KfrM4hmzGDja4Mcfm4M7kMcw+B2DCpTtYUFCqjuYgTNC6EbTch21Afe9MCtdVqBBddFKFDU0WZtKfcHTuOVfiSrK47jA0ljU6HdHxFGmh3cz1ajux58T6/RHfXID obryndzii@obryndzii-pc
-          user: ${linux:system:user:obryndzii}
diff --git a/openssh/server/team/members/pskamruk.yml b/openssh/server/team/members/pskamruk.yml
deleted file mode 100644
index b0d4ead..0000000
--- a/openssh/server/team/members/pskamruk.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        pskamruk:
-          enabled: true
-          name: pskamruk
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Piotr Skamruk
-          home: /home/pskamruk
-          email: pskamruk@mirantis.com
-  openssh:
-    server:
-      user:
-        pskamruk:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTsdLa6F59A7ggGr1kXT5Hsg0sKXRA2zw2DApFU/DinDZ95d82hY5r26HRoPvEebslXUtpYei1T1w6XKSV6x9U0y/4+Wmdxnl+SADWqFWH8k7CJv3kONK7GhTT4fMpwt88ZHiVUwoTf5CdzhzNL1vd6NWpjt9qIq0G/4n0Ds/5paUFLJ5OIm7ealekMCmiOCQac/FgZYcQAdXr0nalhZkQzV4OOf9cxxftGTTq4ppLEF0I7aswWadN60qdmM2muRMpiaFZweyIH8f8wlqcYYFgd8N1RQmBqKcP6i6ukJLuvzqGb0aeCcv0h9i6ijZzC8s7DTYATn6TpD2XN4E4Adup jell@Piotrs-MacBook-Pro.local
-          user: ${linux:system:user:pskamruk}
diff --git a/openssh/server/team/members/sandriichenko.yml b/openssh/server/team/members/sandriichenko.yml
deleted file mode 100644
index 9415c7b..0000000
--- a/openssh/server/team/members/sandriichenko.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        sandriichenko:
-          email: sandriichenko@mirantis.com
-          enabled: true
-          full_name: Sofiia Andriichenko
-          home: /home/sandriichenko
-          name: sandriichenko
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        sandriichenko:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC36ZGwGD7WgfEwCDfSkQjiNI3cfgitrRcY+QzXP1+HNLwGoRFiZwmOp2vuYE2JiwvZfxVGXfmFmlDqypFA+H+gNobizGM2S/w7Hz8S5Qja75YBWty9KqdwcRVo7+/cPi4IHsWDxb1xpsiiFMfW2RRvrA3rE131xhwwnfKdZBj5HTlDO+qLIJD0FbJVYehKhJwIJuVGKQyVgj3hepaO17UTbG6IqtZeDz6nb9Sl+3eX5zS+8xS86cHf868M09zmxwrA3uI/eyYT49kMZN+HUezqvrZSG7v3ociOh9P1TI+4TIJN7JaRUAen7hTV2ufgZtNUrOzqXZTuUTmJQmRapAi9 sandriichenko@sandriichenko-pc
-          user: ${linux:system:user:sandriichenko}
diff --git a/openssh/server/team/members/sgarbuz.yml b/openssh/server/team/members/sgarbuz.yml
deleted file mode 100644
index 00a3be1..0000000
--- a/openssh/server/team/members/sgarbuz.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        sgarbuz:
-          email: sgarbuz@mirantis.com
-          enabled: true
-          full_name: Serhii Garbuz
-          home: /home/sgarbuz
-          name: sgarbuz
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        sgarbuz:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKDwmQ8Zf6X4Ztu7MDaggm6Y2/hpf8Y7gQFcfqX0q84a9OZLw5jLgqTXewKW+0LPAsF7Gx0K7G9mFtcvXb5B74cbLg8SnETMET6t6fipOOVVu17/2N5RFGJ0Alwia0WQCDmGv6yYRB63NgFcavvcD8AEQ2LTlGIU8zPclq1j2kOJNLzH0xVsOiUTdEeUk8mOMBqSHQxVCZeyBBpkLHeECiM7AzsVtCWo1R+Sdo82BHs4+Ig9SOhIjLstBXS9DSjS6gzTOQLvCoGjB2P8spllSX0QtPXXNZndKfrj1YWht5O456ILTCocT8F/OGehy+7QL4+iq7JWBXn7ZamO+l8ceH sgarbuz@sgarbuz-pc
-          user: ${linux:system:user:sgarbuz}
diff --git a/openssh/server/team/members/snovikov.yml b/openssh/server/team/members/snovikov.yml
deleted file mode 100644
index 19afd9f..0000000
--- a/openssh/server/team/members/snovikov.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        snovikov:
-          email: snovikov@mirantis.com
-          enabled: true
-          full_name: Sergey Novikov
-          home: /home/snovikov
-          name: snovikov
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        snovikov:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYj97WGfiL550eVPyQmFyrgpTw61tfins1CpgrZewWqAWJMgYklRdMYl4OReE5UO2po7ag0f/QsOtGU8aQbnxnWUYPZyS3Qk+Bg8OOSBmewPxmT7WH97KdGKBdC9b3xUNFOUXEUOMmOe3jq9YET+xebUnfsA5qwYU5dL9Cb5UAPzVxYI8z5RiaNTo8dtwZr7lbJJRy8YfSWCtiD59vewc6BE2NTUyDjsfmKd9K/IkyKboGU9AC5mLYDsjvWwiGcNdfigRyaYWKmoo7Xhe1W2Og4dpI5pozOwVg7hISW9NRgLXrZP/9me1rFBH7EQjpjO3+Pto1//R3Nx9QLsB59yuj snovikov@snovikov
-          user: ${linux:system:user:snovikov}
diff --git a/openssh/server/team/members/sreshetnyak.yml b/openssh/server/team/members/sreshetnyak.yml
deleted file mode 100644
index 52e341d..0000000
--- a/openssh/server/team/members/sreshetnyak.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        sreshetnyak:
-          enabled: true
-          name: sreshetnyak
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Sergey Reshetnyak
-          home: /home/sreshetnyak
-          email: sreshetnyak@mirantis.com
-  openssh:
-    server:
-      user:
-        sreshetnyak:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbc8cUMy2Stjq4qS8TaVGvTIUGetpgTcLCiW3NnG5Yqe+s+nlQnIL3ezvgSKHin4/PYHl8vV9FnmLdPLk+4eefoek1px8soW/B+Ri0KN6aQUy1ztcecMxcxRH9g4VLZWTbazqGsADwRCQVPXmyIQVQN5wMKd0IzXUp5c03dWv/I1PE7QPdKySrdhjjyo+1Npx/tQjtJaSnGCaUJrXfHXBxiiENzmHuY+se14nWV9RyYN3zRWsa8Yt1n2hWNNiKNfT89h6yFwZAxdsS+jGhzbGTLcWyAqq3sfvvgm0yeL5FEm0AKaOMv7AuM5LqjPkQE4zzCGA0j19EQlAjsVcvKHGH sreshetniak@workstation
-          user: ${linux:system:user:sreshetnyak}
diff --git a/openssh/server/team/members/sturivnyi.yml b/openssh/server/team/members/sturivnyi.yml
deleted file mode 100644
index 508b5dc..0000000
--- a/openssh/server/team/members/sturivnyi.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        sturivnyi:
-          email: sturivnyi@mirantis.com
-          enabled: true
-          full_name: Serhii Turivnyi
-          home: /home/sturivnyi
-          name: sturivnyi
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        sturivnyi:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCpgvyWHyyNPhIPpUzUXyad8eORO5w1s9CDiSqOCSmWLGn8o+LA0Q7qtU845N5xsyL5Zm+9XDS2A85N6iPCVUrxIh6jm7OmC3FJ0doB1iP11KVv0u8U08zDut+ojOQK+WgqrhLf6bAQKnHctzANss2eCHfFtSYtskEDJc+fbnT1bZez/qvHW9LtpEBTWn4qn3GBYRgdTaWb3R/QAzQ/IMPOzVfKqFyBER8gK6vh0M7hB5/fP5Qe4G2HLpkNc8xj1nLqzYGmJdtckKjMEnlkItVkXNGxjcbnIshJCELhc3BWgH3lWs3UE5yzKyexYYs+37Q0ajasLoM8HIybK9nUrp2hwaQjoRSO+pMWLvJSYdVB2DyRDAUh7vtFazJG4VDHz542WFekwyh9pZ37SdnC5M93FXT87lK2fFS6UcxRyjHDKbgBOzDNXR2fdRA3fk6GWSv5VI5zSko2fVD8AlJRkd3DokFIb7GbwDuXrOMMkJVJ5C9B3FeGJ1hRDlVD2oS4osGtZV18E9b7xeIJZgaVRHYaFHRjAaCRdsCU6yeUTPI1Xj67yudAz/Jad4fR+/ToiV7bnTzZ4yuskpOuLF/bLf/N+DxgDDS46K0ODf6V/pgh3djBV5vIAqKulH9KXTa+k+5v3BHCHhqnOxM9EcGTmNY0mpmPzRPTekZ+lGCa79RRYw== sturivnyi@mirantis.com
-          user: ${linux:system:user:sturivnyi}
diff --git a/openssh/server/team/members/vnogin.yml b/openssh/server/team/members/vnogin.yml
deleted file mode 100644
index b569696..0000000
--- a/openssh/server/team/members/vnogin.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        vnogin:
-          email: vnogin@mirantis.com
-          enabled: true
-          full_name: Vitaliy Nogin
-          home: /home/vnogin
-          name: vnogin
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        vnogin:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiuKuC+aACWPhwTg1liOOGMAvL3zSMcgU2ZfjN6NMLMyekJqD7sr9NwJkeXEt6wr1YSelfYDcUjdu2ZyQHzfQ8CaNrTAlrNYUc+UlUqqydbO1d89j/MMn8fUAuFBu1vLMOqfNW8nPRmy327blmvSxBq2Oz9wSf/z/3lB4TVJKGwB61ciQn08FwFAitCN9cdfBthjRJXrhs/7kt0/An8O0p43LNa1aQ5QeaxLUAqMZa3VxkAaEwFzm/E/Vg4SPEJLijfCWYPozkZttoS2ud0HAJR87jya/BaCrtSAOqX55cLzWGABlvDWFprwo/59aJw7WlE8Y2bgxhtnFRdaHuIk7T vnogin@MacBook-Pro-Vitalii.local
-          user: ${linux:system:user:vnogin}
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index 6f86bc5..aa95189 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -1,26 +1,25 @@
 classes:
-- system.openssh.server.team.members.skreys
-- system.openssh.server.team.members.smatov
-- system.openssh.server.team.members.ivasilevskaya
-- system.openssh.server.team.members.jcach
-- system.openssh.server.team.members.psvimbersky
-- system.openssh.server.team.members.gzimin
-- system.openssh.server.team.members.dpyzhov
-- 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
-- system.openssh.server.team.members.akurenyshev
-# Deprecated users
-- system.openssh.server.team.members.deprecated.pjediny
+- system.openssh.server.team.members.deprecated.akurenyshev
 - system.openssh.server.team.members.deprecated.akuznetsova
 - system.openssh.server.team.members.deprecated.eezhova
+- system.openssh.server.team.members.deprecated.ivasilevskaya
 - system.openssh.server.team.members.deprecated.mceloud
+- system.openssh.server.team.members.deprecated.pjediny
+- system.openssh.server.team.members.aignatov
+- system.openssh.server.team.members.akasatkin
+- system.openssh.server.team.members.asamoylov
+- system.openssh.server.team.members.ataraday
+- system.openssh.server.team.members.dpyzhov
+- system.openssh.server.team.members.gzimin
+- system.openssh.server.team.members.ibumarskov
+- system.openssh.server.team.members.ichukhnakov
+- system.openssh.server.team.members.jcach
+- system.openssh.server.team.members.mrasskazov
+- system.openssh.server.team.members.obondarev
+- system.openssh.server.team.members.psvimbersky
+- system.openssh.server.team.members.skreys
+- system.openssh.server.team.members.smatov
+- system.openssh.server.team.members.svasilenko
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 8a0f8cb..e62953d 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -1,23 +1,23 @@
 classes:
 - system.linux.system.sudo
-- system.openssh.server.team.members.vsaienko
-- system.openssh.server.team.members.vnogin
-- system.openssh.server.team.members.mkarpin
-- system.openssh.server.team.members.iudovichenko
-- system.openssh.server.team.members.vdrok
-- system.openssh.server.team.members.ikolodyazhny
-- system.openssh.server.team.members.ohryhorov
-- system.openssh.server.team.members.ogrudev
 - 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
-- system.openssh.server.team.members.obryndzii
-- system.openssh.server.team.members.dteselkin
-- system.openssh.server.team.members.vmarkov
-- system.openssh.server.team.members.opetrenko
+- system.openssh.server.team.members.deprecated.obryndzii
+- system.openssh.server.team.members.deprecated.sgarbuz
+- system.openssh.server.team.members.deprecated.vnogin
 - system.openssh.server.team.members.apodrepnyi
 - system.openssh.server.team.members.avolkov
+- system.openssh.server.team.members.dteselkin
+- system.openssh.server.team.members.ikolodyazhny
+- system.openssh.server.team.members.iudovichenko
+- system.openssh.server.team.members.mkarpin
+- system.openssh.server.team.members.ogrudev
+- system.openssh.server.team.members.ohryhorov
+- system.openssh.server.team.members.opetrenko
+- system.openssh.server.team.members.oshyshko
+- system.openssh.server.team.members.pshchelo
+- system.openssh.server.team.members.vdrok
+- system.openssh.server.team.members.vmarkov
+- system.openssh.server.team.members.vsaienko
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/stacklight.yml b/openssh/server/team/stacklight.yml
index 2d20aad..7a2e415 100644
--- a/openssh/server/team/stacklight.yml
+++ b/openssh/server/team/stacklight.yml
@@ -1,20 +1,18 @@
 classes:
-- system.openssh.server.team.members.dkalashnik
-- system.openssh.server.team.members.isvetlov
-- system.openssh.server.team.members.mmatuszkowiak
-- system.openssh.server.team.members.mkobus
-- system.openssh.server.team.members.sbanka
-- system.openssh.server.team.members.vgusev
-# Deprecated users
 - system.openssh.server.team.members.deprecated.akholkin
 - system.openssh.server.team.members.deprecated.akomarek
 - system.openssh.server.team.members.deprecated.bkupidura
 - system.openssh.server.team.members.deprecated.kszukielojc
+- system.openssh.server.team.members.deprecated.mmatuszkowiak
 - system.openssh.server.team.members.deprecated.nzaporozhets
 - system.openssh.server.team.members.deprecated.obourdon
 - system.openssh.server.team.members.deprecated.rpromyshlennikov
 - system.openssh.server.team.members.deprecated.spasquier
-
+- system.openssh.server.team.members.dkalashnik
+- system.openssh.server.team.members.isvetlov
+- system.openssh.server.team.members.mkobus
+- system.openssh.server.team.members.sbanka
+- system.openssh.server.team.members.vgusev
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/storage.yml b/openssh/server/team/storage.yml
index f22cbf9..5c7913f 100644
--- a/openssh/server/team/storage.yml
+++ b/openssh/server/team/storage.yml
@@ -1,4 +1,4 @@
 classes:
-- system.openssh.server.team.members.akiseleva
+- system.openssh.server.team.members.deprecated.akiseleva
 - system.openssh.server.team.members.mlos
 - system.openssh.server.team.members.mvollman