diff --git a/ironic/conductor/storage/cinder.yml b/ironic/conductor/storage/cinder.yml
index 8e5ea12..33af09a 100644
--- a/ironic/conductor/storage/cinder.yml
+++ b/ironic/conductor/storage/cinder.yml
@@ -1,6 +1,9 @@
 parameters:
   ironic:
     conductor:
+      enabled_storage_interfaces:
+        - noop
+        - cinder
       cinder:
         auth_strategy: keystone
         auth_type: password
diff --git a/openssh/server/team/maintenance.yml b/openssh/server/team/maintenance.yml
index 0bceaad..110b085 100644
--- a/openssh/server/team/maintenance.yml
+++ b/openssh/server/team/maintenance.yml
@@ -5,6 +5,7 @@
 - system.openssh.server.team.members.vkhlyunev
 - system.openssh.server.team.members.dtsapikov
 - system.openssh.server.team.members.rlubianyi
+- system.openssh.server.team.members.msamoylov
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/members/msamoylov.yml b/openssh/server/team/members/msamoylov.yml
new file mode 100644
index 0000000..70ddb80
--- /dev/null
+++ b/openssh/server/team/members/msamoylov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        msamoylov:
+          email: msamoylov@mirantis.com
+          enabled: true
+          full_name: Mikhail Samoylov
+          home: /home/msamoylov
+          name: msamoylov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        msamoylov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvWBvRN2uYS0eolhaXRbsp8w5QM0B4ebpuTK3cT60ZLnxr99HrzBqwH6KjGkt9/V0xdUo6wuSjh+r6xuCUae7owC6T8fnUYuVt6Fyd9Wh33tjMIfj+EZBZLrmQW3X0OqwY1x3/YIzzfLlrtF9JwHvGcbt9nv7h+2jAh0iPB8p+1ITrzkJ9UZK6LSmeB1w6HVqJDqLZuz/R6pyRciSbIc5uTVXy8RJAp4Tsak6SDXJcZMm8WQT5g2ZHVRriVmca/Iy++xNuPIqL3TwX9y3KHksQY2E3yiOURn3b5hovVXHuTuRLMZo4yuT4nKSRylsRnPX0HH9cdgI6/DIRL+52HLAv msamoylov@msamoylov
+          user: ${linux:system:user:msamoylov}