diff --git a/README.rst b/README.rst
index c267df725a..6e648b157d 100644
--- a/README.rst
+++ b/README.rst
@@ -36,7 +36,7 @@ API
To learn how to use Glance's API, consult the documentation available
online at:
-* `Image Service APIs `_
+* `Image Service APIs `_
Developers
----------
diff --git a/doc/source/admin/interoperable-image-import.rst b/doc/source/admin/interoperable-image-import.rst
index 72ae045178..0342af90a9 100644
--- a/doc/source/admin/interoperable-image-import.rst
+++ b/doc/source/admin/interoperable-image-import.rst
@@ -461,9 +461,9 @@ You will need to configure 'glance-image-import.conf' file as shown below:
.. _glance-api.conf: https://opendev.org/openstack/glance/src/branch/master/etc/glance-api.conf
.. _glance-image-import.conf.sample: https://opendev.org/openstack/glance/src/branch/master/etc/glance-image-import.conf.sample
.. _`Image Import Refactor`: https://specs.openstack.org/openstack/glance-specs/specs/mitaka/approved/image-import/image-import-refactor.html
-.. _`Image Service API reference`: https://developer.openstack.org/api-ref/image/
+.. _`Image Service API reference`: https://docs.openstack.org/api-ref/image/
.. _`Inject metadata properties automatically to non-admin images`: https://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/inject-automatic-metadata.html
-.. _`Interoperable Image Import`: https://developer.openstack.org/api-ref/image/v2/index.html#interoperable-image-import
+.. _`Interoperable Image Import`: https://docs.openstack.org/api-ref/image/v2/index.html#interoperable-image-import
.. _OSSN-0078: https://wiki.openstack.org/wiki/OSSN/OSSN-0078
.. _`Stevedore`: https://docs.openstack.org/stevedore
.. _`Taskflow`: https://docs.openstack.org/taskflow
diff --git a/doc/source/contributor/documentation.rst b/doc/source/contributor/documentation.rst
index 6d9fd404fd..d2fd96a98b 100644
--- a/doc/source/contributor/documentation.rst
+++ b/doc/source/contributor/documentation.rst
@@ -38,12 +38,12 @@ easy to find answers to.
Each project's API Reference Guide is published to:
- - ``https://developer.openstack.org/api-ref/$service-type``
+ - ``https://docs.openstack.org/api-ref/$service-type``
For example, the Glance Image Service API Reference guide is
published to:
- - ``https://developer.openstack.org/api-ref/image``
+ - ``https://docs.openstack.org/api-ref/image``
Where to Contribute
-------------------
@@ -83,7 +83,7 @@ which you may want to contribute:
* OpenStack API Reference
There's a "quick reference" guide to the APIs implemented by Glance:
- http://developer.openstack.org/api-ref/image/
+ https://docs.openstack.org/api-ref/image/
The guide is generated from source files in the source code tree under
``api-ref/source``. Corrections in spelling or typographical errors may be
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 17fbaf6c0e..deee27a53f 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -93,7 +93,7 @@ Pick the documents that best match your user profile.
* :doc:`configuration/index`
* - | **End User** or **Third-party Developer**
| You want to use the Image Service APIs provided by Glance.
- - * `Image Service API Reference `_
+ - * `Image Service API Reference `_
* `Image Service API Guide `_
* :doc:`user/index`
* - **Everyone**
diff --git a/tox.ini b/tox.ini
index f7e6f102a2..ed727fbeaa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -126,7 +126,7 @@ commands =
[testenv:api-ref]
basepython = python3
# This environment is called from CI scripts to test and publish
-# the API Ref to developer.openstack.org.
+# the API Ref to docs.openstack.org.
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/doc/requirements.txt