diff --git a/openssh/server/team/members/mmazepa.yml b/openssh/server/team/members/mmazepa.yml
index a8aa3ba..f7000c3 100644
--- a/openssh/server/team/members/mmazepa.yml
+++ b/openssh/server/team/members/mmazepa.yml
@@ -3,20 +3,17 @@
     system:
       user:
         mmazepa:
+          email: mmazepa@mirantis.com
           enabled: true
-          name: mmazepa
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Margarita Mazepa
           home: /home/mmazepa
-          email: mmazepa@mirantis.com
+          name: mmazepa
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         mmazepa:
           enabled: true
-          public_keys: ${public_keys:mmazepa}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcMaBZDgLdCaOtoSd76IMIS+eJvOZSkidAIeBw/XuKz1jXfftdjUwWUNV+51Q+trvGE/Z/Puv4KCzTxnBhqo2n2HsO+LWGUn1Kg9SIQv6leSnfl62nLaTi2iiE7G+JEk3It9/cqonJkTWsXiid0Ve27GooxlInlgpwfk0VE6zSeYBdBIwtdi/l/lenkkdcSSu+lOe58kDxUziZvvheZ08LwczPWYxYd3pmDmFi5WHOhVPoxR+9LICSNc012N9VU3E/h99nz7Bx2wmdBq+OE4ManHhUP90ntJmLkak7CoSsPOpNOtpkLfTbW/m2XVaWoUKT39s4aU8ItQ3tdWMzuWr/ margarita@wargyrl
           user: ${linux:system:user:mmazepa}
-  public_keys:
-    mmazepa:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcMaBZDgLdCaOtoSd76IMIS+eJvOZSkidAIeBw/XuKz1jXfftdjUwWUNV+51Q+trvGE/Z/Puv4KCzTxnBhqo2n2HsO+LWGUn1Kg9SIQv6leSnfl62nLaTi2iiE7G+JEk3It9/cqonJkTWsXiid0Ve27GooxlInlgpwfk0VE6zSeYBdBIwtdi/l/lenkkdcSSu+lOe58kDxUziZvvheZ08LwczPWYxYd3pmDmFi5WHOhVPoxR+9LICSNc012N9VU3E/h99nz7Bx2wmdBq+OE4ManHhUP90ntJmLkak7CoSsPOpNOtpkLfTbW/m2XVaWoUKT39s4aU8ItQ3tdWMzuWr/ margarita@wargyrl