diff --git a/templates/kilo/fwaas_driver.ini b/templates/kilo/fwaas_driver.ini
index 8ce9e542..b31a5008 100644
--- a/templates/kilo/fwaas_driver.ini
+++ b/templates/kilo/fwaas_driver.ini
@@ -1,3 +1,4 @@
+# kilo
 ###############################################################################
 # [ WARNING ]
 # Configuration file maintained by Juju. Local changes may be overwritten.
diff --git a/templates/kilo/lbaas_agent.ini b/templates/kilo/lbaas_agent.ini
index b37b7e1d..1c541b85 100644
--- a/templates/kilo/lbaas_agent.ini
+++ b/templates/kilo/lbaas_agent.ini
@@ -1,3 +1,8 @@
+# kilo
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
 [DEFAULT]
 periodic_interval = 10
 interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
diff --git a/templates/kilo/neutron.conf b/templates/kilo/neutron.conf
new file mode 100644
index 00000000..b6ae7361
--- /dev/null
+++ b/templates/kilo/neutron.conf
@@ -0,0 +1,23 @@
+# kilo
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+verbose = {{ verbose }}
+debug = {{ debug }}
+core_plugin = {{ core_plugin }}
+control_exchange = neutron
+notification_driver = neutron.openstack.common.notifier.list_notifier
+list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier
+{% if network_device_mtu -%}
+network_device_mtu = {{ network_device_mtu }}
+{% endif -%}
+
+[agent]
+root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+
+{% include "parts/section-rabbitmq" %}
+
+[oslo_concurrency]
+lock_path = /var/lock/neutron
diff --git a/templates/kilo/vpn_agent.ini b/templates/kilo/vpn_agent.ini
index 90874fd0..95c41926 100644
--- a/templates/kilo/vpn_agent.ini
+++ b/templates/kilo/vpn_agent.ini
@@ -1,3 +1,4 @@
+# kilo
 ###############################################################################
 # [ WARNING ]
 # Configuration file maintained by Juju. Local changes may be overwritten.