diff --git a/gerrit/acls/openstack-infra/zuul-base-jobs.config b/gerrit/acls/openstack-infra/zuul-base-jobs.config
new file mode 100644
index 0000000000..abb6a8763f
--- /dev/null
+++ b/gerrit/acls/openstack-infra/zuul-base-jobs.config
@@ -0,0 +1,13 @@
+[access "refs/heads/*"]
+abandon = group zuul-base-jobs-core
+label-Code-Review = -2..+2 group zuul-base-jobs-core
+label-Workflow = -1..+1 group zuul-base-jobs-core
+
+[access "refs/tags/*"]
+pushSignedTag = group zuul-base-jobs-release
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/acls/openstack-infra/zuul-jobs.config b/gerrit/acls/openstack-infra/zuul-jobs.config
new file mode 100644
index 0000000000..d8d85fd2ae
--- /dev/null
+++ b/gerrit/acls/openstack-infra/zuul-jobs.config
@@ -0,0 +1,13 @@
+[access "refs/heads/*"]
+abandon = group zuul-jobs-core
+label-Code-Review = -2..+2 group zuul-jobs-core
+label-Workflow = -1..+1 group zuul-jobs-core
+
+[access "refs/tags/*"]
+pushSignedTag = group zuul-jobs-release
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 0847980d3e..88309ff954 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -818,6 +818,16 @@
   groups:
     - openstack-ci
   description: The Gatekeeper, or a project gating system
+- project: openstack-infra/zuul-base-jobs
+  use-storyboard: true
+  groups:
+    - openstack-ci
+  description: Zuul base job definition
+- project: openstack-infra/zuul-jobs
+  use-storyboard: true
+  groups:
+    - openstack-ci
+  description: Ansible job definitions for Zuul
 - project: openstack-infra/zuul-packaging
   use-storyboard: true
   groups:
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 6de120b7e4..6e9ce8230e 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -2789,6 +2789,8 @@ zuul:
   projects:
     - openstack-infra/nodepool
     - openstack-infra/zuul
+    - openstack-infra/zuul-base-jobs
+    - openstack-infra/zuul-jobs
   branches:
     - master
     - feature/gearman-zk-shim
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7b2e5d0921..5fe11c7dc5 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5472,6 +5472,16 @@ projects:
     experimental:
       - gate-zuul-nodepool
 
+  - name: openstack-infra/zuul-base-jobs
+    template:
+      - name: merge-check
+      - name: noop-jobs
+
+  - name: openstack-infra/zuul-jobs
+    template:
+      - name: merge-check
+      - name: noop-jobs
+
   - name: openstack-infra/zuul-packaging
     template:
       - name: merge-check