diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 158aa66f8b..964813a308 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3896,8 +3896,8 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
-      - gate-{name}-pep8
-      - 'gate-{name}-requirements'
+      - gate-{name}-linters
+      - gate-{name}-requirements
       - '{name}-tarball'
       - pypi-jobs
       - openstack-releasenotes-jobs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 216c6703fc..af830056d1 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7192,9 +7192,9 @@ projects:
       - name: check-requirements
       - name: release-notes-jobs
     check:
-      - gate-openstack-doc-tools-pep8
+      - gate-openstack-doc-tools-linters
     gate:
-      - gate-openstack-doc-tools-pep8
+      - gate-openstack-doc-tools-linters
 
   - name: openstack/openstack-health
     template:
@@ -7248,10 +7248,10 @@ projects:
       - name: publish-to-pypi
       - name: release-notes-jobs
     check:
-      - gate-openstackdocstheme-pep8
+      - gate-openstackdocstheme-linters
       - gate-openstackdocstheme-docs
     gate:
-      - gate-openstackdocstheme-pep8
+      - gate-openstackdocstheme-linters
       - gate-openstackdocstheme-docs
     post:
       - openstackdocstheme-branch-tarball