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/openstack/octavia_manager.yml b/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml
index 7557fbe..5eb715f 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,6 @@
 classes:
 - system.octavia.manager.single
-- system.salt.minion.ca.octavia_ca
-- system.salt.minion.cert.octavia.amphora_client
+
 parameters:
   _param:
     octavia_private_key: |
@@ -32,4 +31,14 @@
       FWC50XnPUbcpMwOZq9ibf/ZDHYo5NIxdbLkHG2Aw5ssPF2NFqRO8m+aST73fjoCL
       eULAsTn0btoxcPLLh+lv2jYhBH+ygF0Aa7lUgK+raFTkngeTTN4TTw==
       -----END RSA PRIVATE KEY-----
-
+  octavia:
+    # TODO remove these classes when https://gerrit.mcp.mirantis.com/#/c/32227/ got merged
+    manager:
+      certificates:
+        ca_private_key: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/ca.key
+        ca_certificate: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/ca_01.pem
+      haproxy_amphora:
+        client_cert: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/client.pem
+        client_cert_key: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/client.key
+        client_cert_all: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/client_all.pem
+        server_ca: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/ca_01.pem
\ No newline at end of file
diff --git a/classes/system b/classes/system
index 895c29b..7ce29c9 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 895c29b19304bf71dc6f626004ebdc7c5b824fc5
+Subproject commit 7ce29c90586d46c463181ce4def6722435d09fce