diff --git a/CHANGELOG b/CHANGELOG
index 7a3144ca30..96bcaff849 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1054,7 +1054,7 @@ swift (2.10.0, OpenStack Newton)
       improved in clusters that are not completely healthy.
 
     * Significant improvements to the api-ref doc available at
-      https://developer.openstack.org/api-ref/object-storage/.
+      https://docs.openstack.org/api-ref/object-store/.
 
     * A PUT or POST to a container will now update the container's
       Last-Modified time, and that value will be included in a
diff --git a/README.rst b/README.rst
index 6f47e8e01e..8ce29c7e00 100644
--- a/README.rst
+++ b/README.rst
@@ -147,7 +147,7 @@ For client applications, official Python language bindings are provided
 at https://github.com/openstack/python-swiftclient.
 
 Complete API documentation at
-https://developer.openstack.org/api-ref/object-store/
+https://docs.openstack.org/api-ref/object-store/
 
 There is a large ecosystem of applications and libraries that support and
 work with OpenStack Swift. Several are listed on the
diff --git a/doc/source/api/object_api_v1_overview.rst b/doc/source/api/object_api_v1_overview.rst
index 4776a8e104..c44fcc9b29 100644
--- a/doc/source/api/object_api_v1_overview.rst
+++ b/doc/source/api/object_api_v1_overview.rst
@@ -171,14 +171,14 @@ The API Reference describes the operations that you can perform with the
 Object Storage API:
 
 -  `Storage
-   accounts <https://developer.openstack.org/api-ref/object-store/index.html#accounts>`__:
+   accounts <https://docs.openstack.org/api-ref/object-store/index.html#accounts>`__:
    Use to perform account-level tasks.
 
    Lists containers for a specified account. Creates, updates, and
    deletes account metadata. Shows account metadata.
 
 -  `Storage
-   containers <https://developer.openstack.org/api-ref/object-store/index.html#containers>`__:
+   containers <https://docs.openstack.org/api-ref/object-store/index.html#containers>`__:
    Use to perform container-level tasks.
 
    Lists objects in a specified container. Creates, shows details for,
@@ -186,7 +186,7 @@ Object Storage API:
    container metadata.
 
 -  `Storage
-   objects <https://developer.openstack.org/api-ref/object-store/index.html#objects>`__:
+   objects <https://docs.openstack.org/api-ref/object-store/index.html#objects>`__:
    Use to perform object-level tasks.
 
    Creates, replaces, shows details for, and deletes objects. Copies
diff --git a/doc/source/index.rst b/doc/source/index.rst
index d2b1ea38ab..2b417e5bc1 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -99,7 +99,7 @@ Administrator Documentation
 Object Storage v1 REST API Documentation
 ========================================
 
-See `Complete Reference for the Object Storage REST API <http://developer.openstack.org/api-ref/object-storage/>`_
+See `Complete Reference for the Object Storage REST API <https://docs.openstack.org/api-ref/object-storage/>`_
 
 The following provides supporting information for the REST API:
 
diff --git a/doc/source/overview_encryption.rst b/doc/source/overview_encryption.rst
index f5431e8167..cc429737eb 100644
--- a/doc/source/overview_encryption.rst
+++ b/doc/source/overview_encryption.rst
@@ -318,7 +318,7 @@ in Barbican::
     --mode ctr --secret-type symmetric --payload <base64_encoded_root_secret>
 
 Alternatively, the existing root secret can also be stored in Barbican using
-`curl <http://developer.openstack.org/api-guide/key-manager/secrets.html>`__.
+`curl <https://docs.openstack.org/api-guide/key-manager/secrets.html>`__.
 
 .. note::
 
diff --git a/tox.ini b/tox.ini
index 2e5f607259..ec08549c2a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -97,7 +97,7 @@ commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:api-ref]
 # 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.
 basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands =