diff --git a/defaults/main.yml b/defaults/main.yml
index e4a4ffed..28663dbc 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -82,6 +82,8 @@ cinder_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}"
 cinder_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}"
 cinder_oslomsg_rpc_userid: cinder
 cinder_oslomsg_rpc_vhost: /cinder
+cinder_oslomsg_rpc_ssl_version: "{{ oslomsg_rpc_ssl_version | default('TLSv1_2') }}"
+cinder_oslomsg_rpc_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}"
 
 # Notify
 cinder_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"
@@ -93,6 +95,8 @@ cinder_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}"
 cinder_oslomsg_notify_userid: "{{ cinder_oslomsg_rpc_userid }}"
 cinder_oslomsg_notify_password: "{{ cinder_oslomsg_rpc_password }}"
 cinder_oslomsg_notify_vhost: "{{ cinder_oslomsg_rpc_vhost }}"
+cinder_oslomsg_notify_ssl_version: "{{ oslomsg_notify_ssl_version | default('TLSv1_2') }}"
+cinder_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}"
 
 ## (Qdrouterd) integration
 # TODO(evrardjp): Change structure when more backends will be supported
diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2
index 81fd1fbc..dc4de5f4 100644
--- a/templates/cinder.conf.j2
+++ b/templates/cinder.conf.j2
@@ -55,7 +55,7 @@ backup_ceph_pool = {{ cinder_service_backup_ceph_pool }}
 executor_thread_pool_size = {{ cinder_rpc_executor_thread_pool_size }}
 rpc_response_timeout = {{ cinder_rpc_response_timeout }}
 
-transport_url = {{ cinder_oslomsg_rpc_transport }}://{% for host in cinder_oslomsg_rpc_servers.split(',') %}{{ cinder_oslomsg_rpc_userid }}:{{ cinder_oslomsg_rpc_password }}@{{ host }}:{{ cinder_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ cinder_oslomsg_rpc_vhost }}{% if cinder_oslomsg_rpc_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
+transport_url = {{ cinder_oslomsg_rpc_transport }}://{% for host in cinder_oslomsg_rpc_servers.split(',') %}{{ cinder_oslomsg_rpc_userid }}:{{ cinder_oslomsg_rpc_password }}@{{ host }}:{{ cinder_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ cinder_oslomsg_rpc_vhost }}{% if cinder_oslomsg_rpc_use_ssl | bool %}?ssl=1&ssl_version={{ cinder_oslomsg_rpc_ssl_version }}&ssl_ca_file={{ cinder_oslomsg_rpc_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 
 ## Quota
 quota_volumes = {{ cinder_quota_volumes }}
@@ -117,12 +117,9 @@ target_helper = {{ cinder_target_helper }}
 [database]
 connection = mysql+pymysql://{{ cinder_galera_user }}:{{ cinder_container_mysql_password }}@{{ cinder_galera_address }}/{{ cinder_galera_database }}?charset=utf8{% if cinder_galera_use_ssl | bool %}&ssl_ca={{ cinder_galera_ssl_ca_cert }}{% endif %}
 
-[oslo_messaging_rabbit]
-ssl = {{ cinder_oslomsg_rpc_use_ssl }}
-
 [oslo_messaging_notifications]
 driver = {{ (cinder_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }}
-transport_url = {{ cinder_oslomsg_notify_transport }}://{% for host in cinder_oslomsg_notify_servers.split(',') %}{{ cinder_oslomsg_notify_userid }}:{{ cinder_oslomsg_notify_password }}@{{ host }}:{{ cinder_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ cinder_oslomsg_notify_vhost }}{% if cinder_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
+transport_url = {{ cinder_oslomsg_notify_transport }}://{% for host in cinder_oslomsg_notify_servers.split(',') %}{{ cinder_oslomsg_notify_userid }}:{{ cinder_oslomsg_notify_password }}@{{ host }}:{{ cinder_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ cinder_oslomsg_notify_vhost }}{% if cinder_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ cinder_oslomsg_notify_ssl_version }}&ssl_ca_file={{ cinder_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 
 [oslo_concurrency]
 lock_path = {{ cinder_lock_path }}