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/members/mvollman.yml b/openssh/server/team/members/mvollman.yml
deleted file mode 100644
index a024a59..0000000
--- a/openssh/server/team/members/mvollman.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        mvollman:
-          enabled: true
-          name: mvollman
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Michael Vollman
-          home: /home/mvollman
-          email: mvollman@mirantis.com
-  openssh:
-    server:
-      user:
-        mvollman:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHxIRMQtpFHzKPCMe+pXJC3JrW3RiHyqU8XEDFXrhYsKG3TyDzMUktailF03QaVFfUTifQH5fMavnfJENV7syngoo8VL7Qm3wdvKbcCRczNKxiDIhQb1uCnQcKA2VA7ywDyyvtuQHxptx3G2D7B781/zugBNrkjhiyyUuSFzDHkqjWwRYm7wCEzMgzHeKbyXz3qCblp6CsSvOFreG/7tRGJFvjmY7+FENXN8uMeK4NPVeXIUNGI068EzpZPvEeMCzpYNRF9CPdkz5rF9/EsyljSSx5Ymb2RfDZshjaEE9LOF7k1VXM0DzXYBsz7XVP7B5/JxumQRYpyqPMZoDoojN1 mvollman@1308-MBP13
-          user: ${linux:system:user:mvollman}
diff --git a/openssh/server/team/storage.yml b/openssh/server/team/storage.yml
index 5c7913f..5531f97 100644
--- a/openssh/server/team/storage.yml
+++ b/openssh/server/team/storage.yml
@@ -1,4 +1,5 @@
 classes:
 - 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.mvollman
+- system.openssh.server.team.members.mjedynski