diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index e6f222c125..7397d6d03b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -3059,3 +3059,13 @@
     jobs:
       - python-jobs
       - pypi-jobs
+
+- project:
+    name: doc8
+    github-org: stackforge
+    node: bare-precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 832df6dc82..2e833cfbac 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -4792,10 +4792,9 @@ projects:
       - noop
 
   - name: stackforge/doc8
-    check:
-      - noop
-    gate:
-      - noop
+    template:
+      - name: python-jobs
+      - name: publish-to-pypi
 
   - name: stackforge/tacker
     check: