diff --git a/classes/cluster/virtual-mcp11-aio-octavia/infra/config.yml b/classes/cluster/virtual-mcp11-aio-octavia/infra/config.yml
index 0d55579..820fb97 100644
--- a/classes/cluster/virtual-mcp11-aio-octavia/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio-octavia/infra/config.yml
@@ -1,3 +1,5 @@
 classes:
 - cluster.virtual-mcp11-aio-octavia
-- cluster.virtual-mcp11-aio.infra.config
\ No newline at end of file
+- cluster.virtual-mcp11-aio.infra.config
+- system.salt.minion.ca.octavia_amphora_ca
+- system.salt.minion.cert.octavia.amphora_cluster_client
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio-octavia/init.yml b/classes/cluster/virtual-mcp11-aio-octavia/init.yml
index 5be1752..fbdf126 100755
--- a/classes/cluster/virtual-mcp11-aio-octavia/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-octavia/init.yml
@@ -4,9 +4,3 @@
 - cluster.virtual-mcp11-aio
 - cluster.overrides
 
-parameters:
-  salt:
-    minion:
-      cert:
-        octavia_amp_client:
-          ca_file: '/etc/octavia/certs/ca_01.pem'
diff --git a/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml
index f3940ca..f15bb31 100755
--- a/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml
@@ -3,11 +3,14 @@
 - system.keystone.client.service.octavia
 - system.glance.client.image.octavia
 - system.nova.client.service.octavia
-- system.neutron.control.openvswitch.octavia
+- system.neutron.client.service.octavia.single
 - system.neutron.client.service.octavia
 - system.octavia.api.single
 - system.octavia.client
-- cluster.virtual-mcp11-aio.openstack
+- system.barbican.client.v1.octavia
+- system.barbican.client.v1.signed_images.octavia
+- system.salt.minion.cert.octavia.image_sign
+- cluster.virtual-mcp11-aio-barbican.openstack
 parameters:
   _param:
     octavia_version: ${_param:openstack_version}
@@ -18,9 +21,15 @@
     octavia_api_v1_enabled: true
     octavia_api_v2_enabled: true
     amp_flavor_id: 10
-    octavia_hm_bind_ip: 192.168.0.12
+    octavia_health_manager_node01_address: 192.168.100.12
+    octavia_hm_bind_ip: ${_param:octavia_health_manager_node01_address}
+    octavia_lb_mgmt_cidr: 192.168.100.0/24
+    octavia_lb_mgmt_allocation_pool_start: 192.168.100.2
+    octavia_lb_mgmt_allocation_pool_end: 192.168.100.200
     # there is reference binding_host_id: ${_param:openstack_gateway_node01_hostname} in
     # salt-models/reclass-system/neutron/client/service/octavia.yml
     openstack_gateway_node01_hostname: ${_param:infra_config_hostname}
     octavia_public_key: |
       ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnN4SKRSb/0lYXUfjZ6+VfsxoGV0yx5lB30ErbsVOdbSihw9KEIB16jn6EhmYemId2DBMuTY3KcXTbE2KaH0USTVYgxtQPvzx5gG4G8itybYpGNnnTJEdPhAcmAIgzXi7aUmMXpopziUyEoNki86ArL8uv3r8IOD+j37yLNPWfV27CD3ejpVm27xTib31T8gNN6OQHSeV4G1W8Fw5wscvlycbsqhGDzaPxyXV4rVoObtF9FG87UBIfs2k1F4M5aikRMnH1FihjGMZTozwxc+9gQaacYsPrglUAkBGigzZxgsiGZN+xVLwhvjABHC56E8ufQIR02JBtLR1cKdz7iyfB root@cfg01
+    mcp_static_images_url: "http://images.mcp.mirantis.net"
+
diff --git a/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml b/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml
index 1db3e22..e698ee6 100644
--- a/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml
+++ b/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml
@@ -1,7 +1,5 @@
 classes:
 - system.octavia.manager.single
-- system.salt.minion.ca.octavia_ca
-- system.salt.minion.cert.octavia.amphora_client
 parameters:
   _param:
     octavia_private_key: |
@@ -32,8 +30,3 @@
       FWC50XnPUbcpMwOZq9ibf/ZDHYo5NIxdbLkHG2Aw5ssPF2NFqRO8m+aST73fjoCL
       eULAsTn0btoxcPLLh+lv2jYhBH+ygF0Aa7lUgK+raFTkngeTTN4TTw==
       -----END RSA PRIVATE KEY-----
-
-  octavia:
-      manager:
-        certificates:
-          ca_certificate: '/etc/pki/ca/octavia_ca/ca.crt'