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 e206e8b4b9..e006ab5679 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -447,8 +447,8 @@
       - python-jobs
       - hook-{name}-rtfd
       - gate-{name}-pyflakes
-      - pypi-jobs
-      - openstack-publish-jobs
+      - '{name}-pypi-sdist'
+      - '{name}-pypi-upload'
 
 
 - project:
@@ -462,8 +462,8 @@
       - python-jobs
       - hook-{name}-rtfd
       - gate-{name}-pyflakes
-      - pypi-jobs
-      - openstack-publish-jobs
+      - '{name}-pypi-sdist'
+      - '{name}-pypi-upload'
 
 
 - project:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9cb1b60b49..2866ea74e3 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -792,7 +792,6 @@ projects:
       - gate-moniker-python27
     post:
       - hook-moniker-rtfd
-      - moniker-coverage
     pre-release:
       - moniker-tarball-upload
     publish: