diff --git a/.zuul.yaml b/.zuul.yaml
index ee799ff4f9..b316c201b4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -100,6 +100,7 @@
       - ^.*\.rst$
       - ^api-ref/.*$
       - ^doc/.*$
+      - ^etc/heat/heat-.*-generator.conf$
       - ^heat/locale/.*$
       - ^heat/tests/.*$
       - ^releasenotes/.*$
@@ -177,6 +178,7 @@
       - ^.*\.rst$
       - ^api-ref/.*$
       - ^doc/.*$
+      - ^etc/heat/heat-.*-generator.conf$
       - ^heat/locale/.*$
       - ^heat/tests/.*$
       - ^releasenotes/.*$
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 933b0f3cbc..f19167a239 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -92,7 +92,7 @@ policy_generator_config_file = '../../etc/heat/heat-policy-generator.conf'
 sample_policy_basename = '_static/heat'
 
 # oslo_config.sphinxconfiggen options
-config_generator_config_file = '../../config-generator.conf'
+config_generator_config_file = '../../etc/heat/heat-config-generator.conf'
 sample_config_basename = '_static/heat'
 
 # openstackdocstheme options
diff --git a/doc/source/configuration/config-options.rst b/doc/source/configuration/config-options.rst
index 87a6e1caad..cf7865f1b5 100644
--- a/doc/source/configuration/config-options.rst
+++ b/doc/source/configuration/config-options.rst
@@ -6,4 +6,4 @@ The following options can be set in the ``/etc/heat/heat.conf`` config file.
 A :doc:`sample configuration file <sample_config>` is also available.
 
 .. show-options::
-   :config-file: config-generator.conf
+   :config-file: etc/heat/heat-config-generator.conf
diff --git a/config-generator.conf b/etc/heat/heat-config-generator.conf
similarity index 100%
rename from config-generator.conf
rename to etc/heat/heat-config-generator.conf
diff --git a/tox.ini b/tox.ini
index 57678d2471..ff3a47fcbd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -85,7 +85,7 @@ commands =
 
 [testenv:genconfig]
 commands =
-    oslo-config-generator --config-file=config-generator.conf
+    oslo-config-generator --config-file=etc/heat/heat-config-generator.conf
 
 [testenv:genpolicy]
 commands =