diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 5c4948b5ca..ab178b125e 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1062,3 +1062,16 @@ openstack-ansible:
       - stable/juno
       - proposed/juno
 
+openstack-gbp:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/group-based-policy
+      - stackforge/group-based-policy-specs
+      - stackforge/group-based-policy-ui
+      - stackforge/group-based-policy-automation
+      - stackforge/python-group-based-policy-client
+    branches:
+      - master
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 47b8e9f174..584b895e70 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2828,6 +2828,7 @@
 
     jobs:
       - python-jobs
+      - pypi-jobs
 
 - project:
     name: group-based-policy-automation
@@ -2836,6 +2837,7 @@
 
     jobs:
       - python-jobs
+      - pypi-jobs
 
 - project:
     name: group-based-policy-specs
@@ -2852,6 +2854,7 @@
 
     jobs:
       - python-jobs
+      - pypi-jobs
 
 - project:
     name: healthnmon
@@ -3593,6 +3596,7 @@
 
     jobs:
       - python-jobs
+      - pypi-jobs
 
 - project:
     name: python-jenkins
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8bed3ebb54..b455843300 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4305,11 +4305,13 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: publish-to-pypi
 
   - name: stackforge/group-based-policy-automation
     template:
       - name: merge-check
       - name: python-jobs
+      - name: publish-to-pypi
 
   - name: stackforge/group-based-policy-specs
     template:
@@ -4320,6 +4322,7 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: publish-to-pypi
 
   - name: stackforge/healthnmon
     template:
@@ -5146,6 +5149,7 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: publish-to-pypi
 
   - name: stackforge/python-jenkins
     template: