diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 5930902664..b87e539499 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -27,6 +27,7 @@ openstack-dev:
       - change-merged
       - x-vrif-minus-2
     projects:
+      - openstack/ceilometer
       - openstack/cinder
       - openstack/glance
       - openstack/horizon
@@ -51,7 +52,6 @@ stackforge-dev:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/ceilometer
       - stackforge/libra
       - stackforge/python-reddwarfclient
       - stackforge/reddwarf
@@ -66,7 +66,7 @@ openstack-metering:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/ceilometer
+      - openstack/ceilometer
     branches:
       - master
 
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 1b3098a75b..4d26478b81 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -9,7 +9,7 @@
 
 - project:
     name: ceilometer
-    github-org: stackforge
+    github-org: openstack
     node: oneiric
     tarball-publisher-site: nova.openstack.org
 
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 9dcee92a08..74b5155028 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -21,6 +21,7 @@
 - project: openstack-dev/openstack-qa
 - project: openstack-dev/pbr
 - project: openstack-dev/sandbox
+- project: openstack/ceilometer
 - project: openstack/cinder
 - project: openstack/compute-api
 - project: openstack/glance
@@ -53,7 +54,6 @@
 - project: openstack/tempest
 - project: openstack/volume-api
 - project: stackforge/MRaaS
-- project: stackforge/ceilometer
 - project: stackforge/libra
 - project: stackforge/marconi
 - project: stackforge/moniker
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index bd753d0eac..b53be64d7e 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -618,7 +618,7 @@ projects:
         - gate-tempest-devstack-vm
         - gate-tempest-devstack-vm-cinder
 
-  - name: stackforge/ceilometer
+  - name: openstack/ceilometer
     check:
       - gate-ceilometer-merge:
         - gate-ceilometer-pep8