diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 2d664c6029..f91978fe6e 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -134,6 +134,7 @@ tripleo:
     projects:
       - stackforge/diskimage-builder
       - stackforge/os-config-applier
+      - stackforge/os-collect-config
       - stackforge/os-refresh-config
       - stackforge/tripleo-image-elements
       - stackforge/tripleo-heat-templates
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/os-collect-config.config b/modules/openstack_project/files/gerrit/acls/stackforge/os-collect-config.config
new file mode 100644
index 0000000000..62a8084da9
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/os-collect-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-config-applier-core
+   label-Approved = +0..+1 group os-config-applier-core
+   workInProgress = group os-config-applier-core
+[access "refs/heads/milestone-proposed"]
+   label-Code-Review = -2..+2 group os-config-applier-core
+   label-Approved = +0..+1 group os-config-applier-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 7641ac8ba1..179602fec2 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -878,6 +878,15 @@
     jobs:
       - python-jobs
 
+- project:
+    name: os-collect-config
+    github-org: stackforge
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+
 - project:
     name: os-refresh-config
     github-org: stackforge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 2421ce6bab..95759c9248 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1527,6 +1527,18 @@ projects:
     post:
       - os-config-applier-coverage
 
+  - name: stackforge/os-collect-config
+    check:
+      - gate-os-collect-config-pep8
+      - gate-os-collect-config-python26
+      - gate-os-collect-config-python27
+    gate:
+      - gate-os-collect-config-pep8
+      - gate-os-collect-config-python26
+      - gate-os-collect-config-python27
+    post:
+      - os-collect-config-coverage
+
   - name: stackforge/os-refresh-config
     check:
       - gate-os-refresh-config-pep8
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 4f20ceb359..0cc0cb9eae 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -177,6 +177,9 @@
   acl-config: /home/gerrit2/acls/stackforge/savanna.config
 - project: stackforge/os-config-applier
   description: "Apply configuration from cloud metadata"
+- project: stackforge/os-collect-config
+  description: "Collect and cache metadata, run hooks on changes."
+  upstream: git://github.com/SpamapS/os-collect-config.git
 - project: stackforge/os-refresh-config
   upstream: git://github.com/tripleo/os-refresh-config.git
   description: "Restart services and coordinate data migration on Heat config changes."