diff --git a/.gitreview b/.gitreview
index 39f9a7e..162ae3b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.opendev.org
 port=29418
-project=osf/refstack-client.git
+project=openinfra/refstack-client.git
diff --git a/README.rst b/README.rst
index f7ef159..92c6a8a 100644
--- a/README.rst
+++ b/README.rst
@@ -15,7 +15,7 @@ Environment setup
 We've created an "easy button" for Ubuntu, Centos, RHEL and openSUSE.
 
 1. Make sure you have ``git`` installed
-2. Get the refstack client: ``git clone https://opendev.org/osf/refstack-client.git``
+2. Get the refstack client: ``git clone https://opendev.org/openinfra/refstack-client.git``
 3. Go into the ``refstack-client`` directory: ``cd refstack-client``
 4. Run the "easy button" setup: ``./setup_env``
 
@@ -155,7 +155,7 @@ Usage
          -i <path-to-private-key>
 
    Intructions for uploading data with signature can be found at
-   https://opendev.org/osf/refstack/src/branch/master/doc/source/uploading_private_results.rst
+   https://opendev.org/openinfra/refstack/src/branch/master/doc/source/uploading_private_results.rst
 
 7. View uploaded test set.
 
@@ -195,7 +195,7 @@ The tests ``refstack-client`` runs are defined within interop_ repository
 and divided into several OpenStack Marketing Programs, the list of the programs
 can be found at RefStack_ page.
 
-.. _interop: https://opendev.org/osf/interop
+.. _interop: https://opendev.org/openinfra/interop
 .. _RefStack: https://refstack.openstack.org/#/
 
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 2e40981..4fd484c 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,7 +33,7 @@ extensions = [
 ]
 
 # openstackdocstheme options
-openstackdocs_repo_name = 'osf/refstack-client'
+openstackdocs_repo_name = 'openinfra/refstack-client'
 bug_project = '879'
 bug_tag = ''
 
diff --git a/refstack_client/refstack_client.py b/refstack_client/refstack_client.py
index 03d3a3f..08a9251 100755
--- a/refstack_client/refstack_client.py
+++ b/refstack_client/refstack_client.py
@@ -354,7 +354,7 @@ class RefstackClient:
 
     def _form_result_content(self, cpid, duration, results):
         '''This method will create the content for the request. The spec at
-           'https://opendev.org/osf/refstack/src/branch/master/specs/prior'
+           'https://opendev.org/openinfra/refstack/src/branch/master/specs/prior'
            '/implemented/api-v1.md'.
            defines the format expected by the API.'''
         content = {}
diff --git a/setup_env b/setup_env
index fa3a55e..b8e2b5d 100755
--- a/setup_env
+++ b/setup_env
@@ -131,7 +131,7 @@ else
 fi
 
 if [ -z ${TEMPESTCONF_SOURCE} ]; then
-    git clone https://git.openstack.org/osf/python-tempestconf.git ${TEMPESTCONF_DIR}
+    git clone https://git.openstack.org/openinfra/python-tempestconf.git ${TEMPESTCONF_DIR}
 fi
 
 git clone https://git.openstack.org/openstack/tempest.git ${TEMPEST_DIR}
diff --git a/specs/queens/approved/tempest_autoconfig.rst b/specs/queens/approved/tempest_autoconfig.rst
index 6f5d017..8341bdc 100644
--- a/specs/queens/approved/tempest_autoconfig.rst
+++ b/specs/queens/approved/tempest_autoconfig.rst
@@ -91,7 +91,7 @@ Work Items
 Dependencies
 ============
 
-- Existing script: https://opendev.org/osf/python-tempestconf
+- Existing script: https://opendev.org/openinfra/python-tempestconf
 
 Testing
 =======
diff --git a/tox.ini b/tox.ini
index 7958b0f..54cae15 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
          OS_TEST_PATH=./refstack_client/tests/unit
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       git+https://git.openstack.org/osf/python-tempestconf@master#egg=python_tempestconf
+       git+https://git.openstack.org/openinfra/python-tempestconf@master#egg=python_tempestconf
 commands =
   stestr run {posargs}