diff --git a/templates/folsom/dhcp_agent.ini b/templates/folsom/dhcp_agent.ini
index 62672f37..6f9268e5 100644
--- a/templates/folsom/dhcp_agent.ini
+++ b/templates/folsom/dhcp_agent.ini
@@ -3,8 +3,8 @@ state_path = /var/lib/quantum
 interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver
 dhcp_driver = quantum.agent.linux.dhcp.Dnsmasq
 root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf
-{% if plugin == 'nvp' %}
+{% if plugin == 'nvp' -%}
 ovs_use_veth = True
 enable_metadata_network = True
 enable_isolated_metadata = True
-{% endif %}
+{% endif -%}
diff --git a/templates/folsom/metadata_agent.ini b/templates/folsom/metadata_agent.ini
index 44624192..e41548e8 100644
--- a/templates/folsom/metadata_agent.ini
+++ b/templates/folsom/metadata_agent.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-debug = True
 auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
 auth_region = {{ region }}
 admin_tenant_name = {{ service_tenant }}
@@ -10,8 +9,4 @@ state_path = /var/lib/quantum
 # Gateway runs a metadata API server locally
 nova_metadata_ip = {{ local_ip }}
 nova_metadata_port = 8775
-# When proxying metadata requests, Quantum signs the Instance-ID header with a
-# shared secret to prevent spoofing. You may select any string for a secret,
-# but it must match here and in the configuration used by the Nova Metadata
-# Server. NOTE: Nova uses a different key: quantum_metadata_proxy_shared_secret
 metadata_proxy_shared_secret = {{ shared_secret }}
diff --git a/templates/folsom/ovs_quantum_plugin.ini b/templates/folsom/ovs_quantum_plugin.ini
index 16f350f3..8f512815 100644
--- a/templates/folsom/ovs_quantum_plugin.ini
+++ b/templates/folsom/ovs_quantum_plugin.ini
@@ -1,4 +1,3 @@
-[DATABASE]
 [OVS]
 local_ip = {{ local_ip }}
 tenant_network_type = gre
diff --git a/templates/folsom/quantum.conf b/templates/folsom/quantum.conf
index be3ace39..00d88437 100644
--- a/templates/folsom/quantum.conf
+++ b/templates/folsom/quantum.conf
@@ -1,20 +1,14 @@
 [DEFAULT]
-verbose = True
+verbose = {{ verbose }}
+debug = {{ debug }}
+lock_path = /var/lock/quantum
+core_plugin = {{ core_plugin }} 
 rabbit_userid = {{ rabbitmq_user }}
 rabbit_virtual_host = {{ rabbitmq_virtual_host }}
 rabbit_host = {{ rabbitmq_host }}
 rabbit_password = {{ rabbitmq_password }}
-debug = True
-bind_host = 0.0.0.0
-bind_port = 9696
-core_plugin = {{ core_plugin }} 
-api_paste_config = /etc/quantum/api-paste.ini
 control_exchange = quantum
 notification_driver = quantum.openstack.common.notifier.list_notifier
 list_notifier_drivers = quantum.openstack.common.notifier.rabbit_notifier
-lock_path = /var/lock/quantum
-# Ensure that netns cleanup operations kill processes and remove ports
-# force = true
 [AGENT]
 root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf
-[QUOTAS]
\ No newline at end of file
diff --git a/templates/grizzly/quantum.conf b/templates/grizzly/quantum.conf
index 30356ccf..6bae4983 100644
--- a/templates/grizzly/quantum.conf
+++ b/templates/grizzly/quantum.conf
@@ -1,19 +1,11 @@
 [DEFAULT]
-verbose = True
-debug = True
-
-{% include "parts/rabbitmq" %}
-
-bind_host = 0.0.0.0
-bind_port = 9696
+verbose = {{ verbose }}
+debug = {{ debug }}
+lock_path = /var/lock/quantum
 core_plugin = {{ core_plugin }} 
-api_paste_config = /etc/quantum/api-paste.ini
+{% include "parts/rabbitmq" %}
 control_exchange = quantum
 notification_driver = quantum.openstack.common.notifier.list_notifier
 list_notifier_drivers = quantum.openstack.common.notifier.rabbit_notifier
-lock_path = /var/lock/quantum
-# Ensure that netns cleanup operations kill processes and remove ports
-# force = true
 [AGENT]
 root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf
-[QUOTAS]
diff --git a/templates/havana/dhcp_agent.ini b/templates/havana/dhcp_agent.ini
index bfd73841..85e93864 100644
--- a/templates/havana/dhcp_agent.ini
+++ b/templates/havana/dhcp_agent.ini
@@ -3,7 +3,6 @@
 # Configuration file maintained by Juju. Local changes may be overwritten.
 ###############################################################################
 [DEFAULT]
-debug = {{ debug }}
 state_path = /var/lib/neutron
 interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
@@ -11,8 +10,8 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 ovs_use_veth = True
 {% if instance_mtu -%}
 dnsmasq_config_file = /etc/neutron/dnsmasq.conf
-{% endif %}
-{% if plugin == 'nvp' %}
+{% endif -%}
+{% if plugin == 'nvp' -%}
 enable_metadata_network = True
 enable_isolated_metadata = True
-{% endif %}
+{% endif -%}
diff --git a/templates/havana/dnsmasq.conf b/templates/havana/dnsmasq.conf
index 5ac7f804..0ee10c05 100644
--- a/templates/havana/dnsmasq.conf
+++ b/templates/havana/dnsmasq.conf
@@ -1,3 +1,3 @@
 {%- if instance_mtu -%}
 dhcp-option=26,{{ instance_mtu }}
-{% endif %}
+{% endif -%}
diff --git a/templates/havana/fwaas_driver.ini b/templates/havana/fwaas_driver.ini
index 8fa03d2f..e64046dc 100644
--- a/templates/havana/fwaas_driver.ini
+++ b/templates/havana/fwaas_driver.ini
@@ -1,3 +1,7 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
 [fwaas]
 driver = neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver
 enabled = True
diff --git a/templates/havana/l3_agent.ini b/templates/havana/l3_agent.ini
index 7e294613..e8e2a0de 100644
--- a/templates/havana/l3_agent.ini
+++ b/templates/havana/l3_agent.ini
@@ -1,5 +1,8 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
 [DEFAULT]
-debug = {{ debug }}
 interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
 auth_region = {{ region }}
@@ -9,6 +12,6 @@ admin_password = {{ service_password }}
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 ovs_use_veth = True
 handle_internal_only_routers = {{ handle_internal_only_router }}
-{% if ext_net_id %}
+{% if ext_net_id -%}
 gateway_external_network_id = {{ ext_net_id }}
-{% endif %}
+{% endif -%}
diff --git a/templates/havana/lbaas_agent.ini b/templates/havana/lbaas_agent.ini
index de5c4118..6297be90 100644
--- a/templates/havana/lbaas_agent.ini
+++ b/templates/havana/lbaas_agent.ini
@@ -1,10 +1,8 @@
 [DEFAULT]
-debug = {{ debug }}
 periodic_interval = 10
 interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 ovs_use_veth = False
 device_driver = neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
-
 [haproxy]
 loadbalancer_state_path = $state_path/lbaas
 user_group = nogroup
diff --git a/templates/havana/metadata_agent.ini b/templates/havana/metadata_agent.ini
index 2bc984ea..4ce68537 100644
--- a/templates/havana/metadata_agent.ini
+++ b/templates/havana/metadata_agent.ini
@@ -1,5 +1,8 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
 [DEFAULT]
-debug = {{ debug }}
 auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
 auth_region = {{ region }}
 admin_tenant_name = {{ service_tenant }}
@@ -10,8 +13,4 @@ state_path = /var/lib/neutron
 # Gateway runs a metadata API server locally
 nova_metadata_ip = {{ local_ip }}
 nova_metadata_port = 8775
-# When proxying metadata requests, Quantum signs the Instance-ID header with a
-# shared secret to prevent spoofing. You may select any string for a secret,
-# but it must match here and in the configuration used by the Nova Metadata
-# Server. NOTE: Nova uses a different key: neutron_metadata_proxy_shared_secret
 metadata_proxy_shared_secret = {{ shared_secret }}
diff --git a/templates/havana/metering_agent.ini b/templates/havana/metering_agent.ini
index fedc1f54..1b6aa58b 100644
--- a/templates/havana/metering_agent.ini
+++ b/templates/havana/metering_agent.ini
@@ -1,5 +1,8 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
 [DEFAULT]
-debug = {{ debug }}
 driver = neutron.services.metering.drivers.iptables.iptables_driver.IptablesMeteringDriver
 measure_interval = 30
 report_interval = 300
diff --git a/templates/havana/neutron.conf b/templates/havana/neutron.conf
index 7837ba8b..33f095d0 100644
--- a/templates/havana/neutron.conf
+++ b/templates/havana/neutron.conf
@@ -1,19 +1,15 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
 [DEFAULT]
 verbose = {{ verbose }}
 debug = {{ debug }}
-
-{% include "parts/rabbitmq" %}
-
-bind_host = 0.0.0.0
-bind_port = 9696
+lock_path = /var/lock/neutron
 core_plugin = {{ core_plugin }} 
-api_paste_config = /etc/neutron/api-paste.ini
+{% include "parts/rabbitmq" %}
 control_exchange = neutron
 notification_driver = neutron.openstack.common.notifier.list_notifier
 list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier
-lock_path = /var/lock/neutron
-# Ensure that netns cleanup operations kill processes and remove ports
-# force = true
-[AGENT]
+[agent]
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
-[QUOTAS]
diff --git a/templates/havana/nova.conf b/templates/havana/nova.conf
index 282cc07b..86322927 100644
--- a/templates/havana/nova.conf
+++ b/templates/havana/nova.conf
@@ -1,3 +1,7 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
 [DEFAULT]
 logdir=/var/log/nova
 state_path=/var/lib/nova
diff --git a/templates/havana/ovs_neutron_plugin.ini b/templates/havana/ovs_neutron_plugin.ini
index 615e5d0a..96d0f824 100644
--- a/templates/havana/ovs_neutron_plugin.ini
+++ b/templates/havana/ovs_neutron_plugin.ini
@@ -1,9 +1,9 @@
-[DATABASE]
-[OVS]
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[ovs]
 local_ip = {{ local_ip }}
 tenant_network_type = gre
 enable_tunneling = True
 tunnel_id_ranges = 1:1000
-[AGENT]
-polling_interval = 10
-root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
diff --git a/templates/havana/vpn_agent.ini b/templates/havana/vpn_agent.ini
index f78815a7..3d6b21fb 100644
--- a/templates/havana/vpn_agent.ini
+++ b/templates/havana/vpn_agent.ini
@@ -1,9 +1,8 @@
-[DEFAULT]
-# VPN-Agent configuration file
-# Note vpn-agent inherits l3-agent, so you can use configs on l3-agent also
-
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
 [vpnagent]
 vpn_device_driver=neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver
-
 [ipsec]
 ipsec_status_check_interval=60
diff --git a/templates/icehouse/ml2_conf.ini b/templates/icehouse/ml2_conf.ini
index 519b5d05..6d2fb816 100644
--- a/templates/icehouse/ml2_conf.ini
+++ b/templates/icehouse/ml2_conf.ini
@@ -1,20 +1,19 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
 [ml2]
 type_drivers = gre,vxlan
 tenant_network_types = gre,vxlan
 mechanism_drivers = openvswitch
-
 [ml2_type_gre]
 tunnel_id_ranges = 1:1000
-
 [ml2_type_vxlan]
 vni_ranges = 1001:2000
-
 [ovs]
 enable_tunneling = True
 local_ip = {{ local_ip }}
-
 [agent]
 tunnel_types = gre
-
 [securitygroup]
 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
diff --git a/templates/icehouse/neutron.conf b/templates/icehouse/neutron.conf
index b8608b2f..6db71eb4 100644
--- a/templates/icehouse/neutron.conf
+++ b/templates/icehouse/neutron.conf
@@ -1,16 +1,15 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
 [DEFAULT]
 verbose = {{ verbose }}
 debug = {{ debug }}
-
+lock_path = /var/lock/neutron
 core_plugin = {{ core_plugin }} 
-
 {% include "parts/rabbitmq" %}
-
 control_exchange = neutron
 notification_driver = neutron.openstack.common.notifier.list_notifier
 list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier
-
-lock_path = /var/lock/neutron
-
 [agent]
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
\ No newline at end of file