diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index ef515ac8f7..d6281ce8f5 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -861,6 +861,7 @@ openstack-sdks:
       - stackforge/golang-client
       - stackforge/openstack-sdk-dotnet
       - stackforge/openstack-cli-powershell
+      - stackforge/os-client-config
       - stackforge/python-openstacksdk
     branches:
       - master
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/os-client-config.config b/modules/openstack_project/files/gerrit/acls/stackforge/os-client-config.config
new file mode 100644
index 0000000000..0ea20ce1fa
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/os-client-config.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group os-client-config-core
+label-Code-Review = -2..+2 group os-client-config-core
+label-Workflow = -1..+1 group os-client-config-core
+
+[access "refs/tags/*"]
+pushSignedTag = group os-client-config-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = 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 1b37687f9f..764bc0acf5 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2953,6 +2953,16 @@
       - python-jobs
 
 
+- project:
+    name: os-client-config
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
+
 - project:
     name: gce-api
     node: 'bare-precise || bare-trusty'
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index c36d928c3e..6bd1ff74b0 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -1033,6 +1033,9 @@
 - project: stackforge/openvz-nova-driver
   description: OpenVz driver for Nova
   upstream: git://github.com/imsplitbit/openvz-nova-driver.git
+- project: stackforge/os-client-config
+  description: Unified config handling for client libraries and programs
+  upstream: https://github.com/emonty/os-client-config.git
 - project: stackforge/osprofiler
   description: OpenStack cross service/project profiler
   upstream: git://github.com/pboris/osprofiler.git
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 658f1848ab..080a7e8682 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -5147,6 +5147,18 @@ projects:
     post:
       - wsme-branch-tarball
 
+  - name: stackforge/os-client-config
+    template:
+      - name: check-requirements
+      - name: merge-check
+      - name: publish-to-pypi
+      - name: python-jobs
+      - name: python3-jobs
+    check:
+      - gate-os-client-config-pypy
+    gate:
+      - gate-os-client-config-pypy
+
   - name: stackforge/python-openstacksdk
     template:
       - name: merge-check