diff --git a/oslo_templates/files/queens/oslo/messaging/_rabbit.conf b/oslo_templates/files/queens/oslo/messaging/_rabbit.conf
index cc7aa9d..9924709 100644
--- a/oslo_templates/files/queens/oslo/messaging/_rabbit.conf
+++ b/oslo_templates/files/queens/oslo/messaging/_rabbit.conf
@@ -22,11 +22,16 @@
 # available on some distributions. (string value)
 # Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_version
 #ssl_version =
-{%- if _data.ssl.version is defined %}
+  {%- if _data.ssl.version is defined %}
 ssl_version = {{ _data.ssl.version }}
-{%- elif salt['grains.get']('pythonversion') > [2,7,8] %}
+  {%- elif salt['grains.get']('pythonversion') > [2,7,8] %}
 ssl_version = TLSv1_2
-{%- endif %}
+  {%- endif %}
+  {%- if _data.get('x509',{}).get('enabled', False) %}
+kombu_ssl_ca_certs = {{ _data.x509.ca_file}}
+kombu_ssl_keyfile = {{ _data.x509.key_file}}
+kombu_ssl_certfile = {{ _data.x509.cert_file}}
+  {%- else %}
 
 
 # SSL key file (valid only if SSL enabled). (string value)
@@ -42,6 +47,7 @@
 # Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs
 #ssl_ca_file =
 ssl_ca_certs = {{ _data.ssl.cacert_file }}
+  {%- endif %}
 {%- endif %}