diff --git a/gerrit/acls/openstack/ansible-role-diskimage-builder.config b/gerrit/acls/openstack/ansible-role-diskimage-builder.config
new file mode 100644
index 0000000000..44dce4131a
--- /dev/null
+++ b/gerrit/acls/openstack/ansible-role-diskimage-builder.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group ansible-role-diskimage-builder-core
+label-Code-Review = -2..+2 group ansible-role-diskimage-builder-core
+label-Workflow = -1..+1 group ansible-role-diskimage-builder-core
+
+[access "refs/tags/*"]
+pushSignedTag = group ansible-role-diskimage-builder-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/acls/openstack/ansible-role-jenkins-job-builder.config b/gerrit/acls/openstack/ansible-role-jenkins-job-builder.config
new file mode 100644
index 0000000000..e3f4cf6b15
--- /dev/null
+++ b/gerrit/acls/openstack/ansible-role-jenkins-job-builder.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group ansible-role-jenkins-job-builder-core
+label-Code-Review = -2..+2 group ansible-role-jenkins-job-builder-core
+label-Workflow = -1..+1 group ansible-role-jenkins-job-builder-core
+
+[access "refs/tags/*"]
+pushSignedTag = group ansible-role-jenkins-job-builder-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index ad3ea41fa4..e3ac564994 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -759,6 +759,12 @@
 - project: openstack/anchor
   description: An Ephemeral PKI system that can act as a trust anchor for OpenStack
     PKI operations
+- project: openstack/ansible-role-diskimage-builder
+  description: Ansible role to manage Nodepool
+  upstream: https://github.com/pabelanger/ansible-role-diskimage-builder.git
+- project: openstack/ansible-role-jenkins-job-builder
+  description: Ansible role to manage Jenkins Job Builder
+  upstream: https://github.com/pabelanger/ansible-role-jenkins-job-builder.git
 - project: openstack/ansible-role-nodepool
   description: Ansible role to manage Nodepool
 - project: openstack/ansible-role-zuul
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 1ee013e152..a9eaba2024 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -32,6 +32,24 @@
     jobs:
       - ansible-lint-jobs
 
+- project:
+    name: ansible-role-diskimage-builder
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - ansible-role-jobs
+      - hook-{name}-rtfd
+
+- project:
+    name: ansible-role-jenkins-job-builder
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - ansible-role-jobs
+      - hook-{name}-rtfd
+
 - project:
     name: ansible-role-nodepool
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bf83d461d5..0603131543 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3688,6 +3688,24 @@ projects:
     experimental:
       - gate-anchor-tox-bandit
 
+  - name: openstack/ansible-role-diskimage-builder
+    template:
+      - name: merge-check
+      - name: ansible-role-jobs
+      - name: docs-on-rtfd
+    check:
+      - gate-ansible-role-diskimage-builder-dsvm-functional-centos7-nv
+      - gate-ansible-role-diskimage-builder-dsvm-functional-trusty-nv
+
+  - name: openstack/ansible-role-jenkins-job-builder
+    template:
+      - name: merge-check
+      - name: ansible-role-jobs
+      - name: docs-on-rtfd
+    check:
+      - gate-ansible-role-jenkins-job-builder-dsvm-functional-centos7-nv
+      - gate-ansible-role-jenkins-job-builder-dsvm-functional-trusty-nv
+
   - name: openstack/ansible-role-nodepool
     template:
       - name: merge-check