diff --git a/gerrit/acls/stackforge/os-client-config.config b/gerrit/acls/openstack/os-client-config.config
similarity index 100%
rename from gerrit/acls/stackforge/os-client-config.config
rename to gerrit/acls/openstack/os-client-config.config
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index abeb7f8266..1aa45139f1 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -887,6 +887,8 @@
   description: Apply configuration from cloud metadata.
 - project: openstack/os-brick
   description: Volume discovery and local storage management lib
+- project: openstack/os-client-config
+  description: Unified config handling for client libraries and programs
 - project: openstack/os-cloud-config
   description: Configure a cloud
   acl-config: /home/gerrit2/acls/openstack/os-apply-config.config
@@ -1895,8 +1897,6 @@
   groups:
     - openstack-ansible
   acl-config: /home/gerrit2/acls/stackforge/os-ansible-deployment.config
-- project: stackforge/os-client-config
-  description: Unified config handling for client libraries and programs
 - project: stackforge/osprofiler
   description: OpenStack cross service/project profiler
 - project: stackforge/ospurge
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 14488b522f..38cce90059 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -963,12 +963,12 @@ openstack-sdks:
       - patchset-created
       - change-merged
     projects:
+      - openstack/os-client-config
       - openstack/python-openstackclient
       - stackforge/openstack-sdk-php
       - stackforge/golang-client
       - stackforge/openstack-sdk-dotnet
       - stackforge/openstack-cli-powershell
-      - stackforge/os-client-config
       - stackforge/python-openstacksdk
     branches:
       - master
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 42dfc95be7..c3560bac93 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2703,6 +2703,15 @@ projects:
       - gate-os-brick-pep8
       - gate-os-brick-python27
 
+  - name: openstack/os-client-config
+    template:
+      - name: check-requirements
+      - name: merge-check
+      - name: publish-to-pypi
+      - name: python-jobs
+      - name: python3-jobs
+      - name: pypy-jobs
+
   - name: openstack/os-cloud-config
     template:
       - name: merge-check
@@ -5738,15 +5747,6 @@ projects:
       - name: merge-check
       - name: stackforge-specs-jobs
 
-  - name: stackforge/os-client-config
-    template:
-      - name: check-requirements
-      - name: merge-check
-      - name: publish-to-pypi
-      - name: python-jobs
-      - name: python3-jobs
-      - name: pypy-jobs
-
   - name: stackforge/osprofiler
     template:
       - name: merge-check