diff --git a/openssh/server/team/members/deprecated/ahecko.yml b/openssh/server/team/members/deprecated/ahecko.yml
new file mode 100644
index 0000000..a6f9c87
--- /dev/null
+++ b/openssh/server/team/members/deprecated/ahecko.yml
@@ -0,0 +1,18 @@
+parameters:
+  linux:
+    system:
+      user:
+        ahecko:
+          email: disabled
+          enabled: true
+          full_name: disabled
+          home: /home/ahecko
+          name: ahecko
+  openssh:
+    server:
+      user:
+        ahecko:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGRD/zStceB/CAJu8bnsWs9VPWY8W1F6fz2AvX2BiyEXCE2W4uMY11In+qHQtIaWeyWVR/XmoCw0mZxk7emTz91Y1FioinEgumkhpNPLY0fPdDHzwu3atCjAc7B3ZCCXusiUC6k99aCa9YXIZ0/0/75kqilRmIcxGeneL9S2+iuFn/HSpNR7IZN03AEzWgIfXEhB4lyNs9n3RHf+XXy2wxAKkcKpMyocEO9gc3uLY5OdUhGFHRKhEZwgz3K6ysDOCIOTkiiJ8KXMM07FIDLjs5pjUjnVkZ1kWq+virLMbhhyCbMR8zrPvWMjP5oYGm9U9aEeUMA5iMCa7K+qs2AM3 adamheczko@mirantis
+          user: ${linux:system:user:ahecko}
diff --git a/openssh/server/team/members/deprecated/aheczko.yml b/openssh/server/team/members/deprecated/aheczko.yml
new file mode 100644
index 0000000..65e5a0e
--- /dev/null
+++ b/openssh/server/team/members/deprecated/aheczko.yml
@@ -0,0 +1,18 @@
+parameters:
+  linux:
+    system:
+      user:
+        aheczko:
+          email: disabled
+          enabled: true
+          full_name: disabled
+          home: /home/aheczko
+          name: aheczko
+  openssh:
+    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
+          user: ${linux:system:user:aheczko}
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}