diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 03f1eab7ea..51b587c57e 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -31,6 +31,7 @@ openstack-infra:
       - openstack-infra/nose-html-output
       - openstack-infra/odsreg
       - openstack-infra/os-loganalyze
+      - openstack-infra/project-config
       - openstack-infra/publications
       - openstack-infra/puppet-apparmor
       - openstack-infra/puppet-dashboard
@@ -758,6 +759,7 @@ openstack-merges:
       - openstack-infra/odsreg
       - openstack-infra/openstackid
       - openstack-infra/os-loganalyze
+      - openstack-infra/project-config
       - openstack-infra/publications
       - openstack-infra/puppet-apparmor
       - openstack-infra/puppet-dashboard
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/project-config.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/project-config.config
new file mode 100644
index 0000000000..b7606f72ec
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/project-config.config
@@ -0,0 +1,10 @@
+[access "refs/heads/*"]
+abandon = group project-config-core
+label-Code-Review = -2..+2 group project-config-core
+label-Workflow = -1..+1 group project-config-core
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true
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 0ed67f6a6e..9e27a32f58 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -543,6 +543,14 @@
     jobs:
       - python-jobs
 
+- project:
+    name: project-config
+    node: 'bare-precise || bare-trusty'
+
+    jobs:
+      - gate-{name}-pep8
+      - gate-{name}-bashate
+
 - project:
     name: gerrit-powered-agenda
     node: 'bare-precise || bare-trusty'
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 5b14093388..0b14908224 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -168,6 +168,11 @@
     - openstack-ci
   description: log analyzer tools for logs.openstack.org
   upstream: git://github.com/sdague/os_loganalyze.git
+- project: openstack-infra/project-config
+  groups:
+    - openstack-ci
+  description: configuration files for project CI systems
+  upstream: git://github.com/anteaya/project-config.git
 - project: openstack-infra/publications
   groups:
     - openstack-ci
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 4bc49dfa33..abfebc1b4c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -3296,6 +3296,22 @@ projects:
       - gate-os-loganalyze-pep8
       - gate-os-loganalyze-python27
 
+  - name: openstack-infra/project-config
+    template:
+      - name: merge-check
+    check:
+      - config-compare-xml
+      - gate-config-layout
+      - gate-project-config-pep8
+      - gate-project-config-bashate
+      - gate-config-irc-access
+      - gate-config-projects-yaml
+    gate:
+      - gate-config-layout
+      - gate-project-config-pep8
+      - gate-config-irc-access
+      - gate-config-projects-yaml
+
   - name: openstack-infra/publications
     template:
       - name: merge-check