diff --git a/.gitreview b/.gitreview
index b86f2ce77..89fc3b237 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=stackforge/diskimage-builder.git
+project=openstack/diskimage-builder.git
diff --git a/README.md b/README.md
index 01c91a997..3f044e599 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ ramdisks.
 
 The TripleO project also develops elements that can be used to deploy
 OpenStack itself. These live in the TripleO elements repository
-(https://github.com/stackforge/tripleo-image-elements).
+(https://github.com/openstack/tripleo-image-elements).
 
 What tools are there?
 ---------------------
diff --git a/elements/config-applier/source-repository-config-applier b/elements/config-applier/source-repository-config-applier
index 5536f1ac2..44446a058 100644
--- a/elements/config-applier/source-repository-config-applier
+++ b/elements/config-applier/source-repository-config-applier
@@ -1 +1 @@
-config-applier git /opt/stack/config-applier https://github.com/stackforge/os-config-applier.git
+config-applier git /opt/stack/config-applier https://github.com/openstack/os-config-applier.git
diff --git a/setup.cfg b/setup.cfg
index 542037746..3769580f3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,7 @@ description-file =
 author = HP Cloud Services
 author_email = openstack-dev@lists.openstack.org
 license: Apache License (2.0)
-home-page = https://github.com/stackforge/diskimage-builder
+home-page = https://github.com/openstack/diskimage-builder
 classifier =
     Development Status :: 3 - Alpha
     License :: OSI Approved :: Apache Software License