diff --git a/elements/glance/os-config-applier/etc/glance/glance-api-paste.ini b/elements/glance/os-config-applier/etc/glance/glance-api-paste.ini
index 811fe5d1..e83ee81d 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-api-paste.ini
+++ b/elements/glance/os-config-applier/etc/glance/glance-api-paste.ini
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 # Use this pipeline for no auth or image caching - DEFAULT
 [pipeline:glance-api]
 pipeline = versionnegotiation unauthenticated-context rootapp
diff --git a/elements/glance/os-config-applier/etc/glance/glance-api.conf b/elements/glance/os-config-applier/etc/glance/glance-api.conf
index 33a36393..fcbbb766 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-api.conf
+++ b/elements/glance/os-config-applier/etc/glance/glance-api.conf
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 [DEFAULT]
 debug = True
 
diff --git a/elements/glance/os-config-applier/etc/glance/glance-cache.conf b/elements/glance/os-config-applier/etc/glance/glance-cache.conf
index 164d03fe..e9be08a2 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-cache.conf
+++ b/elements/glance/os-config-applier/etc/glance/glance-cache.conf
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 [DEFAULT]
 log_file = /var/log/glance/image-cache.log
 image_cache_dir = /var/lib/glance/image-cache/
diff --git a/elements/glance/os-config-applier/etc/glance/glance-registry-paste.ini b/elements/glance/os-config-applier/etc/glance/glance-registry-paste.ini
index dfbb7136..e11d9192 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-registry-paste.ini
+++ b/elements/glance/os-config-applier/etc/glance/glance-registry-paste.ini
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 # Use this pipeline for no auth - DEFAULT
 [pipeline:glance-registry]
 pipeline = unauthenticated-context registryapp
diff --git a/elements/glance/os-config-applier/etc/glance/glance-registry.conf b/elements/glance/os-config-applier/etc/glance/glance-registry.conf
index e8745f22..405b9cfb 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-registry.conf
+++ b/elements/glance/os-config-applier/etc/glance/glance-registry.conf
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 [DEFAULT]
 bind_host = 0.0.0.0
 bind_port = 9191
diff --git a/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf b/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf
index c986f32c..8fb50497 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf
+++ b/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 [DEFAULT]
 # Show more verbose log output (sets INFO log level output)
 #verbose = False
diff --git a/elements/glance/os-config-applier/etc/glance/logging.conf b/elements/glance/os-config-applier/etc/glance/logging.conf
index 8e68e2f9..2cdac312 100644
--- a/elements/glance/os-config-applier/etc/glance/logging.conf
+++ b/elements/glance/os-config-applier/etc/glance/logging.conf
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 [loggers]
 keys=root,api,registry,combined
 
diff --git a/elements/nova/os-config-applier/etc/nova/api-paste.ini b/elements/nova/os-config-applier/etc/nova/api-paste.ini
index 615fe29c..6c407ec3 100644
--- a/elements/nova/os-config-applier/etc/nova/api-paste.ini
+++ b/elements/nova/os-config-applier/etc/nova/api-paste.ini
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 ############
 # Metadata #
 ############
diff --git a/elements/nova/os-config-applier/etc/nova/logging.conf b/elements/nova/os-config-applier/etc/nova/logging.conf
index 47459efe..a4595c96 100644
--- a/elements/nova/os-config-applier/etc/nova/logging.conf
+++ b/elements/nova/os-config-applier/etc/nova/logging.conf
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 [loggers]
 keys = root, nova
 
diff --git a/elements/nova/os-config-applier/etc/nova/nova.conf b/elements/nova/os-config-applier/etc/nova/nova.conf
index 58c4a5a9..5f8a0b51 100644
--- a/elements/nova/os-config-applier/etc/nova/nova.conf
+++ b/elements/nova/os-config-applier/etc/nova/nova.conf
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 [DEFAULT]
 debug = True
 
diff --git a/elements/quantum/os-config-applier/etc/quantum/api-paste.ini b/elements/quantum/os-config-applier/etc/quantum/api-paste.ini
index f45b971b..69ae0656 100644
--- a/elements/quantum/os-config-applier/etc/quantum/api-paste.ini
+++ b/elements/quantum/os-config-applier/etc/quantum/api-paste.ini
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 [composite:quantum]
 use = egg:Paste#urlmap
 /: quantumversions
diff --git a/elements/quantum/os-config-applier/etc/quantum/dhcp_agent.ini b/elements/quantum/os-config-applier/etc/quantum/dhcp_agent.ini
index c12d6089..1c6ce7ac 100644
--- a/elements/quantum/os-config-applier/etc/quantum/dhcp_agent.ini
+++ b/elements/quantum/os-config-applier/etc/quantum/dhcp_agent.ini
@@ -1,3 +1,8 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
 [DEFAULT]
 debug = True
 
diff --git a/elements/quantum/os-config-applier/etc/quantum/l3_agent.ini b/elements/quantum/os-config-applier/etc/quantum/l3_agent.ini
index bc560f17..8099b27a 100644
--- a/elements/quantum/os-config-applier/etc/quantum/l3_agent.ini
+++ b/elements/quantum/os-config-applier/etc/quantum/l3_agent.ini
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 [DEFAULT]
 debug = True
 
diff --git a/elements/quantum/os-config-applier/etc/quantum/metadata_agent.ini b/elements/quantum/os-config-applier/etc/quantum/metadata_agent.ini
index bab5ed0b..8e191a9a 100644
--- a/elements/quantum/os-config-applier/etc/quantum/metadata_agent.ini
+++ b/elements/quantum/os-config-applier/etc/quantum/metadata_agent.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
 auth_url = http://{{keystone.host}}:35357/v2.0
 auth_region = RegionOne
-admin_tenant_name = %SERVICE_TENANT_NAME%
-admin_user = %SERVICE_USER%
-admin_password = %SERVICE_PASSWORD%
+admin_tenant_name = service
+admin_user = quantum
+admin_password = {{admin-password}}
diff --git a/elements/quantum/os-config-applier/etc/quantum/quantum.conf b/elements/quantum/os-config-applier/etc/quantum/quantum.conf
index a491fe24..748114c3 100644
--- a/elements/quantum/os-config-applier/etc/quantum/quantum.conf
+++ b/elements/quantum/os-config-applier/etc/quantum/quantum.conf
@@ -1,3 +1,9 @@
+## NB: Unpolished config file
+## This config file was taken directly from the upstream repo, and tweaked just enough to work.
+## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
+## Please submit patches for any setting that should be deleted or Heat-configurable.
+##  https://github.com/stackforge/diskimage-builder
+
 [DEFAULT]
 debug = True