diff --git a/metadata/service/api/cluster.yml b/metadata/service/api/cluster.yml
index a7d55fd..e86c56b 100644
--- a/metadata/service/api/cluster.yml
+++ b/metadata/service/api/cluster.yml
@@ -38,6 +38,3 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
-      haproxy_amphora:
-        client_cert: '/etc/octavia/certs/client.pem'
-        server_ca: '/etc/octavia/certs/ca_01.pem'
diff --git a/metadata/service/api/single.yml b/metadata/service/api/single.yml
index 532ec9b..dabaa6b 100644
--- a/metadata/service/api/single.yml
+++ b/metadata/service/api/single.yml
@@ -36,6 +36,3 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
-      haproxy_amphora:
-        client_cert: '/etc/octavia/certs/client.pem'
-        server_ca: '/etc/octavia/certs/ca_01.pem'
diff --git a/metadata/service/manager/single.yml b/metadata/service/manager/single.yml
index 13cdddf..3303e08 100644
--- a/metadata/service/manager/single.yml
+++ b/metadata/service/manager/single.yml
@@ -34,7 +34,6 @@
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
       certificates:
-        ca_private_key_passphrase: foobar
         ca_private_key: '/etc/octavia/certs/private/cakey.pem'
         ca_certificate: '/etc/octavia/certs/ca_01.pem'
       controller_worker:
@@ -44,6 +43,8 @@
         loadbalancer_topology: 'SINGLE'
       haproxy_amphora:
         client_cert: '/etc/octavia/certs/client.pem'
+        client_cert_key: '/etc/octavia/certs/client.key'
+        client_cert_all: '/etc/octavia/certs/client_all.pem'
         server_ca: '/etc/octavia/certs/ca_01.pem'
       health_manager:
         bind_ip: ${_param:octavia_hm_bind_ip}