diff --git a/octavia/api/cluster.yml b/octavia/api/cluster.yml
index 5b0f0ca..66622e3 100644
--- a/octavia/api/cluster.yml
+++ b/octavia/api/cluster.yml
@@ -1,5 +1,7 @@
 classes:
 - service.octavia.api.cluster
+- system.salt.minion.cert.mysql.clients.openstack.octavia
+- system.salt.minion.cert.rabbitmq.clients.openstack.octavia
 - system.haproxy.proxy.listen.openstack.octavia
 parameters:
   octavia:
@@ -10,8 +12,22 @@
         address: ${_param:cluster_local_address}
       database:
         host: ${_param:openstack_database_address}
+        x509:
+          enabled: ${_param:openstack_mysql_x509_enabled}
+          ca_file: ${_param:mysql_octavia_ssl_ca_file}
+          key_file: ${_param:mysql_octavia_client_ssl_key_file}
+          cert_file: ${_param:mysql_octavia_client_ssl_cert_file}
+        ssl:
+          enabled: ${_param:galera_ssl_enabled}
       identity:
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
         host: ${_param:openstack_message_queue_address}
+        x509:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
+          ca_file: ${_param:rabbitmq_octavia_ssl_ca_file}
+          key_file: ${_param:rabbitmq_octavia_client_ssl_key_file}
+          cert_file: ${_param:rabbitmq_octavia_client_ssl_cert_file}
+        ssl:
+          enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/octavia/api/single.yml b/octavia/api/single.yml
index ff76e76..54e0abb 100644
--- a/octavia/api/single.yml
+++ b/octavia/api/single.yml
@@ -1,8 +1,8 @@
 classes:
 - service.octavia.api.single
+- system.salt.minion.cert.mysql.clients.openstack.octavia
+- system.salt.minion.cert.rabbitmq.clients.openstack.octavia
 parameters:
-  _param:
-    internal_protocol: 'http'
   octavia:
     api:
       enabled: true
@@ -11,8 +11,22 @@
         address: ${_param:single_address}
       database:
         host: ${_param:openstack_database_address}
+        x509:
+          enabled: ${_param:openstack_mysql_x509_enabled}
+          ca_file: ${_param:mysql_octavia_ssl_ca_file}
+          key_file: ${_param:mysql_octavia_client_ssl_key_file}
+          cert_file: ${_param:mysql_octavia_client_ssl_cert_file}
+        ssl:
+          enabled: ${_param:galera_ssl_enabled}
       identity:
         region: ${_param:openstack_region}
-        protocol: ${_param:internal_protocol}
+        protocol: ${_param:cluster_internal_protocol}
       message_queue:
         host: ${_param:openstack_message_queue_address}
+        x509:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
+          ca_file: ${_param:rabbitmq_octavia_ssl_ca_file}
+          key_file: ${_param:rabbitmq_octavia_client_ssl_key_file}
+          cert_file: ${_param:rabbitmq_octavia_client_ssl_cert_file}
+        ssl:
+          enabled: ${_param:rabbitmq_ssl_enabled}