diff --git a/defaults/main.yml b/defaults/main.yml
index 86b71832..c9c824f0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -234,6 +234,8 @@ neutron_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}"
 neutron_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}"
 neutron_oslomsg_rpc_userid: neutron
 neutron_oslomsg_rpc_vhost: /neutron
+neutron_oslomsg_rpc_ssl_version: "{{ oslomsg_rpc_ssl_version | default('TLSv1_2') }}"
+neutron_oslomsg_rpc_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}"
 
 # Notify
 
@@ -246,6 +248,8 @@ neutron_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}"
 neutron_oslomsg_notify_userid: "{{ neutron_oslomsg_rpc_userid }}"
 neutron_oslomsg_notify_password: "{{ neutron_oslomsg_rpc_password }}"
 neutron_oslomsg_notify_vhost: "{{ neutron_oslomsg_rpc_vhost }}"
+neutron_oslomsg_notify_ssl_version: "{{ oslomsg_notify_ssl_version | default('TLSv1_2') }}"
+neutron_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}"
 
 ###
 ### (Qdrouterd) integration
diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2
index 35f719a8..02038f99 100644
--- a/templates/neutron.conf.j2
+++ b/templates/neutron.conf.j2
@@ -18,7 +18,7 @@ use_journal = True
 ## Rpc all
 executor_thread_pool_size = {{ neutron_rpc_thread_pool_size }}
 rpc_response_timeout = {{ neutron_rpc_response_timeout }}
-transport_url = {{ neutron_oslomsg_rpc_transport }}://{% for host in neutron_oslomsg_rpc_servers.split(',') %}{{ neutron_oslomsg_rpc_userid }}:{{ neutron_oslomsg_rpc_password }}@{{ host }}:{{ neutron_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ neutron_oslomsg_rpc_vhost }}{% if neutron_oslomsg_rpc_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
+transport_url = {{ neutron_oslomsg_rpc_transport }}://{% for host in neutron_oslomsg_rpc_servers.split(',') %}{{ neutron_oslomsg_rpc_userid }}:{{ neutron_oslomsg_rpc_password }}@{{ host }}:{{ neutron_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ neutron_oslomsg_rpc_vhost }}{% if neutron_oslomsg_rpc_use_ssl | bool %}?ssl=1&ssl_version={{ neutron_oslomsg_rpc_ssl_version }}&ssl_ca_file={{ neutron_oslomsg_rpc_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 
 # Domain to use for building hostnames
 dns_domain = {{ neutron_dns_domain }}
@@ -220,7 +220,6 @@ root_helper_daemon = sudo {{ neutron_bin }}/neutron-rootwrap-daemon {{ neutron_c
 
 # Messaging
 [oslo_messaging_rabbit]
-ssl = {{ neutron_oslomsg_rpc_use_ssl }}
 rpc_conn_pool_size = {{ neutron_rpc_conn_pool_size }}
 
 # Notifications
@@ -234,7 +233,7 @@ rpc_conn_pool_size = {{ neutron_rpc_conn_pool_size }}
 {% endif %}
 topics = {{ notification_topics | join(',') }}
 driver = {{ (notification_topics | length > 0) | ternary('messagingv2', 'noop') }}
-transport_url = {{ neutron_oslomsg_notify_transport }}://{% for host in neutron_oslomsg_notify_servers.split(',') %}{{ neutron_oslomsg_notify_userid }}:{{ neutron_oslomsg_notify_password }}@{{ host }}:{{ neutron_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ neutron_oslomsg_notify_vhost }}{% if neutron_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
+transport_url = {{ neutron_oslomsg_notify_transport }}://{% for host in neutron_oslomsg_notify_servers.split(',') %}{{ neutron_oslomsg_notify_userid }}:{{ neutron_oslomsg_notify_password }}@{{ host }}:{{ neutron_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ neutron_oslomsg_notify_vhost }}{% if neutron_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ neutron_oslomsg_notify_ssl_version }}&ssl_ca_file={{ neutron_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 
 # Concurrency (locking mechanisms)
 [oslo_concurrency]