diff --git a/gerrit/acls/stackforge/congress-specs.config b/gerrit/acls/openstack/congress-specs.config
similarity index 100%
rename from gerrit/acls/stackforge/congress-specs.config
rename to gerrit/acls/openstack/congress-specs.config
diff --git a/gerrit/acls/stackforge/congress.config b/gerrit/acls/openstack/congress.config
similarity index 100%
rename from gerrit/acls/stackforge/congress.config
rename to gerrit/acls/openstack/congress.config
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 75642f504b..f461945437 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -744,6 +744,11 @@
   description: Command Line Interface Formulation Framework
   groups:
     - python-cliff
+- project: openstack/congress
+  description: Congress
+- project: openstack/congress-specs
+  description: Congress Design Specifications
+  acl-config: /home/gerrit2/acls/openstack/congress.config
 - project: openstack/coreos-image-builder
   description: A framework for building CoreOS Ramdisk
   groups:
@@ -1006,6 +1011,9 @@
 - project: openstack/python-cinderclient
   docimpact-group: openstack-manuals
   description: OpenStack Block Storage (Cinder) Client
+- project: openstack/python-congressclient
+  description: Client for OpenStack Congress
+  acl-config: /home/gerrit2/acls/openstack/congress.config
 - project: openstack/python-designateclient
   description: OpenStack DNS As A Service (Designate) Client
 - project: openstack/python-ganttclient
@@ -1295,11 +1303,6 @@
   acl-config: /home/gerrit2/acls/stackforge/compass.config
 - project: stackforge/compute-hyperv
   description: Nova Hyper-V Compute Driver
-- project: stackforge/congress
-  description: Congress
-  acl-config: /home/gerrit2/acls/stackforge/congress.config
-- project: stackforge/congress-specs
-  description: Congress Design Specifications
 - project: stackforge/congressmiddleware
   acl-config: /home/gerrit2/acls/stackforge/congress.config
   description: Middleware for Congress
@@ -2075,9 +2078,6 @@
 - project: stackforge/python-cloudkittyclient
   description: Python client library for CloudKitty API
   acl-config: /home/gerrit2/acls/stackforge/cloudkitty.config
-- project: stackforge/python-congressclient
-  description: Client for OpenStack Congress
-  acl-config: /home/gerrit2/acls/stackforge/congress.config
 - project: stackforge/python-cueclient
   description: Python client for mq provisioning service
   acl-config: /home/gerrit2/acls/stackforge/cue.config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index e59e52d966..051f5e9412 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -46,9 +46,9 @@ congress:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/congress
-      - stackforge/python-congressclient
-      - stackforge/congress-specs
+      - openstack/congress
+      - openstack/python-congressclient
+      - openstack/congress-specs
       - stackforge/python-cloudfoundryclient
     branches:
       - master
diff --git a/jenkins/jobs/murano.yaml b/jenkins/jobs/murano.yaml
index 90f082154e..64f4abb2fe 100644
--- a/jenkins/jobs/murano.yaml
+++ b/jenkins/jobs/murano.yaml
@@ -61,8 +61,8 @@
           export PROJECTS="stackforge/murano $PROJECTS"
           export PROJECTS="stackforge/murano-dashboard $PROJECTS"
           export PROJECTS="stackforge/python-muranoclient $PROJECTS"
-          export PROJECTS="stackforge/congress $PROJECTS"
-          export PROJECTS="stackforge/python-congressclient $PROJECTS"
+          export PROJECTS="openstack/congress $PROJECTS"
+          export PROJECTS="openstack/python-congressclient $PROJECTS"
           export PROJECTS="stackforge/mistral $PROJECTS"
           export PROJECTS="stackforge/python-mistralclient $PROJECTS"
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1184068310..eac6319d54 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1300,6 +1300,24 @@ projects:
     gate:
       - gate-cinder-specs-python27
 
+  - name: openstack/congress
+    template:
+      - name: merge-check
+      - name: check-requirements
+    check:
+      - gate-congress-pep8
+      - gate-congress-python27
+      - gate-congress-python34
+    gate:
+      - gate-congress-pep8
+      - gate-congress-python27
+
+  - name: openstack/congress-specs
+    template:
+      - name: merge-check
+      - name: stackforge-specs-jobs
+
+
   - name: openstack/designate
     template:
       - name: merge-check
@@ -1964,6 +1982,19 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
 
+  - name: openstack/python-congressclient
+    template:
+      - name: merge-check
+      - name: check-requirements
+      - name: publish-to-pypi
+    check:
+      - gate-python-congressclient-pep8
+      - gate-python-congressclient-python27
+      - gate-python-congressclient-python34
+    gate:
+      - gate-python-congressclient-pep8
+      - gate-python-congressclient-python27
+
   - name: openstack/python-designateclient
     template:
       - name: merge-check
@@ -4832,22 +4863,6 @@ projects:
       - name: merge-check
       - name: python-jobs
 
-  - name: stackforge/congress
-    template:
-      - name: merge-check
-      - name: check-requirements
-    check:
-      - gate-congress-pep8
-      - gate-congress-python27
-      - gate-congress-python34
-    gate:
-      - gate-congress-pep8
-      - gate-congress-python27
-
-  - name: stackforge/congress-specs
-    template:
-      - name: merge-check
-      - name: stackforge-specs-jobs
 
   - name: stackforge/congressmiddleware
     template:
@@ -6439,19 +6454,6 @@ projects:
     post:
       - python-cloudkittyclient-coverage
 
-  - name: stackforge/python-congressclient
-    template:
-      - name: merge-check
-      - name: check-requirements
-      - name: publish-to-pypi
-    check:
-      - gate-python-congressclient-pep8
-      - gate-python-congressclient-python27
-      - gate-python-congressclient-python34
-    gate:
-      - gate-python-congressclient-pep8
-      - gate-python-congressclient-python27
-
   - name: stackforge/python-cueclient
     template:
       - name: merge-check