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/deprecated/akiseleva.yml b/openssh/server/team/members/deprecated/akiseleva.yml
new file mode 100644
index 0000000..490567e
--- /dev/null
+++ b/openssh/server/team/members/deprecated/akiseleva.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        akiseleva:
+          email: disabled
+          enabled: falese
+          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/mvollman.yml b/openssh/server/team/members/deprecated/mvollman.yml
new file mode 100644
index 0000000..92d42e8
--- /dev/null
+++ b/openssh/server/team/members/deprecated/mvollman.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mvollman:
+          enabled: false
+          name: mvollman
+          full_name: disabled
+          home: /home/mvollman
+          email: disabled
+  openssh:
+    server:
+      user:
+        mvollman:
+          enabled: false
+          user: ${linux:system:user:mvollman}
diff --git a/openssh/server/team/members/mjedynski.yml b/openssh/server/team/members/mjedynski.yml
new file mode 100644
index 0000000..c85b2f4
--- /dev/null
+++ b/openssh/server/team/members/mjedynski.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        mjedynski:
+          enabled: true
+          name: mjedynski
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Marcin Jedynski
+          home: /home/mjedynski
+          email: mjedynski@mirantis.com
+  openssh:
+    server:
+      user:
+        mjedynski:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5SMq7zeEUtz82NRDqA2LXYRz4y3dVFWniuqXFtRcd0DrYTaI2eQ8RTXudhQ5tPpzrVWC7Nmn5qsvOSOMb4nOdlAJydBqecW7U0vpH0FQaxCHW2iD2pgpVhozC28ievX/vhKCEE0qUGC/v7GTxDBrVd99WTt92IotbThndodbMx5GcpVyiNh5Jo04eeZr+1GZ93BfcJTGei48tvzNgyYcrXEEqKEwe4C55SSnLj0SNVKMBoaw9mV3dcZh2NzMAennlsuFJcgzsxNkEn+bQE0WVdFMfREowQ63NoTiCxqZIicy6wcxyReW4llGPfXSGNvX1GmmQHMJEHaSSha9nh+41 mjedynski@mirantis.com
+          user: ${linux:system:user:mjedynski}
diff --git a/openssh/server/team/storage.yml b/openssh/server/team/storage.yml
index 075b9d1..5531f97 100644
--- a/openssh/server/team/storage.yml
+++ b/openssh/server/team/storage.yml
@@ -1,3 +1,5 @@
 classes:
-- system.openssh.server.team.members.akiseleva
+- system.openssh.server.team.members.deprecated.akiseleva
+- system.openssh.server.team.members.deprecated.mvollman
 - system.openssh.server.team.members.mlos
+- system.openssh.server.team.members.mjedynski