diff --git a/barbican/client/v1/init.yml b/barbican/client/v1/init.yml
index c582343..352520d 100644
--- a/barbican/client/v1/init.yml
+++ b/barbican/client/v1/init.yml
@@ -1,5 +1,6 @@
-barbican:
-  client:
-    resources:
-      v1:
-        enabled: true
\ No newline at end of file
+parameters:
+  barbican:
+    client:
+      resources:
+        v1:
+          enabled: true
\ No newline at end of file
diff --git a/barbican/client/v1/signed_images/octavia.yml b/barbican/client/v1/signed_images/octavia.yml
index c348674..ae708cf 100644
--- a/barbican/client/v1/signed_images/octavia.yml
+++ b/barbican/client/v1/signed_images/octavia.yml
@@ -1,3 +1,6 @@
+classes:
+- system.barbican.client.v1.octavia
+
 parameters:
   _param:
     octavia_image_cert_key: '/etc/octavia/certs/image.key'
diff --git a/openssh/server/team/members/vnaumov.yml b/openssh/server/team/members/vnaumov.yml
index f46cd1d..2805e2c 100644
--- a/openssh/server/team/members/vnaumov.yml
+++ b/openssh/server/team/members/vnaumov.yml
@@ -15,5 +15,5 @@
         vnaumov:
           enabled: true
           public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDno7VX9jiveRCF7d1C/FK24WLZwCArdrBBOQ1uHqpkUfUYtG6vrYgt/K2n2FXoX55lbeoJAwuNC9HviaY+vQAekCI4W2s02iD+j/GRUwitpv+lJZXSmt/q2PgLz3OFUIsJV0EwyNl+bexM4+2jYTmHeDMrXAsHL4I2GUv5sFycA11UhxZ/Qm2QMKlRZhje/IJieX9u2BhgYuPYffASVl4AhwtDagYdqquwUXrfu/dQRt/U9w0Di9alApcyPqiW9LbXUgwha1G9+ScQnxmp8WvmaV8YR+nf2OFxQHvOZPYjCzniRnYpaQUMeUAkJKxDwqR1dAKYnaQY5TfXtFwfzsjN vnaumov@vnaumov
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqP7Tzblm0G34kdnW0rbTc4dqJlFq0bVCwiuCadbVgLU0/u6mo48gmejKU2svr4wSKUsAu8Z6bbxqoHz8bpIhABvJkENgkafDR7MC8BUEdUqjw54QRVZ987pVb5f8cyJsbu2jr0F+5B3q0mAujxjCCWRUg9oPiojduD9XJ7+zGv98oREQOpElqVHe05NoZ+cYN6ld/Ye23NltJAnWnJx/W46UnyPpM+5OA1vW9NLLn2CIs9Dj0bsmIVBbUYMTgQtpwPoXcx/UBt1QhK7CJ7pT8UyIS6eoW6F6WdFw8f0sS+pKYzIvyDjKzyrJtcKyfFg5Ca8vtUNEzQM6ARUq7gBGl vnaumov@mirantis.com
           user: ${linux:system:user:vnaumov}
diff --git a/salt/minion/cert/octavia/image_sign.yml b/salt/minion/cert/octavia/image_sign.yml
index 2e67a02..ad7cfd0 100644
--- a/salt/minion/cert/octavia/image_sign.yml
+++ b/salt/minion/cert/octavia/image_sign.yml
@@ -1,17 +1,15 @@
-classes:
-- system.salt.minion.cert.octavia
 parameters:
   _param:
+    salt_minion_ca_authority: salt_master_ca
     octavia_image_cert_key: /etc/octavia/certs/image.key
     octavia_image_cert_file: /etc/octavia/certs/image.crt
   salt:
     minion:
       cert:
         octavia:
-          host: ${_param:octavia_ca_host}
-          authority: octavia_ca
+          host: ${_param:salt_minion_ca_host}
+          authority: ${_param:salt_minion_ca_authority}
           common_name: octavia
           signing_policy: cert_server
-          key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
           key_file:  ${_param:octavia_image_cert_key}
           cert_file: ${_param:octavia_image_cert_file}
\ No newline at end of file