diff --git a/openssh/server/team/maintenance.yml b/openssh/server/team/maintenance.yml
index 110b085..4aa3a92 100644
--- a/openssh/server/team/maintenance.yml
+++ b/openssh/server/team/maintenance.yml
@@ -1,11 +1,15 @@
 classes:
 - system.linux.system.sudo
+- system.openssh.server.team.members.deprecated.msamoylov
 - system.openssh.server.team.members.dmeltsaykin
-- system.openssh.server.team.members.omolchanov
-- system.openssh.server.team.members.vkhlyunev
 - system.openssh.server.team.members.dtsapikov
+- system.openssh.server.team.members.omolchanov
+- system.openssh.server.team.members.pglazov
 - system.openssh.server.team.members.rlubianyi
-- system.openssh.server.team.members.msamoylov
+- system.openssh.server.team.members.vkhlyunev
+- system.openssh.server.team.members.vsakharov
+- system.openssh.server.team.members.harhipova
+- system.openssh.server.team.members.tkhlivnyak
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/members/msamoylov.yml b/openssh/server/team/members/deprecated/msamoylov.yml
similarity index 100%
rename from openssh/server/team/members/msamoylov.yml
rename to openssh/server/team/members/deprecated/msamoylov.yml
diff --git a/openssh/server/team/members/harhipova.yml b/openssh/server/team/members/harhipova.yml
new file mode 100644
index 0000000..7038f5c
--- /dev/null
+++ b/openssh/server/team/members/harhipova.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        harhipova:
+          email: harhipova@mirantis.com
+          enabled: true
+          full_name: Hanna Arhipova
+          home: /home/harhipova
+          name: harhipova
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        harhipova:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc4JJNFhhH//0eBEW83nvxKu2YAkt5KXMyylRpwvoOmgd2PfbWETGE3FbhHvIvEPE/Dl00rOJFRh9/y1HghyZf9PyxcMTL84tWXFvj9Nq9lzEMDVaUrQ3HJ3MSOil/atfXZmT34f3zHTI2sEO2hrAxbLn/5QnSpruwFWmHPSJw8SFmgoLHExsukBbZfM5BomEJk0sF5Mni/S2IdOlBCrP+syN2PgypedVC6uFv07kxubUmySzFtLx4DdOAYXo55529XbRQff7ejwj91ZmlynUimhQuTYGFVpEyrBU6NZYloDY/lrf8+FRYfeCMxki+Aqgvo0iY3qZNpAx0thGDtM4N harhipova@mirantis.com
+          user: ${linux:system:user:harhipova}
diff --git a/openssh/server/team/members/tkhlivnyak.yml b/openssh/server/team/members/tkhlivnyak.yml
new file mode 100644
index 0000000..6e352df
--- /dev/null
+++ b/openssh/server/team/members/tkhlivnyak.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        tkhlivnyak:
+          email: tkhlivnyak@mirantis.com
+          enabled: true
+          full_name: Taras Khlivnyak
+          home: /home/tkhlivnyak
+          name: tkhlivnyak
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        tkhlivnyak:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQChpyYEagNl9JbtuuDAf9eEIxHHwpGzJTOK4nYhxzRaHA8L2CKaoIL+vMGF6OIeEwXmSvYk7DFhQX4eZsLEF+vPgnjIVqWBBFyBaaC/bQVpZgGrIjYSsIGQjCh86ZdWQJl/GHswN39cU5ZyreiJ+m3iRmtnNr9JDC0hbrpxUdxaalEZ0cKyuOG4MHPSzoT0nAQAMlm3J3lToNipuB5v0hxhEcybFCT4ZcoJvbHkpftmkts95eDAPFQueMnzy0layChWMEd1ppUXQeV/VJ7TsxZov8luTLiDURpDJhgc6VoJ37rSBmunuAlHFYpkRpQS01vzby/rW1Nq+9eb2dHmIWClV7M40i9XQEzBk8MamyzzA9mqjSODIU117IWQHZUx3cGguWiosY4phdcMdwHbXhkwmuz8V04HCKHFwUvj1boKZ2pyPa01TDLLxhad3L+NCi4UoapsjrMGv+VJb9VWfJglEqO6VWpeZTeKquflzQZUMQiBq02XKaqoWV1LFr2AEEAOhZCNsNbLgQF79JwHCuzfPisDhQprFok+GJjUqrl6py25/GzItFZW+5N/o/onMw6VG8fVS2qlDccESKbNykUwXZhHPu36LaU9FYIamM3vZ+kJY//LqgHf6gIU5uHTikYUDd6FqW7Mb/a207K5O3uip5qH1XkNi3pql/Pi7UcOow== tkhlivnyak@mirantis.com
+          user: ${linux:system:user:tkhlivnyak}