diff --git a/openssh/server/team/members/ahecko.yml b/openssh/server/team/members/deprecated/ahecko.yml
similarity index 85%
rename from openssh/server/team/members/ahecko.yml
rename to openssh/server/team/members/deprecated/ahecko.yml
index 71821ea..a6f9c87 100644
--- a/openssh/server/team/members/ahecko.yml
+++ b/openssh/server/team/members/deprecated/ahecko.yml
@@ -3,12 +3,11 @@
     system:
       user:
         ahecko:
-          email: ahecko@mirantis.com
+          email: disabled
           enabled: true
-          full_name: Adam Hecko
+          full_name: disabled
           home: /home/ahecko
           name: ahecko
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/aheczko.yml b/openssh/server/team/members/deprecated/aheczko.yml
similarity index 85%
rename from openssh/server/team/members/aheczko.yml
rename to openssh/server/team/members/deprecated/aheczko.yml
index c1a4741..65e5a0e 100644
--- a/openssh/server/team/members/aheczko.yml
+++ b/openssh/server/team/members/deprecated/aheczko.yml
@@ -3,12 +3,11 @@
     system:
       user:
         aheczko:
-          email: aheczko@mirantis.com
+          email: disabled
           enabled: true
-          full_name: Adam Heczko
+          full_name: disabled
           home: /home/aheczko
           name: aheczko
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/miwinski.yml b/openssh/server/team/members/deprecated/miwinski.yml
new file mode 100644
index 0000000..f67b3c2
--- /dev/null
+++ b/openssh/server/team/members/deprecated/miwinski.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        miwinski:
+          enabled: false
+          name: miwinski
+          full_name: disabled
+          home: /home/miwinski
+          email: disabled
+  openssh:
+    server:
+      user:
+        miwinski:
+          enabled: false
+          user: ${linux:system:user:miwinski}
diff --git a/openssh/server/team/members/deprecated/mniedbala.yml b/openssh/server/team/members/deprecated/mniedbala.yml
new file mode 100644
index 0000000..dea6f0f
--- /dev/null
+++ b/openssh/server/team/members/deprecated/mniedbala.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mniedbala:
+          enabled: false
+          name: mniedbala
+          full_name: disabled
+          home: /home/mniedbala
+          email: disabled
+  openssh:
+    server:
+      user:
+        mniedbala:
+          enabled: false
+          user: ${linux:system:user:mniedbala}
diff --git a/openssh/server/team/members/deprecated/pcizinsky.yml b/openssh/server/team/members/deprecated/pcizinsky.yml
new file mode 100644
index 0000000..89b73fe
--- /dev/null
+++ b/openssh/server/team/members/deprecated/pcizinsky.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        pcizinsky:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/pcizinsky
+          name: pcizinsky
+  openssh:
+    server:
+      user:
+        pcizinsky:
+          enabled: false
+          user: ${linux:system:user:pcizinsky}
diff --git a/openssh/server/team/members/deprecated/pmichalec.yml b/openssh/server/team/members/deprecated/pmichalec.yml
index 5c453b0..201d9fc 100644
--- a/openssh/server/team/members/deprecated/pmichalec.yml
+++ b/openssh/server/team/members/deprecated/pmichalec.yml
@@ -6,8 +6,8 @@
           email: disabled
           enabled: false
           full_name: disabled
-          name: pmichalec
           home: /home/pmichalec
+          name: pmichalec
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/sflorczak.yml b/openssh/server/team/members/deprecated/sflorczak.yml
new file mode 100644
index 0000000..1f037d5
--- /dev/null
+++ b/openssh/server/team/members/deprecated/sflorczak.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        sflorczak:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/sflorczak
+          name: sflorczak
+  openssh:
+    server:
+      user:
+        sflorczak:
+          enabled: false
+          user: ${linux:system:user:sflorczak}
diff --git a/openssh/server/team/members/deprecated/vblokhin.yml b/openssh/server/team/members/deprecated/vblokhin.yml
new file mode 100644
index 0000000..8b61eb1
--- /dev/null
+++ b/openssh/server/team/members/deprecated/vblokhin.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        vblokhin:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/vblokhin
+          name: vblokhin
+  openssh:
+    server:
+      user:
+        vblokhin:
+          enabled: false
+          user: ${linux:system:user:vblokhin}
diff --git a/openssh/server/team/members/miwinski.yml b/openssh/server/team/members/miwinski.yml
deleted file mode 100644
index 676fd3c..0000000
--- a/openssh/server/team/members/miwinski.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        miwinski:
-          enabled: true
-          name: miwinski
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Marcin Iwinski
-          home: /home/miwinski
-          email: miwinski@mirantis.com
-  openssh:
-    server:
-      user:
-        miwinski:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCydY97fXVWbcUiNaK5KnMHQpLT4acAVXykKqB5hAUPwKn4nFN3dFNw9dpToFpriqNpJTZrEdxVgL9obB4aouHpi+NVH6s8cMZ6ulNTiSTBM0Xkmu7jl66eMhfHNaFwgFC0vsGQ85oI813H7A601tCweKegMUW/mwOKbwHj1isEA+jbyrdRTC64icBa6zbW/G2uF0ajz9dCPe9L0rAbQFE51N1fxrnLeb6BI+5br0H6bRz1kGc5ZsNiUx3EEEOrMFbAbHQAxvD8Te/nUErdlHCiFufKlXLJSUNDPGFrW2mIfvfGlbyrLPgm24RKS6xfcD7BhJOmr54k7QbWChEp/SrX iwi@iwon
-          user: ${linux:system:user:miwinski}
diff --git a/openssh/server/team/members/mniedbala.yml b/openssh/server/team/members/mniedbala.yml
deleted file mode 100644
index a4ca5c8..0000000
--- a/openssh/server/team/members/mniedbala.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        mniedbala:
-          enabled: true
-          name: mniedbala
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Mikolaj Niedbala
-          home: /home/mniedbala
-          email: mniedbala@mirantis.com
-  openssh:
-    server:
-      user:
-        mniedbala:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNepHgtflir2vNW+h9cr3hP3llsTlg5uIvvmByykfk455Cum0vSO27mWKZJu0ebU4LXfeH+WP4MjR3tKAKvXqzjGhPVGjMO3wo4/NLlel2CDx99w0KotcjQhW6p+iqLv1AT9E5LW4Kr1NuQ65nvGn6y4SevRw2y36bNS4VJBq40HlgQFTW3oNP+5u4TVzu7QQhulsTUdQETgLswZKsarX7whgvcHvFs1dnbriZlkPXvrKhZLA/CUb7ot+ugw6KWOl+g4gTFLjnt0IXjJXMstCOL9R7/juflUku9CYFvSuq4/T67yMW7XntQ89VkwudSCMjjUWg6ilEG0ghd9+b3bPr mniedbala@mirantis.com
-          user: ${linux:system:user:mniedbala}
diff --git a/openssh/server/team/members/pcizinsky.yml b/openssh/server/team/members/pcizinsky.yml
deleted file mode 100644
index 972830b..0000000
--- a/openssh/server/team/members/pcizinsky.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        pcizinsky:
-          email: pcizinsky@mirantis.com
-          enabled: true
-          full_name: Pavel Cizinsky
-          home: /home/pcizinsky
-          name: pcizinsky
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        pcizinsky:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCt9HA2bUwCVGGdUjyFzdPFp0j2z9XanLW9gHZ3BhB6Wc4ficU6zmbqYxrHUvdmUrRJbLMEAo9JDlzAIw4CPGhRkD3d7HfnmlEYcEeizLnnC+CmKo3+mrwkQIzWIz6PJOh1kvp5uaNp4ztjRGXXmPzcR0nk4jRD89gLHvH9EYStxZI6nsi3mmWR/LhgIhijb8p63duhE4HuK/RRRjeDQaUsbTG9TMEskY5ZI3p/QM55wlml9F8QJrtwxpaIPI5Fl8lflq+4YcoqgDIBFc6nwubIuiNY4gPJ8s1SQfsfxHSOJpFPZDwi76dxUpthtJrU46fqRvXPzTKoS29WZ5pSAY6p pavel.cizinsky@tcpcloud.eu
-          user: ${linux:system:user:pcizinsky}
diff --git a/openssh/server/team/members/pmichalec.yml b/openssh/server/team/members/pmichalec.yml
deleted file mode 120000
index a7159e4..0000000
--- a/openssh/server/team/members/pmichalec.yml
+++ /dev/null
@@ -1 +0,0 @@
-deprecated/pmichalec.yml
\ No newline at end of file
diff --git a/openssh/server/team/members/sflorczak.yml b/openssh/server/team/members/sflorczak.yml
deleted file mode 100644
index 8e42edb..0000000
--- a/openssh/server/team/members/sflorczak.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        sflorczak:
-          email: sflorczak@mirantis.com
-          enabled: true
-          full_name: Szymon Florczak
-          home: /home/sflorczak
-          name: sflorczak
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        sflorczak:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOdCr32ewiGJKLLwxf0Ic0naFV1j+ZflpfUVjuIPplrLeL5u8CNVlT5adPzgc48ijbee3qpzNvkOC7Ym295xQXUluo/cj2p5wVp70YnHrfhnLjGOCldm/K8B9bHmHbm1XW6hWUp7SWjMwhOdR217iveVLkuOy+hPdpXOC86hO93v7fY12UZDiqSRfrHpUqEaHHqlSyU2Eftn9GsR4UaotkeaQsiv8bi/k5nrwea/ccALZXnhrgTSTpXOVy3rfR5cCFQCA1PjMYvFEjhUofCHBSk+OA8xwOkpBOCfYrWRUmMT7MGEV5Jjm75QUrq1AuqRdFh8SM5lP39Tdwr8FMC+q5 flor3k@MacBook-Pro-Szymon.local
-          user: ${linux:system:user:sflorczak}
diff --git a/openssh/server/team/members/vblokhin.yml b/openssh/server/team/members/vblokhin.yml
deleted file mode 100644
index 122429c..0000000
--- a/openssh/server/team/members/vblokhin.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        vblokhin:
-          email: vblokhin@mirantis.com
-          enabled: true
-          full_name: Volodymyr Blokhin
-          home: /home/vblokhin
-          name: vblokhin
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        vblokhin:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDY5F0bDcbiCtO5HkwIVgjwAwCHcTRDZwEIE5cwuGlXNKWk9JtlDKh724Dp8f/Yny1e30Kt9oqs23bv6xfMh4pU4vrajjSv9f+s3hCSs1X9JrlEw92CD7r+jpq2R0vz3ufeHZWSWmeMsRR62BodtYy4EkoyPKvq16guq745KHTYgATm/qJgCkjQ5lxca280i0z14Fv+JOtVxrk52xMTxHS+N6wzVOjuEjBbW2vyktsV/RidT/SoJAVMHoPISjJTR+q5usVuKb6J5U83Y2vbmUCnygAnPX6l9k8atsAvwl1v54QxWE6Qz61kMPpwZZ56BNGhCZ458HqqXiybx4lU4PN6eg/zPA9Eq+xj5ZoXaUK1hg2UpJrmrtCh8H4T+/dPySZ+HMDBp221DCuH43x9No6V0QWhifhHPaGWyeK+mGsznbaSnlZ0QxRun5qWgjG7xHu97zgxjlyxmQII8FWGaOSuv/w6jg894A4jcsDfH5oxDbgVTbqqZG9o7TszIXKTImt1f2fmKKr/CT7ixwIKO3MioUNu3PoQ/GhmKajqugV+TIRe4vJ2FD5hl11ythzLlZCchzlEoymap4P6Y5dMh60YErCtYftn7jATJKSq9EHiLEeTIQDBVqhJzdS9/QWAXBV97mNX7mib1dO0H9TBZu1mYMZio7udbx9oursrVPq3fw== vblokhin@mirantis.com
-          user: ${linux:system:user:vblokhin}