diff --git a/.gitreview b/.gitreview
index 73e5fe6..3b60df8 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=stackforge/group-based-policy-automation.git
\ No newline at end of file
+project=openstack/group-based-policy-automation.git
diff --git a/README.rst b/README.rst
index ef68f56..bd48af4 100644
--- a/README.rst
+++ b/README.rst
@@ -6,10 +6,10 @@ Group Based Policy Automation
 
 * Free software: Apache license
 * Documentation: http://docs.openstack.org/developer/group-based-policy-automation
-* Source: http://git.openstack.org/cgit/stackforge/group-based-policy-automation
+* Source: http://git.openstack.org/cgit/openstack/group-based-policy-automation
 * Bugs: http://bugs.launchpad.net/group-based-policy-automation
 
 Features
 --------
 
-* TODO
\ No newline at end of file
+* TODO
diff --git a/test-requirements.txt b/test-requirements.txt
index f4445b9..b7256ca 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 -e git://github.com/openstack/heat.git@stable/kilo#egg=heat
--e git://github.com/stackforge/python-group-based-policy-client.git@master#egg=gbpclient
+-e git://git.openstack.org/openstack/python-group-based-policy-client.git@master#egg=gbpclient
 # Hacking already pins down pep8, pyflakes and flake8
 hacking<0.11,>=0.10.0
 coverage>=3.6