diff --git a/openssh/server/team/cicd.yml b/openssh/server/team/cicd.yml
index c839a22..89523ee 100644
--- a/openssh/server/team/cicd.yml
+++ b/openssh/server/team/cicd.yml
@@ -1,6 +1,6 @@
 classes:
 - system.openssh.server.team.members.deprecated.akomarek
-- system.openssh.server.team.members.atengler
+- system.openssh.server.team.members.deprecated.atengler
 - system.openssh.server.team.members.deprecated.fpytloun
 - system.openssh.server.team.members.deprecated.jbroulik
 - system.openssh.server.team.members.jcach
diff --git a/openssh/server/team/members/atengler.yml b/openssh/server/team/members/atengler.yml
deleted file mode 100644
index 8de0485..0000000
--- a/openssh/server/team/members/atengler.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        tux:
-          email: atengler@mirantis.com
-          enabled: true
-          full_name: Adam Tengler
-          home: /home/tux
-          name: tux
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        tux:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXEN5qmte4oMYFCMZtuNzWiu5M32Dp0OsfR1pSz5gMMQF1Sw3xEDXEATEWhyvJTuVtFQasWVcMCYzEPev8H54UK97dLlxHxEDD9PQYY2O+xu/Rq+p/jryJ/T3mO7LDjUUXtHkUnsDZ51G+sFAWktE+FifwrEDmAEnRucLqOzVhehelG73S3uqfxVsPTsW2CcVIZICKtvdODbgAVyCf1LRR0LJv4fXqcyebCbzIrk4NWJhc474TH88niC7PH5VfxSfXZdKoi3yKVMgqdGSUxGhkx3D5CwCR9K+kUnP0rE5GNIqoCiS8iNbWl6POfMPSxH/ckqZN1h8El6SEoPJzVNp9 tux@tux-workbook
-          user: ${linux:system:user:tux}
diff --git a/openssh/server/team/members/atengler.yml b/openssh/server/team/members/atengler.yml
new file mode 120000
index 0000000..b57718d
--- /dev/null
+++ b/openssh/server/team/members/atengler.yml
@@ -0,0 +1 @@
+deprecated/atengler.yml
\ No newline at end of file
diff --git a/openssh/server/team/members/deprecated/ababich.yml b/openssh/server/team/members/deprecated/ababich.yml
index 506afbf..c4d540c 100644
--- a/openssh/server/team/members/deprecated/ababich.yml
+++ b/openssh/server/team/members/deprecated/ababich.yml
@@ -3,17 +3,14 @@
     system:
       user:
         ababich:
-          email: deprecated@mirantis.dep
-          enabled: true
-          full_name: Anna Babich
+          email: disabled
+          enabled: false
+          full_name: disabled
           home: /home/ababich
           name: ababich
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
         ababich:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDo2CJRAQeUeZbjDLdcE7GxQM82kL41YIyuOpNbpzFXphK4gljSMoKH9TJRdlx5S/AGDJltosDym9lY7gi3DqW4z/+k9pHBLQSdr4yDp0iCJcZc8LG3KUbZkZwwCYjf8FTz5tAWgS9z8IKNRMcfReJCkeaFI29p0PVgPqchNaQHUG40iiIl51uLsF4pCF2GbF/10drBCubENlWLoGv/+OwiNzeOvGANeX8jBivevfus2hZbTh1Zf8HsXqd5HLTMRn/BJOJRbLFd74BauAY/J/wOM9SJOaFZU201A2eYgMsamXT159O8e1Q5GMtL4uhseXZzQgKwF9tW/EFBDPwXvC+n ababich@ababich-pc
+          enabled: false
           user: ${linux:system:user:ababich}
diff --git a/openssh/server/team/members/deprecated/akalach.yml b/openssh/server/team/members/deprecated/akalach.yml
index 413c1ac..44a3bf0 100644
--- a/openssh/server/team/members/deprecated/akalach.yml
+++ b/openssh/server/team/members/deprecated/akalach.yml
@@ -3,17 +3,14 @@
     system:
       user:
         akalach:
-          email: deprecated@mirantis.dep
-          enabled: true
-          full_name: Andrew Kalach
+          email: disabled
+          enabled: false
+          full_name: disabled
           home: /home/akalach
           name: akalach
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
         akalach:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOGQ6j4Fy1Lm00UihYbmJ88ctLGaVXlSPys8lk1gUsT8lR2oOZvERl8FIsSlN47Z2wbvcTCq3aOlxvuV/UyT8+r8LEGM5Wk1XSsDMRsvc92qfeRQhAJDp8f+2pUkNfc8rXaPKUDkz0iI6iwANOIR+P7Xx11w//0itDBBKX7sEBsxJbSjm6DLyfs1yn6tT5S4kqAcq5jpX3YMH0MqhcWPS0tK1W6QW13KDt317CIWmoVQMvdmzF/QenXIbV6PZjBy2DvkFVOThdH+OZDMgo4mggGqnsokjy6ZjT0LzKAptKrFKd/xRQUUelWY5XvXtH8RxVtg92Xqh2CjdA4OfYPn6x
+          enabled: false
           user: ${linux:system:user:akalach}
diff --git a/openssh/server/team/members/deprecated/akholkin.yml b/openssh/server/team/members/deprecated/akholkin.yml
index bb2650b..7890895 100644
--- a/openssh/server/team/members/deprecated/akholkin.yml
+++ b/openssh/server/team/members/deprecated/akholkin.yml
@@ -3,12 +3,11 @@
     system:
       user:
         akholkin:
+          email: disabled
           enabled: false
-          name: akholkin
-          sudo: ${_param:linux_system_user_sudo}
           full_name: disabled
           home: /home/akholkin
-          email: disabled
+          name: akholkin
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/akuznetsova.yml b/openssh/server/team/members/deprecated/akuznetsova.yml
index a7a11df..3e1ce0e 100644
--- a/openssh/server/team/members/deprecated/akuznetsova.yml
+++ b/openssh/server/team/members/deprecated/akuznetsova.yml
@@ -3,12 +3,11 @@
     system:
       user:
         akuznetsova:
+          email: disabled
           enabled: false
-          name: akuznetsova
-          sudo: ${_param:linux_system_user_sudo}
           full_name: disabled
           home: /home/akuznetsova
-          email: disabled
+          name: akuznetsova
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/atengler.yml b/openssh/server/team/members/deprecated/atengler.yml
new file mode 100644
index 0000000..3007bc1
--- /dev/null
+++ b/openssh/server/team/members/deprecated/atengler.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        tux:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          name: tux
+          home: /home/tux
+  openssh:
+    server:
+      user:
+        tux:
+          enabled: false
+          user: ${linux:system:user:tux}
diff --git a/openssh/server/team/members/deprecated/bkupidura.yml b/openssh/server/team/members/deprecated/bkupidura.yml
index d1a20db..0a4b866 100644
--- a/openssh/server/team/members/deprecated/bkupidura.yml
+++ b/openssh/server/team/members/deprecated/bkupidura.yml
@@ -3,12 +3,11 @@
     system:
       user:
         bkupidura:
+          email: disabled
           enabled: false
-          name: bkupidura
-          sudo: ${_param:linux_system_user_sudo}
           full_name: disabled
           home: /home/bkupidura
-          email: disabled
+          name: bkupidura
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/dderyabin.yml b/openssh/server/team/members/deprecated/dderyabin.yml
index 5706cc4..12dcadc 100644
--- a/openssh/server/team/members/deprecated/dderyabin.yml
+++ b/openssh/server/team/members/deprecated/dderyabin.yml
@@ -3,17 +3,14 @@
     system:
       user:
         dderyabin:
-          email: deprecated@mirantis.dep
-          enabled: true
-          full_name: Denis Deryabin
+          email: disabled
+          enabled: false
+          full_name: disabled
           home: /home/dderyabin
           name: dderyabin
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
         dderyabin:
-          enabled: true
-          public_keys:
-          - key: AAAAB3NzaC1yc2EAAAADAQABAAABAQCljOKDvsoOsQFOsabL68kVTlzZOObP9d13Oqc7Lafew1MJx0uaCjabpfcaSOrLrqYu42akkpnHQ0ypQbzRWDREYWKciKmE1TKzRUTXZIF1FNNoFrDT7FfjrKVP42alk4isB0Yj9mvA6AhJGFM7pAy55dVEII30Rc0wKW6XCBAX8fIq3rHDnDYq7KuaSAtxkqj6u/C9eUcGBB+JIQ0NRhTVyIZlqjNeojXoM7py8pGDnGj54bIbpFtYiLU1hbowKfVVcJgHIE+17KsNvR7HwwZZ5lbUxzrOiOnoBq1JKF15JHQ3el358aKw3Ee7rqmVrHszohEBLfxRbWbACoTUem75 denis@usvbox
+          enabled: false
           user: ${linux:system:user:dderyabin}
diff --git a/openssh/server/team/members/deprecated/eezhova.yml b/openssh/server/team/members/deprecated/eezhova.yml
index 4208785..f4c99bd 100644
--- a/openssh/server/team/members/deprecated/eezhova.yml
+++ b/openssh/server/team/members/deprecated/eezhova.yml
@@ -3,16 +3,14 @@
     system:
       user:
         eezhova:
+          email: disabled
           enabled: false
-          name: eezhova
-          sudo: ${_param:linux_system_user_sudo}
           full_name: disabled
           home: /home/eezhova
-          email: disabled
+          name: eezhova
   openssh:
     server:
       user:
         eezhova:
           enabled: false
-          public_keys:
           user: ${linux:system:user:eezhova}
diff --git a/openssh/server/team/members/deprecated/esikachev.yml b/openssh/server/team/members/deprecated/esikachev.yml
index c0a638b..b6a13c1 100644
--- a/openssh/server/team/members/deprecated/esikachev.yml
+++ b/openssh/server/team/members/deprecated/esikachev.yml
@@ -3,17 +3,14 @@
     system:
       user:
         esikachev:
-          email: deprecated@mirantis.dep
-          enabled: true
-          full_name: Evgeny Sikachev
+          email: disabled
+          enabled: false
+          full_name: disabled
           home: /home/esikachev
           name: esikachev
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
         esikachev:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9zHSDorWIKSB5QH4y8bcdzsx0yE7cA/Eg3M98+qPkZPAJl1FgFXYo8XcMod52tVDsfap/mLg1k0pwmmocUGSoESAUs7Wdo5wKhRdsEo+SYxjfL3QVIlKpocho7DmBgudkRLk9mjzcjNBdWyuw9dH6/hy+FK77i5xUqIwJR0koc1WcvzyzZcacMZLYG26rxO0CMC9aTWIZcEFrv4hk7CSb+KFNfbvRN0vHjdp31GuEWDVZ6oSv8V5ipGCJS/HCuTzb/Wqjxgwh5OAqZoepdBaiqNhEmLbFBqQ0vtBwTjWixDRLry06s4J5WWFSGu6GrRbgHnd08752o2TiB28Af4F/ esikachev@Evgenys-MacBook-Pro.local
+          enabled: false
           user: ${linux:system:user:esikachev}
diff --git a/openssh/server/team/members/deprecated/kszukielojc.yml b/openssh/server/team/members/deprecated/kszukielojc.yml
index 3b90674..a7c18c0 100644
--- a/openssh/server/team/members/deprecated/kszukielojc.yml
+++ b/openssh/server/team/members/deprecated/kszukielojc.yml
@@ -3,12 +3,11 @@
     system:
       user:
         kszukielojc:
+          email: disabled
           enabled: false
-          name: kszukielojc
-          sudo: ${_param:linux_system_user_sudo}
           full_name: disabled
           home: /home/kszukielojc
-          email: disabled
+          name: kszukielojc
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/nzaporozhets.yml b/openssh/server/team/members/deprecated/nzaporozhets.yml
index b4abf5b..7c58227 100644
--- a/openssh/server/team/members/deprecated/nzaporozhets.yml
+++ b/openssh/server/team/members/deprecated/nzaporozhets.yml
@@ -3,12 +3,11 @@
     system:
       user:
         nzaporozhets:
+          email: disabled
           enabled: false
-          name: nzaporozhets
-          sudo: ${_param:linux_system_user_sudo}
           full_name: disabled
           home: /home/nzaporozhets
-          email: disabled
+          name: nzaporozhets
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/obourdon.yml b/openssh/server/team/members/deprecated/obourdon.yml
index 98d5b60..f1e618f 100644
--- a/openssh/server/team/members/deprecated/obourdon.yml
+++ b/openssh/server/team/members/deprecated/obourdon.yml
@@ -3,12 +3,11 @@
     system:
       user:
         obourdon:
+          email: disabled
           enabled: false
-          name: obourdon
-          sudo: ${_param:linux_system_user_sudo}
           full_name: disabled
           home: /home/obourdon
-          email: disabled
+          name: obourdon
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/okosse.yml b/openssh/server/team/members/deprecated/okosse.yml
index f8f1963..ce2d1cd 100644
--- a/openssh/server/team/members/deprecated/okosse.yml
+++ b/openssh/server/team/members/deprecated/okosse.yml
@@ -3,17 +3,14 @@
     system:
       user:
         okosse:
-          email: deprecated@mirantis.dep
-          enabled: true
-          full_name: Oleksandr Kosse
+          email: disabled
+          enabled: false
+          full_name: disabled
           home: /home/okosse
           name: okosse
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
         okosse:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmb5FWl6dgK09TmxVYuvmfLyy6G9x2ed6dvXf0kfpMaaP37CST7t0UZ2m23qGF4T0ZGYbCkIdr+6zWG+a5ozuJiqoJwE3dLun8pnCwAjkmUxRyVIi9M6f3us4z+ooBZTBGWTGe7/ryqePpzyAjlw4om23pDTt09YQq5WDirdrFBNJ9ZlTwubbEWMTtHW5XMEui7s1IiggYmHI4cVh0lg7k/neoAk/5ZD9LI9+p2sISCOpD/f7C/BkgVd/4iCFNxXsPmMwRadBVYo8diB0OOekM6qsW5rfPCczCi9oavxjy62Z2XZ6wHPZ3HgeK8MhVJaRGge6zMTnB98aYh9LWfXFv okosse@okosse-pc
+          enabled: false
           user: ${linux:system:user:okosse}
diff --git a/openssh/server/team/members/deprecated/pmichalec.yml b/openssh/server/team/members/deprecated/pmichalec.yml
new file mode 100644
index 0000000..5c453b0
--- /dev/null
+++ b/openssh/server/team/members/deprecated/pmichalec.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        pmichalec:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          name: pmichalec
+          home: /home/pmichalec
+  openssh:
+    server:
+      user:
+        pmichalec:
+          enabled: false
+          user: ${linux:system:user:pmichalec}
diff --git a/openssh/server/team/members/deprecated/rkhozinov.yml b/openssh/server/team/members/deprecated/rkhozinov.yml
index feb546d..dd0084a 100644
--- a/openssh/server/team/members/deprecated/rkhozinov.yml
+++ b/openssh/server/team/members/deprecated/rkhozinov.yml
@@ -3,17 +3,14 @@
     system:
       user:
         rkhozinov:
-          email: rkhozinov@mirantis.com
-          enabled: true
-          full_name: Ruslan Khozinov
+          email: disabled
+          enabled: false
+          full_name: disabled
           home: /home/rkhozinov
           name: rkhozinov
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
         rkhozinov:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCti9e5kyNEtX3MEns+eehUCzaxZmI8FWkWrLeRQY3jLUGzI3+N12tA7gKffczGIDP/ttnDg1hl98Yw28mkrIfYYMwRMqsBkGmYZyu6EXccyde6/5U/dgKVFGYLjWmbAAcaIaO2YoxqUJKvIanfLNHTRI29KwgxpaMCtjB7+jHiw/V0MF2xKi8yJgajZgh8iXPiv50BGjICx1BuqgqZb5jjxouV0FpU28mBOobqtaphOHeFPHk1Uool9MBt+2ocAjLbFhozmx0xryBVG4FGreovK60Zz4PuGCUL98rSTt8fbebfVokqkCG+sjykTcEQ8h5/0BUR4sPXw5mxATHD/AOv rkhozinov@rkhw
+          enabled: false
           user: ${linux:system:user:rkhozinov}
diff --git a/openssh/server/team/members/deprecated/rpromyshlennikov.yml b/openssh/server/team/members/deprecated/rpromyshlennikov.yml
index 93c9a1c..688badc 100644
--- a/openssh/server/team/members/deprecated/rpromyshlennikov.yml
+++ b/openssh/server/team/members/deprecated/rpromyshlennikov.yml
@@ -3,17 +3,14 @@
     system:
       user:
         rpromyshlennikov:
-          email: rpromyshlennikov@mirantis.com
-          enabled: true
-          full_name: Rodion Promyshlennikov
+          email: disabled
+          enabled: false
+          full_name: disabled
           home: /home/rpromyshlennikov
           name: rpromyshlennikov
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
         rpromyshlennikov:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3dCFNCYVxHQQD+/X1JJ9auAzpj15AkEl6yO4lJ1XL43ljxJbzWXXl3RN9vAjiBE1tvxEfuPEIxF7kO2sc1xPKtkw40RIwXrDIGfjlVCaBLtnxCPnCQX349UMSJl/AXpkHqKGVeAW+AO4zbeI8XnS9aDNMuX6ncgrLRMxWCxETL3J/IIE1LZ5v0QvyQBHuJc5jbyODVb4onff296SbjzYm96elJZcRFo4FzFaIcKtis+Sm4+6OAGCNDIXxfB9e5TK579x+L+ci/W1k83Fcz6NpQU/OM1R1CZVMap/Xet424aRMFPmA8sTF4hdYvWd6adBihco2isaW51b1Gkc+K9N9wELiEBMpdKQtqkPOvm98UhoRk7Wp+8+zSamj1uEs/7m6VCGFebq8V3xqTexWH2dCUznxZ5+KS6WLBh+3f4P6wG8VuWfgFjIUf7jjYKjidBXfSXFDxRkhf/LV8V0jLv+Ma1mjKBUX+rk7IFxm0X/PkjqNhVFlg3rH4Wre0+9WdsTCyzWS0HEaTxIKdPtwwULLEiwClO1LLebdlVjx9yhen0czXxMAHONbZeTvxN8ULfei+b7c07oYm16T8T9JAdiWn5nGxiT8TAUrCPBJMpbE4xQJLztYhAbMpfhFSdkKfTotFxTK9AKpTg4TZFY0NYOktFtV2R9ZnzP7hHZDSIg2Bw== rpromyshlennikov@mirantis.com
+          enabled: false
           user: ${linux:system:user:rpromyshlennikov}
diff --git a/openssh/server/team/members/deprecated/schipiga.yml b/openssh/server/team/members/deprecated/schipiga.yml
index 9665cc7..40090aa 100644
--- a/openssh/server/team/members/deprecated/schipiga.yml
+++ b/openssh/server/team/members/deprecated/schipiga.yml
@@ -3,17 +3,14 @@
     system:
       user:
         schipiga:
-          email: deprecated@mirantis.dep
-          enabled: true
-          full_name: Sergey Chipiga
+          email: disabled
+          enabled: false
+          full_name: disabled
           home: /home/schipiga
           name: schipiga
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
         schipiga:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDamKTbqCQCGW1JLo+4PgntC1TkRrwbDOELyRVHxAlc56CcJE9QjrNnCOTqvgRoAmIC+P86nzUQxwSREMd0qgVCefAxKQVFVQ38oym9G90TF0nx4fFT3hUhEQwjMBjHhR2Vo+uUwbT2Hg51U1gBPx/WFa0U5Cf7V6+XNJ3r22W4XG8OrbuAoapwl4WN1346HEj3d0U6Z8Unsqjx9pRpZ1eYCeng4emLZ1UOhvLBfw22vSTkujjjRdfY6g52Gv4hRsgsS+JWulO+z/qd1GFcUp9j+yIvur+eeTWHelAbXq4kRNQfQjAs6nMM8Hp8gPa5jLYqMz2GgD96p8wOQCdK2nyL schipiga@mirantis.com
+          enabled: false
           user: ${linux:system:user:schipiga}
diff --git a/openssh/server/team/members/deprecated/spasquier.yml b/openssh/server/team/members/deprecated/spasquier.yml
index bd64ee0..0851937 100644
--- a/openssh/server/team/members/deprecated/spasquier.yml
+++ b/openssh/server/team/members/deprecated/spasquier.yml
@@ -3,12 +3,11 @@
     system:
       user:
         spasquier:
+          email: disabled
           enabled: false
-          name: spasquier
-          sudo: ${_param:linux_system_user_sudo}
           full_name: disabled
           home: /home/spasquier
-          email: disabled
+          name: spasquier
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/ssokolov.yml b/openssh/server/team/members/deprecated/ssokolov.yml
index 68f9dd1..b21920e 100644
--- a/openssh/server/team/members/deprecated/ssokolov.yml
+++ b/openssh/server/team/members/deprecated/ssokolov.yml
@@ -3,17 +3,14 @@
     system:
       user:
         ssokolov:
-          email: deprecated@mirantis.dep
-          enabled: true
-          full_name: Sergey Sokolov
+          email: disabled
+          enabled: false
+          full_name: disabled
           home: /home/ssokolov
           name: ssokolov
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
         ssokolov:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHuIo/dLh5qt+8jV4UUPqDo6ktJc12HVFg10S3hinjJUlAOxq8554l0LMvxmiZSrIjxGE/qUr8PlRgjLi4x4zQDggBdNGC/S4zcYNEiTQ7HaOFOjEJ0si6ODZfssQsr/A/bXdNOZE/nIZTUhTddJG+3nKUvuPnTeOQLqEOp4IFJwwvwnD2Wo4I1nc6+yDSJLuG8ANLtLlStzpMKr8wHvPWCUcB9B1oeeOVtw9+vEKxuUBkheXnXMh7shiyt4vmaFVbcgcHGPg8DjP8alKeAbIk0AYhiuNHV/rFzL+/kfImS94gU93A8vt0U2vCj8golqt2huxJblKDr4Abq1lDXLwn ssm@n104309
+          enabled: false
           user: ${linux:system:user:ssokolov}
diff --git a/openssh/server/team/members/deprecated/yshapovalov.yml b/openssh/server/team/members/deprecated/yshapovalov.yml
index 82c84d1..646765d 100644
--- a/openssh/server/team/members/deprecated/yshapovalov.yml
+++ b/openssh/server/team/members/deprecated/yshapovalov.yml
@@ -3,17 +3,14 @@
     system:
       user:
         yshapovalov:
-          email: ylobankov@mirantis.com
-          enabled: true
-          full_name: Yevgeniy Shapovalov
+          email: disabled
+          enabled: false
+          full_name: disabled
           home: /home/yshapovalov
           name: yshapovalov
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
         yshapovalov:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWvKNMfHlugrEUMtDDJzZb3T1UzThOp/UtvQvyFTf1rlKN/i14b1cCVmbPaSKR6W4bqZ4YLnRfb5Z66ktEACL02RdC4FkCiGa8yFDAGXLbM2WJhHyA3ksu91z3wK2QRuKJuZuvjmelds1shTK1a31LgTqa7CNPfkfE9h+CsAizZfAhHg1yVqg0/CGKP8+iV8owR5MP9t8+JXTC40G6Qkjzrf/vuA13bT1X+JSWzLoI2OefezZ+X128fLkssPkr4IS1Jg+cbRvSRmGTVjvtk4dnDo3QxF5lUl6JZAUjPslMCxaqDvRFXn86UZ74g6iJ5dZjrU0vn6X+Ov+KVYmZ5znd yshapovalov@ys-pc
+          enabled: false
           user: ${linux:system:user:yshapovalov}
diff --git a/openssh/server/team/members/pmichalec.yml b/openssh/server/team/members/pmichalec.yml
deleted file mode 100644
index d7b4cfe..0000000
--- a/openssh/server/team/members/pmichalec.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        pmichalec:
-          email: pmichalec@mirantis.com
-          enabled: true
-          full_name: Petr Michalec
-          home: /home/pmichalec
-          name: pmichalec
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        pmichalec:
-          enabled: true
-          public_keys:
-          - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGwsfObHWHqBv6UQBjvm0nkgnAGc5MZPuQXJ3ln4sM1P pmichalec@dontpanic
-          user: ${linux:system:user:pmichalec}
diff --git a/openssh/server/team/members/pmichalec.yml b/openssh/server/team/members/pmichalec.yml
new file mode 120000
index 0000000..a7159e4
--- /dev/null
+++ b/openssh/server/team/members/pmichalec.yml
@@ -0,0 +1 @@
+deprecated/pmichalec.yml
\ No newline at end of file
diff --git a/openssh/server/team/mmo_devops.yml b/openssh/server/team/mmo_devops.yml
index e85f8fe..ec9e971 100644
--- a/openssh/server/team/mmo_devops.yml
+++ b/openssh/server/team/mmo_devops.yml
@@ -2,14 +2,14 @@
 classes:
 # DevOps/SRE Team
 - system.openssh.server.team.members.deprecated.cade
-- system.openssh.server.team.members.jmosher
+- system.openssh.server.team.members.deprecated.pmathews
+- system.openssh.server.team.members.deprecated.pmichalec
 - system.openssh.server.team.members.deprecated.ecantwell
-- system.openssh.server.team.members.lmercl
 - system.openssh.server.team.members.deprecated.mwilson
 - system.openssh.server.team.members.deprecated.osmola
+- system.openssh.server.team.members.jmosher
+- system.openssh.server.team.members.lmercl
 - system.openssh.server.team.members.pcizinsky
-- 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
 parameters:
diff --git a/openssh/server/team/presales.yml b/openssh/server/team/presales.yml
index 41e0220..a120b11 100644
--- a/openssh/server/team/presales.yml
+++ b/openssh/server/team/presales.yml
@@ -1,8 +1,8 @@
 classes:
 - system.openssh.server.team.members.deprecated.samstoelinga
+- system.openssh.server.team.members.deprecated.pmichalec
 - system.openssh.server.team.members.sachintripathi
 - system.openssh.server.team.members.ryanday
-- system.openssh.server.team.members.pmichalec
 - system.openssh.server.team.members.brucemathews
 - system.openssh.server.team.members.andreidanin
 
diff --git a/openssh/server/team/security.yml b/openssh/server/team/security.yml
index e165ce1..d914fdc 100644
--- a/openssh/server/team/security.yml
+++ b/openssh/server/team/security.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.sudo
 - system.openssh.server.team.members.ahecko
-- system.openssh.server.team.members.pmichalec
+- system.openssh.server.team.members.deprecated.pmichalec
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 61eab35..18f7a76 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.sudo
 - system.openssh.server.team.members.mniedbala
-- system.openssh.server.team.members.pmichalec
+- system.openssh.server.team.members.deprecated.michalec
 - system.openssh.server.team.members.pcizinsky
 - system.openssh.server.team.members.lmercl
 - system.openssh.server.team.members.pruzicka
diff --git a/openssh/server/team/tcpcloud.yml b/openssh/server/team/tcpcloud.yml
index 9c96881..64844db 100644
--- a/openssh/server/team/tcpcloud.yml
+++ b/openssh/server/team/tcpcloud.yml
@@ -13,13 +13,13 @@
 - 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.deprecated.atengler
+- system.openssh.server.team.members.deprecated.pmichalec
 - system.openssh.server.team.members.dcech
 - system.openssh.server.team.members.jcach
 - system.openssh.server.team.members.lmercl
 - system.openssh.server.team.members.mpolreich
 - system.openssh.server.team.members.pcizinsky
-- system.openssh.server.team.members.pmichalec
 - system.openssh.server.team.members.psvimbersky
 - system.openssh.server.team.members.skreys
 - system.openssh.server.team.members.smatov