diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index f62ff9994d..76b5412b06 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -415,9 +415,9 @@ openstack-barbican:
     projects:
       - openstack/barbican
       - openstack/barbican-specs
+      - openstack/kite
       - openstack/python-barbicanclient
-      - stackforge/kite
-      - stackforge/python-kiteclient
+      - openstack/python-kiteclient
     branches:
       - master
 
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/kite.config b/modules/openstack_project/files/gerrit/acls/openstack/kite.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/kite.config
rename to modules/openstack_project/files/gerrit/acls/openstack/kite.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-kiteclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-kiteclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-kiteclient.config
rename to modules/openstack_project/files/gerrit/acls/openstack/python-kiteclient.config
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index d38e1eabc8..2649837472 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -310,6 +310,8 @@
 - project: openstack/keystonemiddleware
   description: OpenStack Identity (Keystone) Middleware
   upstream: git://github.com/morganfainberg/keystonemiddleware
+- project: openstack/kite
+  description: A service for managing and distributing message encryption keys.
 - project: openstack/netconn-api
   group: openstack-api-site
   options:
@@ -424,6 +426,8 @@
 - project: openstack/python-ironicclient
   description: A python client implementing the Ironic API.
 - project: openstack/python-keystoneclient
+- project: openstack/python-kiteclient
+  description: Python bindings to Kite.
 - project: openstack/python-neutronclient
   docimpact-group: openstack-manuals
 - project: openstack/python-novaclient
@@ -821,8 +825,6 @@
 - project: stackforge/kickstack
   description: Rapid OpenStack deployment with puppet-dashboard, The Foreman, or any other Puppet ENC
   upstream: git://github.com/hastexo/kickstack
-- project: stackforge/kite
-  description: A service for managing and distributing message encryption keys.
 - project: stackforge/kwapi
   description: Energy Efficiency Monitoring
   upstream: git://github.com/frossigneux/kwapi.git
@@ -1083,8 +1085,6 @@
 - project: stackforge/python-jenkins
   upstream: git://github.com/jeblair/python-jenkins.git
   description: Python API for managing jobs and nodes in a Jenkins CI instance
-- project: stackforge/python-kiteclient
-  description: Python bindings to Kite.
 - project: stackforge/python-libraclient
 - project: stackforge/python-magnetodbclient
   description: Python client for MagnetoDB, the key-value database service for OpenStack cloud.
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 099efd0c6a..7ea3c47600 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1149,6 +1149,17 @@ projects:
     gate:
       - gate-keystonemiddleware-python33
 
+  - name: openstack/kite
+    template:
+      - name: python-jobs
+      - name: check-requirements
+    check:
+      - gate-kite-python33
+    pre-release:
+      - kite-tarball
+    release:
+      - kite-tarball
+
   - name: openstack/zaqar
     template:
       - name: python-jobs
@@ -1576,6 +1587,17 @@ projects:
       - check-tripleo-novabm-overcloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
 
+  - name: openstack/python-kiteclient
+    template:
+      - name: python-jobs
+      - name: publish-to-pypi
+    check:
+      - gate-python-kiteclient-requirements
+      - gate-python-kiteclient-python33
+    gate:
+      - gate-python-kiteclient-requirements
+      - gate-python-kiteclient-python33
+
   - name: openstack/python-zaqarclient
     template:
       - name: check-requirements
@@ -3664,17 +3686,6 @@ projects:
     gate:
       - noop
 
-  - name: stackforge/kite
-    template:
-      - name: python-jobs
-      - name: check-requirements
-    check:
-      - gate-kite-python33
-    pre-release:
-      - kite-tarball
-    release:
-      - kite-tarball
-
   - name: stackforge/libra
     template:
       - name: docs-on-rtfd
@@ -4515,17 +4526,6 @@ projects:
     release:
       - python-blazarclient-tarball
 
-  - name: stackforge/python-kiteclient
-    template:
-      - name: python-jobs
-      - name: publish-to-pypi
-    check:
-      - gate-python-kiteclient-requirements
-      - gate-python-kiteclient-python33
-    gate:
-      - gate-python-kiteclient-requirements
-      - gate-python-kiteclient-python33
-
   - name: stackforge/python-libraclient
     template:
       - name: publish-to-pypi