diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 67f87a4472..a165e97617 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3606,6 +3606,7 @@
 
     jobs:
       - python-jobs
+      - pypi-jobs
       - '{pipeline}-tempest-dsvm-ec2api{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2e3919228e..c8bbc6e89c 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5180,17 +5180,14 @@ projects:
 
   - name: stackforge/ec2-api
     template:
+      - name: python-jobs
       - name: merge-check
       - name: check-requirements
+      - name: publish-to-pypi
     check:
-      - gate-ec2-api-pep8
-      - gate-ec2-api-python27
       - check-tempest-dsvm-ec2api
       - check-functional-neutron-dsvm-ec2api
       - check-functional-nova-network-dsvm-ec2api
-    gate:
-      - gate-ec2-api-pep8
-      - gate-ec2-api-python27
     experimental:
       - gate-rally-dsvm-ec2-api-fakevirt