diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index fdf1037f39..00e29c9c87 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -123,6 +123,7 @@ tripleo:
       - openstack-infra/tripleo-ci
       - openstack/diskimage-builder
       - openstack/os-apply-config
+      - openstack/os-cloud-config
       - openstack/os-collect-config
       - openstack/os-refresh-config
       - openstack/python-tuskarclient
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/os-cloud-config.config b/modules/openstack_project/files/gerrit/acls/openstack/os-cloud-config.config
new file mode 100644
index 0000000000..e5e8aba7c2
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/os-cloud-config.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 os-apply-config-core
+   label-Approved = +0..+1 group os-apply-config-core
+   workInProgress = group os-apply-config-core
+[access "refs/tags/*"]
+   create = group tripleo-ptl
+   pushTag = group tripleo-ptl
+[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 d95d5052e3..a8055bfdc5 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1306,6 +1306,16 @@
       - python-jobs
       - pypi-jobs
 
+- project:
+    name: os-cloud-config
+    github-org: openstack
+    node: bare-precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
 - project:
     name: os-collect-config
     github-org: openstack
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index c83602401b..51cb603056 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -231,6 +231,8 @@
   description: OpenStack Operations Guide
 - project: openstack/os-apply-config
   description: Apply configuration from cloud metadata.
+- project: openstack/os-cloud-config
+  description: Configure a cloud
 - project: openstack/os-collect-config
   description: Collect and cache metadata, run hooks on changes.
 - project: openstack/os-refresh-config
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 5f74269f32..3ae81bcdbc 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1843,6 +1843,31 @@ projects:
       - os-apply-config-tarball:
         - os-apply-config-pypi-upload
 
+#TODO: add docs
+  - name: openstack/os-cloud-config
+    template:
+      - name: check-requirements
+    check:
+      - gate-os-cloud-config-pep8
+      - gate-os-cloud-config-python26
+      - gate-os-cloud-config-python27
+    check-tripleo:
+      - check-tripleo-seed-precise
+      - check-tripleo-undercloud-precise
+      - check-tripleo-overcloud-precise
+    gate:
+      - gate-os-cloud-config-pep8
+      - gate-os-cloud-config-python26
+      - gate-os-cloud-config-python27
+    post:
+      - os-cloud-config-coverage
+      - os-cloud-config-branch-tarball
+    pre-release:
+      - os-cloud-config-tarball
+    release:
+      - os-cloud-config-tarball:
+        - os-cloud-config-pypi-upload
+
 #TODO: add docs
   - name: openstack/os-collect-config
     template: