diff --git a/README.rst b/README.rst
index aa68998e95..0ce74bd3c0 100644
--- a/README.rst
+++ b/README.rst
@@ -48,4 +48,4 @@ Repository
 Developers wishing to work on the OpenStack-Helm project should always base
 their work on the latest code, available from the OpenStack-Helm git repository.
 
-`OpenStack-Helm git repository <https://git.openstack.org/cgit/openstack/openstack-helm/>`_
+`OpenStack-Helm git repository <https://opendev.org/openstack/openstack-helm/>`_
diff --git a/aodh/Chart.yaml b/aodh/Chart.yaml
index 7cc4d27c02..9c151557ab 100644
--- a/aodh/Chart.yaml
+++ b/aodh/Chart.yaml
@@ -18,7 +18,7 @@ name: aodh
 version: 0.1.0
 home: https://docs.openstack.org/aodh/latest/
 sources:
-  - https://git.openstack.org/cgit/openstack/aodh
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/aodh
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml
index 2044a64532..025898e7ab 100644
--- a/barbican/Chart.yaml
+++ b/barbican/Chart.yaml
@@ -17,7 +17,7 @@ version: 0.1.0
 home: https://docs.openstack.org/barbican/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/barbican
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/barbican
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/ceilometer/Chart.yaml b/ceilometer/Chart.yaml
index 049b8fa4e7..15fbb5b380 100644
--- a/ceilometer/Chart.yaml
+++ b/ceilometer/Chart.yaml
@@ -18,7 +18,7 @@ name: ceilometer
 version: 0.1.0
 home: https://docs.openstack.org/ceilometer/latest/
 sources:
-  - https://git.openstack.org/cgit/openstack/ceilometer
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/ceilometer
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index 2e843cc809..3d40bbf6fb 100644
--- a/cinder/Chart.yaml
+++ b/cinder/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/cinder/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/cinder
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/cinder
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/congress/Chart.yaml b/congress/Chart.yaml
index d96f94f09e..331ee7a3f1 100644
--- a/congress/Chart.yaml
+++ b/congress/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/congress/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Congress/OpenStack_Project_Congress_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/congress
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/congress
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index 0b72585c47..68e2d1bf41 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/glance/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/glance
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/glance
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/heat/Chart.yaml b/heat/Chart.yaml
index 30bc2bd0f5..86bcbed087 100644
--- a/heat/Chart.yaml
+++ b/heat/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/heat/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/heat
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/heat
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml
index 67ebfefe27..0d3e9c47e2 100644
--- a/horizon/Chart.yaml
+++ b/horizon/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/horizon/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/horizon
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/horizon
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml
index 47f5098ac2..ad61c5a665 100644
--- a/ironic/Chart.yaml
+++ b/ironic/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/ironic/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/ironic
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/ironic
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml
index 7564448299..fa2cb4c70c 100644
--- a/keystone/Chart.yaml
+++ b/keystone/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/keystone/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/keystone
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/keystone
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/magnum/Chart.yaml b/magnum/Chart.yaml
index 6bc838e308..091c54bb2c 100644
--- a/magnum/Chart.yaml
+++ b/magnum/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/magnum/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Magnum/OpenStack_Project_Magnum_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/magnum
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/magnum
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/mistral/Chart.yaml b/mistral/Chart.yaml
index 72b5eebc4d..9f08e8283e 100644
--- a/mistral/Chart.yaml
+++ b/mistral/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/mistral/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Mistral/OpenStack_Project_Mistral_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/mistral
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/mistral
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index b1a4fef768..cc1027490d 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/neutron
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/neutron
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 15f421cb1d..daa9a525aa 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/nova
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/nova
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/panko/Chart.yaml b/panko/Chart.yaml
index c5d6f9c601..d0c52929e8 100644
--- a/panko/Chart.yaml
+++ b/panko/Chart.yaml
@@ -18,7 +18,7 @@ name: panko
 version: 0.1.0
 home: https://docs.openstack.org/panko/latest/
 sources:
-  - https://git.openstack.org/cgit/openstack/panko
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/panko
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/rally/Chart.yaml b/rally/Chart.yaml
index 234483bf2a..7348d07bcf 100644
--- a/rally/Chart.yaml
+++ b/rally/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/developer/rally
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/rally/OpenStack_Project_rally_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/rally
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/rally
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/senlin/Chart.yaml b/senlin/Chart.yaml
index bb1dcd9528..f5fcde87a4 100644
--- a/senlin/Chart.yaml
+++ b/senlin/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/senlin/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Senlin/OpenStack_Project_Senlin_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/senlin
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/senlin
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/tempest/Chart.yaml b/tempest/Chart.yaml
index 182774d9ce..2251dde8f0 100644
--- a/tempest/Chart.yaml
+++ b/tempest/Chart.yaml
@@ -19,7 +19,7 @@ version: 0.1.0
 home: https://docs.openstack.org/tempest/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/tempest/OpenStack_Project_tempest_vertical.png
 sources:
-  - https://git.openstack.org/cgit/openstack/tempest
-  - https://git.openstack.org/cgit/openstack/openstack-helm
+  - https://opendev.org/openstack/tempest
+  - https://opendev.org/openstack/openstack-helm
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/tox.ini b/tox.ini
index f341cedd35..d289c774bf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = True
 [testenv]
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
 passenv = *_proxy *_PROXY
 
 [testenv:venv]