diff --git a/tasks/main.yml b/tasks/main.yml
index 7d3d10c..7c2af44 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -108,7 +108,6 @@
     _oslomsg_notify_password: "{{ heat_oslomsg_notify_password }}"
     _oslomsg_notify_vhost: "{{ heat_oslomsg_notify_vhost }}"
     _oslomsg_notify_transport: "{{ heat_oslomsg_notify_transport }}"
-    _oslomsg_configure_notify: "{{ heat_ceilometer_enabled | bool }}"
   tags:
     - common-mq
     - heat-config
diff --git a/templates/heat.conf.j2 b/templates/heat.conf.j2
index 43a166a..d459fc5 100644
--- a/templates/heat.conf.j2
+++ b/templates/heat.conf.j2
@@ -67,11 +67,9 @@ enable_proxy_headers_parsing = True
 {% endif %}
 
 # Ceilometer options
-{% if heat_ceilometer_enabled %}
 [oslo_messaging_notifications]
-driver = messagingv2
+driver = {% if heat_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
 transport_url = {{ heat_oslomsg_notify_transport }}://{% for host in heat_oslomsg_notify_servers.split(',') %}{{ heat_oslomsg_notify_userid }}:{{ heat_oslomsg_notify_password }}@{{ host }}:{{ heat_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ heat_oslomsg_notify_vhost }}{% if heat_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
-{% endif %}
 
 
 [profiler]