diff --git a/defaults/main.yml b/defaults/main.yml
index 16a3004f..3bf71ac2 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -101,6 +101,8 @@ octavia_oslomsg_notify_vhost: "{{ octavia_oslomsg_rpc_vhost }}"
 # TODO(ansmith): Change structure when more backends will be supported
 octavia_oslomsg_amqp1_enabled: "{{ octavia_oslomsg_rpc_transport == 'amqp' }}"
 
+octavia_ceilometer_enabled: False
+
 ## octavia User / Group
 octavia_system_user_name: octavia
 octavia_system_group_name: octavia
@@ -270,10 +272,6 @@ octavia_spare_amphora_pool_size: 1
 # e.g. 3 hosts, 5 workers (this param) per host, results in 15 worker total
 octavia_task_flow_max_workers: 5
 
-# event_streamer - set to True if you are using neutron lbaas with Octavia
-# (Octavia will stream events to the neutron DB)
-octavia_event_streamer: False
-
 # Enable provisioning status sync with neutron db
 octavia_sync_provisioning_status: False
 
diff --git a/templates/octavia.conf.j2 b/templates/octavia.conf.j2
index 76bcc781..3f0b798a 100644
--- a/templates/octavia.conf.j2
+++ b/templates/octavia.conf.j2
@@ -1,11 +1,10 @@
 [DEFAULT]
 debug = {{ debug }}
 use_journal = True
+executor_thread_pool_size = {{ octavia_rpc_thread_pool_size }}
+rpc_conn_pool_size = {{ octavia_rpc_conn_pool_size }}
 transport_url = {{ octavia_oslomsg_rpc_transport }}://{% for host in octavia_oslomsg_rpc_servers.split(',') %}{{ octavia_oslomsg_rpc_userid }}:{{ octavia_oslomsg_rpc_password }}@{{ host }}:{{ octavia_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ octavia_oslomsg_rpc_vhost }}{% if octavia_oslomsg_rpc_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 
-[oslo_messaging_notifications]
-transport_url = {{ octavia_oslomsg_notify_transport }}://{% for host in octavia_oslomsg_notify_servers.split(',') %}{{ octavia_oslomsg_notify_userid }}:{{ octavia_oslomsg_notify_password }}@{{ host }}:{{ octavia_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ octavia_oslomsg_notify_vhost }}{% if octavia_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
-
 [api_settings]
 bind_host = {{ octavia_uwsgi_bind_address }}
 bind_port = {{ octavia_service_port }}
@@ -15,10 +14,15 @@ auth_strategy = {{ octavia_auth_strategy }}
 # Allow users to create TLS Terminated listeners?
 allow_tls_terminated_listeners = {{ octavia_tls_listener_enabled }}
 
-# pre Ocata
+[oslo_messaging]
+topic = octavia_prov
+
 [oslo_messaging_rabbit]
 ssl = {{ octavia_oslomsg_rpc_use_ssl }}
-rpc_conn_pool_size = {{ octavia_rpc_conn_pool_size }}
+
+[oslo_messaging_notifications]
+driver = {{ (octavia_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }}
+transport_url = {{ octavia_oslomsg_notify_transport }}://{% for host in octavia_oslomsg_notify_servers.split(',') %}{{ octavia_oslomsg_notify_userid }}:{{ octavia_oslomsg_notify_password }}@{{ host }}:{{ octavia_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ octavia_oslomsg_notify_vhost }}{% if octavia_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 
 [database]
 connection = mysql+pymysql://{{ octavia_galera_user }}:{{ octavia_container_mysql_password }}@{{ octavia_galera_address }}/{{ octavia_galera_database }}?charset=utf8{% if octavia_galera_use_ssl | bool %}&ssl_ca={{ octavia_galera_ssl_ca_cert }}{% endif %}
@@ -35,11 +39,6 @@ controller_ip_port_list = {% for host in octavia_hm_hosts.split(',') %}{{ host }
 
 heartbeat_key = {{ octavia_health_hmac_key }}
 
-# EventStreamer options are
-#                            queue_event_streamer,
-#                            noop_event_streamer
-event_streamer_driver = {% if octavia_event_streamer|bool %}queue_event_streamer{% else %}noop_event_streamer{% endif %}
-
 # Enable provisioning status sync with neutron db
 sync_provisioning_status = {{ octavia_sync_provisioning_status }}
 
@@ -115,22 +114,6 @@ loadbalancer_topology = {{ octavia_loadbalancer_topology }}
 # engine = serial
 max_workers = {{ octavia_task_flow_max_workers }}
 
-[oslo_messaging]
-# Queue Consumer Thread Pool Size
-rpc_thread_pool_size = {{ octavia_rpc_thread_pool_size }}
-
-# Topic (i.e. Queue) Name
-topic = octavia_prov
-
-# Topic for octavia's events sent to a queue
-event_stream_topic = neutron_lbaas_event
-
-# Put it into the Neutron queue
-{% if octavia_event_streamer|bool %}
-event_stream_transport_url = {{ neutron_oslomsg_rpc_transport }}://{% for host in neutron_oslomsg_rpc_servers.split(',') %}{{ octavia_neutron_oslomsg_rpc_userid }}:{{ octavia_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 %}
-{% endif %}
-
-
 [house_keeping]
 spare_amphora_pool_size = {{ octavia_spare_amphora_pool_size }}