diff --git a/openssh/server/team/members/avolkov.yml b/openssh/server/team/members/avolkov.yml
deleted file mode 100644
index f435ca9..0000000
--- a/openssh/server/team/members/avolkov.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        avolkov:
-          email: avolkov@mirantis.com
-          enabled: true
-          full_name: Andrey Volkov
-          home: /home/avolkov
-          name: avolkov
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        avolkov:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCUd3Qs1HNKgLF1B6qFntcnv4YMvGH6l4kBRdxvUWbTBwMekSFbJ0pnILNVQ8bC7oxFyCUOY/d074BtYcGILjwAbGBNztfi+g97GJYMkwsmmKVPucOy1ojakMg0s6ketQr3AM8YA7z0sbYMP7nbioaJMPhGKai0HRM4vPMSyH/3n9vFzkH9amBZEnTB15ZiXnUzLliyBMgyDUKvEOX072soYXR9TDWvE/TwAHiZdPh6gCMl4+yCinwS7baf9JuaQXn2P9SgCyx6uigAwvfn/XEwDqKFsso+4U53vR4RyktqzdSdFcf2UBUQlRMwvISwJTnLPfBsspQTRNlGqfAP+fd amadev@quasimodo
-          user: ${linux:system:user:avolkov}
diff --git a/openssh/server/team/members/deprecated/avolkov.yml b/openssh/server/team/members/deprecated/avolkov.yml
new file mode 100644
index 0000000..737db86
--- /dev/null
+++ b/openssh/server/team/members/deprecated/avolkov.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        avolkov:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/avolkov
+          name: avolkov
+  openssh:
+    server:
+      user:
+        avolkov:
+          enabled: false
+          user: ${linux:system:user:avolkov}
diff --git a/openssh/server/team/members/deprecated/deremeev.yml b/openssh/server/team/members/deprecated/deremeev.yml
new file mode 100644
index 0000000..876b4bf
--- /dev/null
+++ b/openssh/server/team/members/deprecated/deremeev.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        deremeev:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/deremeev
+          name: deremeev
+  openssh:
+    server:
+      user:
+        deremeev:
+          enabled: false
+          user: ${linux:system:user:deremeev}
diff --git a/openssh/server/team/members/deprecated/efedorova.yml b/openssh/server/team/members/deprecated/efedorova.yml
new file mode 100644
index 0000000..cd0af38
--- /dev/null
+++ b/openssh/server/team/members/deprecated/efedorova.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        efedorova:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/efedorova
+          name: efedorova
+  openssh:
+    server:
+      user:
+        efedorova:
+          enabled: false
+          user: ${linux:system:user:efedorova}
diff --git a/openssh/server/team/members/deprecated/ikolodyazhny.yml b/openssh/server/team/members/deprecated/ikolodyazhny.yml
new file mode 100644
index 0000000..7c92478
--- /dev/null
+++ b/openssh/server/team/members/deprecated/ikolodyazhny.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        ikolodyazhny:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/ikolodyazhny
+          name: ikolodyazhny
+  openssh:
+    server:
+      user:
+        ikolodyazhny:
+          enabled: false
+          user: ${linux:system:user:ikolodyazhny}
diff --git a/openssh/server/team/members/deremeev.yml b/openssh/server/team/members/deremeev.yml
deleted file mode 100644
index 2d7b54c..0000000
--- a/openssh/server/team/members/deremeev.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        deremeev:
-          email: deremeev@mirantis.com
-          enabled: true
-          full_name: Eremeev Mitya
-          home: /home/deremeev
-          name: deremeev
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        deremeev:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQ606VX7rs7Jd5pMBeZiLGRooK+JvKC55+lSvFOsVr5MnWNmSNFtN1Lt1jKVoX22ZYnWnp7RmWWSkLtv43KZ46EsNMZUCdlZOj9Md+7/T7EVQV4PpSJBCgrHSQ6TmQCzPBiGHZ0AvrHRrgKDA7nTGeYotbYVIgd8PAMPXwPRxrc6tUQ2cXT8gXXJBczrdZ8QCdg5/AThRVt7RBpXSq94F5XiPtYvrryzqg7KqgVbF728FBnV9naQ6tMDwvVud6DMxPaGc9p9TLaLxxLXLh4FrDrB2P7SvwnCdLEs9yRQ6AWcr2HqWZLUXRDwWr/EFafG4SCFxCsUJUl5lF0frJ+dOl88OWSzHkrkSLmmTcoYAoZvMoaH05V/U2s02gSilPyIwADKtk3UGGHPA7N4XIAcrjh3krJUsXqKzbDv6MKqBTT9P85Ecw20OjqyVH+IzB4DuVDFX3YzoU1SQI8LfFgg7O8gJy7R/HSJaQCVMssGeJK3JQ3JxyJe5kRevLV9zsBRs= deremeev@mirantis.com
-          user: ${linux:system:user:deremeev}
diff --git a/openssh/server/team/members/efedorova.yml b/openssh/server/team/members/efedorova.yml
deleted file mode 100644
index 8f37847..0000000
--- a/openssh/server/team/members/efedorova.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        efedorova:
-          email: efedorova@mirantis.com
-          enabled: true
-          full_name: Ekaterina Chernova
-          home: /home/efedorova
-          name: efedorova
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        efedorova:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2WZDqD0R/6RNSx4KdR5QD/jmCWnl/4QHHZeu679gP6Sdy/Z2/Qzf9k7hBSwLFExjLCu4dIJGhdvB1HoG3S5qIqdhfKZTkJp2ackDPnegSAhgqem/tXcyQrMOe8jtCCK375kwsMV5dJkxadbv5Qb71TdwHeBsV5B3Kmi5q0WwSlzsq3AI8OvNn4KeSeEGGv2lK6Ddxwl1u5IcSf5G0zBGc8s0mwGPnsBIATfiztX61MkqyDPIuYacRpkaDLX5v/X7eYqxYxDop6OBLxR+mgivluDEyDaQ9DKHO5ypQIiAk359CxMSQ9T+y5WSL0MdgYSKxFsK8jzo6JquZC54ZUQKb efedorova
-          user: ${linux:system:user:efedorova}
\ No newline at end of file
diff --git a/openssh/server/team/members/ikolodyazhny.yml b/openssh/server/team/members/ikolodyazhny.yml
deleted file mode 100644
index 697f97a..0000000
--- a/openssh/server/team/members/ikolodyazhny.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        ikolodyazhny:
-          email: ikolodyazhny@mirantis.com
-          enabled: true
-          full_name: Ivan Kolodyazhny
-          home: /home/ikolodyazhny
-          name: ikolodyazhny
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        ikolodyazhny:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyzhJRhNTqFXr6i21Jel+AFEM4bp6ExFkydkTQfF6OPBQBzDhUjxHac/6wrsmG906gMszjym0riJDh4EWQ0pj162hXBz5hdcmyKxBPC6NbhJU4NjsSpwcPB7fx/OsyWXGcvWUYMUuRv86QS5hwLleY+Z2KoJlnAwe+h6pMT5IG/JvwHg6A1Z6l24DZdpkXqhdeupM6Ot+ODRAsPvMKgy9DxVfs+DaFGtQn0dPYHGa24qoNf56kRQ2DLSJQe9n6LkW41NXYgvO21fSml7vsGAHTAjDj3ZqwlNZX28ti9Bkd0iXe1UPYkoMuLWxhAq25XMvPdyOBYYnyfHyamJqSHGz/Q==
-          user: ${linux:system:user:ikolodyazhny}
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 57f0812..1fcc93f 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -1,6 +1,10 @@
 classes:
 - system.linux.system.sudo
 - system.openssh.server.team.members.deprecated.apodrepnyi
+- system.openssh.server.team.members.deprecated.avolkov
+- system.openssh.server.team.members.deprecated.deremeev
+- system.openssh.server.team.members.deprecated.efedorova
+- system.openssh.server.team.members.deprecated.ikolodyazhny
 - system.openssh.server.team.members.deprecated.kkushaev
 - system.openssh.server.team.members.deprecated.obryndzii
 - system.openssh.server.team.members.deprecated.ogrudev
@@ -8,21 +12,17 @@
 - system.openssh.server.team.members.deprecated.oshyshko
 - system.openssh.server.team.members.deprecated.sgarbuz
 - system.openssh.server.team.members.deprecated.vnogin
-- system.openssh.server.team.members.avolkov
+- system.openssh.server.team.members.aarefiev
+- system.openssh.server.team.members.dbiletskiy
 - 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.mpolenchuk
 - system.openssh.server.team.members.ohryhorov
 - system.openssh.server.team.members.pshchelo
-- system.openssh.server.team.members.deremeev
 - system.openssh.server.team.members.vdrok
 - system.openssh.server.team.members.vmarkov
 - system.openssh.server.team.members.vsaienko
-- system.openssh.server.team.members.mpolenchuk
-- system.openssh.server.team.members.dbiletskiy
-- system.openssh.server.team.members.aarefiev
-- system.openssh.server.team.members.efedorova
 parameters:
   _param:
     linux_system_user_sudo: true