diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/diskimage-builder.config b/modules/openstack_project/files/gerrit/acls/stackforge/diskimage-builder.config
new file mode 100644
index 0000000000..9f5e800230
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/diskimage-builder.config
@@ -0,0 +1,16 @@
+[access "refs/*"]
+   owner = group Administrators
+[receive]
+   requireChangeId = true
+   requireContributorAgreement = true
+[submit]
+   mergeContent = true
+[access "refs/heads/*"]
+   label-Code-Review = -2..+2 group diskimage-builder-core
+   label-Approved = +0..+1 group diskimage-builder-core
+   workInProgress = group diskimage-builder-core
+[access "refs/heads/milestone-proposed"]
+   label-Code-Review = -2..+2 group diskimage-builder-core
+   label-Approved = +0..+1 group diskimage-builder-core
+[project]
+   state = active
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 8d4ac15fd5..ff983abc0f 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -60,6 +60,16 @@
       - gate-{name}-merge
 
 
+- project:
+    name: diskimage-builder
+    github-org: stackforge
+    node: precise
+    tarball-publisher-site: 173.203.107.207
+
+    jobs:
+      - gate-{name}-merge
+
+
 - project:
     name: gerrit-verification-status-plugin
     github-org: openstack-ci
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 53913ea145..e4d402c15c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -903,3 +903,9 @@ projects:
       - gate-sandbox-merge
     gate:
       - gate-sandbox-merge
+
+  - name: stackforge/diskimage-builder
+    check:
+      - gate-diskimage-builder-merge
+    gate:
+      - gate-diskimage-builder-merge
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 7aada9ea4b..3609395425 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -127,6 +127,10 @@
   acl_config: /home/gerrit2/acls/openstack/volume-api.config
 - project: stackforge/MRaaS
   acl_config: /home/gerrit2/acls/stackforge/MRaaS.config
+- project: stackforge/diskimage-builder
+  acl_config: /home/gerrit2/acls/stackforge/diskimage-builder.config
+  description: "Image building tools for Openstack"
+  upstream: git://github.com/tripleo/baremetal-initrd-builder.git
 - project: stackforge/libra
   acl_config: /home/gerrit2/acls/stackforge/libra.config
 - project: stackforge/marconi