diff --git a/doc/config-reference/ch_blockstorageconfigure.xml b/doc/config-reference/ch_blockstorageconfigure.xml
index 2e58a7e483..d9d840b106 100644
--- a/doc/config-reference/ch_blockstorageconfigure.xml
+++ b/doc/config-reference/ch_blockstorageconfigure.xml
@@ -15,5 +15,5 @@
   <xi:include href="block-storage/section_fc-zoning.xml"/>
   <xi:include href="block-storage/section_volume-encryption.xml"/>
   <xi:include href="block-storage/section_misc.xml"/>
-  <xi:include href="../common/tables/cinder-conf-changes.xml"/>
+  <xi:include href="conf-changes/cinder.xml"/>
 </chapter>
diff --git a/doc/config-reference/ch_computeconfigure.xml b/doc/config-reference/ch_computeconfigure.xml
index 45f06fce94..a6d5827990 100644
--- a/doc/config-reference/ch_computeconfigure.xml
+++ b/doc/config-reference/ch_computeconfigure.xml
@@ -96,5 +96,5 @@
   <xi:include href="compute/section_compute-config-samples.xml"/>
   <xi:include href="compute/section_nova-log-files.xml"/>
   <xi:include href="compute/section_compute-options-reference.xml"/>
-  <xi:include href="../common/tables/nova-conf-changes.xml"/>
+  <xi:include href="conf-changes/nova.xml"/>
 </chapter>
diff --git a/doc/config-reference/ch_databaseserviceconfigure.xml b/doc/config-reference/ch_databaseserviceconfigure.xml
index 2b42afc05c..20377cff36 100644
--- a/doc/config-reference/ch_databaseserviceconfigure.xml
+++ b/doc/config-reference/ch_databaseserviceconfigure.xml
@@ -37,5 +37,5 @@
       <xi:include href="database-service/section-databaseservice-db.xml"/>
       <xi:include href="database-service/section-databaseservice-rpc.xml"/>
 
-      <xi:include href="../common/tables/trove-conf-changes.xml"/>
+      <xi:include href="conf-changes/trove.xml"/>
 </chapter>
diff --git a/doc/config-reference/ch_dataprocessingserviceconfigure.xml b/doc/config-reference/ch_dataprocessingserviceconfigure.xml
index 9a5ca71672..9d77b7f70c 100644
--- a/doc/config-reference/ch_dataprocessingserviceconfigure.xml
+++ b/doc/config-reference/ch_dataprocessingserviceconfigure.xml
@@ -30,6 +30,6 @@
       <xi:include href="../common/tables/sahara-timeouts.xml"/>
       <xi:include href="../common/tables/sahara-zeromq.xml"/>
 
-      <xi:include href="../common/tables/sahara-conf-changes.xml"/>
+      <xi:include href="conf-changes/sahara.xml"/>
 
 </chapter>
diff --git a/doc/config-reference/ch_identityconfigure.xml b/doc/config-reference/ch_identityconfigure.xml
index 5a6bffe994..7f6d1a67c3 100644
--- a/doc/config-reference/ch_identityconfigure.xml
+++ b/doc/config-reference/ch_identityconfigure.xml
@@ -92,5 +92,5 @@ options. For installation prerequisites and step-by-step walkthroughs, see the
     </section>
 
     <xi:include href="identity/section_keystone-sample-conf-files.xml"/>
-    <xi:include href="../common/tables/keystone-conf-changes.xml"/>
+    <xi:include href="conf-changes/keystone.xml"/>
 </chapter>
diff --git a/doc/config-reference/ch_imageservice.xml b/doc/config-reference/ch_imageservice.xml
index 070f55a3fb..0c79a27e12 100644
--- a/doc/config-reference/ch_imageservice.xml
+++ b/doc/config-reference/ch_imageservice.xml
@@ -44,5 +44,5 @@
     <xi:include href="image-service/section_image-service-ISO-support.xml"/>
     <xi:include href="image-service/section_image-service-backends.xml"/>
     <xi:include href="image-service/section_image-service-sample-configuration-files.xml" />
-    <xi:include href="../common/tables/glance-conf-changes.xml"/>
+    <xi:include href="conf-changes/glance.xml"/>
 </chapter>
diff --git a/doc/config-reference/ch_networkingconfigure.xml b/doc/config-reference/ch_networkingconfigure.xml
index fe9a8698cc..6e557c811b 100644
--- a/doc/config-reference/ch_networkingconfigure.xml
+++ b/doc/config-reference/ch_networkingconfigure.xml
@@ -14,5 +14,5 @@
     <xi:include href="networking/section_networking-options-reference.xml"/>
     <xi:include href="networking/section_networking-log-files.xml"/>
     <xi:include href="networking/section_networking-sample-configuration-files.xml"/>
-    <xi:include href="../common/tables/neutron-conf-changes.xml"/>
+    <xi:include href="conf-changes/neutron.xml"/>
 </chapter>
diff --git a/doc/config-reference/ch_objectstorageconfigure.xml b/doc/config-reference/ch_objectstorageconfigure.xml
index 6493e8eaa9..e12d96fc8c 100644
--- a/doc/config-reference/ch_objectstorageconfigure.xml
+++ b/doc/config-reference/ch_objectstorageconfigure.xml
@@ -243,5 +243,5 @@
     <xi:include
         href="object-storage/section_object-storage-features.xml"/>
 
-    <xi:include href="../common/tables/swift-conf-changes.xml"/>
+    <xi:include href="conf-changes/swift.xml"/>
 </chapter>
diff --git a/doc/config-reference/ch_orchestrationconfigure.xml b/doc/config-reference/ch_orchestrationconfigure.xml
index afa7798274..a07f383ecd 100644
--- a/doc/config-reference/ch_orchestrationconfigure.xml
+++ b/doc/config-reference/ch_orchestrationconfigure.xml
@@ -30,5 +30,5 @@
     <xi:include href="orchestration/section_orchestration-api.xml"/>
     <xi:include href="orchestration/section_orchestration-clients.xml"/>
     <xi:include href="orchestration/section_orchestration-rpc.xml"/>
-    <xi:include href="../common/tables/heat-conf-changes.xml"/>
+    <xi:include href="conf-changes/heat.xml"/>
 </chapter>
diff --git a/doc/config-reference/ch_telemetryconfigure.xml b/doc/config-reference/ch_telemetryconfigure.xml
index 3aa1cf0988..5b3e1ef13e 100644
--- a/doc/config-reference/ch_telemetryconfigure.xml
+++ b/doc/config-reference/ch_telemetryconfigure.xml
@@ -50,5 +50,5 @@
     <xi:include href="../common/tables/ceilometer-zeromq.xml"/>
 
     <xi:include href="telemetry/section_telemetry-sample-configuration-files.xml" />
-    <xi:include href="../common/tables/ceilometer-conf-changes.xml"/>
+    <xi:include href="conf-changes/ceilometer.xml"/>
 </chapter>
diff --git a/doc/config-reference/conf-changes/README.txt b/doc/config-reference/conf-changes/README.txt
new file mode 100644
index 0000000000..d81a0e544d
--- /dev/null
+++ b/doc/config-reference/conf-changes/README.txt
@@ -0,0 +1,3 @@
+Do not manually edit the files in this folder. They are automatically generated
+and your changes will be overwritten. The tool to update the files lives in the
+openstack-doc-tools repository.
diff --git a/doc/common/tables/ceilometer-conf-changes.xml b/doc/config-reference/conf-changes/ceilometer.xml
similarity index 100%
rename from doc/common/tables/ceilometer-conf-changes.xml
rename to doc/config-reference/conf-changes/ceilometer.xml
diff --git a/doc/common/tables/cinder-conf-changes.xml b/doc/config-reference/conf-changes/cinder.xml
similarity index 100%
rename from doc/common/tables/cinder-conf-changes.xml
rename to doc/config-reference/conf-changes/cinder.xml
diff --git a/doc/common/tables/glance-conf-changes.xml b/doc/config-reference/conf-changes/glance.xml
similarity index 100%
rename from doc/common/tables/glance-conf-changes.xml
rename to doc/config-reference/conf-changes/glance.xml
diff --git a/doc/common/tables/heat-conf-changes.xml b/doc/config-reference/conf-changes/heat.xml
similarity index 100%
rename from doc/common/tables/heat-conf-changes.xml
rename to doc/config-reference/conf-changes/heat.xml
diff --git a/doc/common/tables/keystone-conf-changes.xml b/doc/config-reference/conf-changes/keystone.xml
similarity index 100%
rename from doc/common/tables/keystone-conf-changes.xml
rename to doc/config-reference/conf-changes/keystone.xml
diff --git a/doc/common/tables/neutron-conf-changes.xml b/doc/config-reference/conf-changes/neutron.xml
similarity index 100%
rename from doc/common/tables/neutron-conf-changes.xml
rename to doc/config-reference/conf-changes/neutron.xml
diff --git a/doc/common/tables/nova-conf-changes.xml b/doc/config-reference/conf-changes/nova.xml
similarity index 100%
rename from doc/common/tables/nova-conf-changes.xml
rename to doc/config-reference/conf-changes/nova.xml
diff --git a/doc/common/tables/sahara-conf-changes.xml b/doc/config-reference/conf-changes/sahara.xml
similarity index 100%
rename from doc/common/tables/sahara-conf-changes.xml
rename to doc/config-reference/conf-changes/sahara.xml
diff --git a/doc/common/tables/swift-conf-changes.xml b/doc/config-reference/conf-changes/swift.xml
similarity index 100%
rename from doc/common/tables/swift-conf-changes.xml
rename to doc/config-reference/conf-changes/swift.xml
diff --git a/doc/common/tables/trove-conf-changes.xml b/doc/config-reference/conf-changes/trove.xml
similarity index 100%
rename from doc/common/tables/trove-conf-changes.xml
rename to doc/config-reference/conf-changes/trove.xml