diff --git a/doc/source/user/getting_started.rst b/doc/source/user/getting_started.rst
index 964580baa..0d5432479 100644
--- a/doc/source/user/getting_started.rst
+++ b/doc/source/user/getting_started.rst
@@ -142,7 +142,7 @@ Messaging service Operations
 
 This section lists all of the operations that are available in the
 Messaging service API. This document uses some of the most common
-operations in `OpenStack API Reference <https://developer.openstack.org/api-guide/quick-start/index.html>`__..
+operations in `OpenStack API Reference <https://docs.openstack.org/api-quick-start/index.html>`__..
 
 For details about all of the operations, see the Messaging service API v2
 Reference.
@@ -322,7 +322,7 @@ Reference. All you need to get started with Messaging service is the
 getting started guide, the reference, and your Cloud account.
 
 For information about the OpenStack Zaqar API, see
-`OpenStack API Reference <https://developer.openstack.org/api-guide/quick-start/index.html>`__.
+`OpenStack API Reference <https://docs.openstack.org/api-quick-start/index.html>`__.
 
 This API uses standard HTTP 1.1 response codes as documented at
 `www.w3.org/Protocols/rfc2616/rfc2616-sec10.html <http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>`__.
diff --git a/doc/source/user/headers_queue_api_working.rst b/doc/source/user/headers_queue_api_working.rst
index 2d70693d5..845e1bb23 100644
--- a/doc/source/user/headers_queue_api_working.rst
+++ b/doc/source/user/headers_queue_api_working.rst
@@ -53,7 +53,7 @@ cURL, followed by the response.
 
 For a complete list of operations available for Message Queuing, see :doc:`getting_started`
 Each operation is fully described in the `Message Queuing API v2
-Reference <https://developer.openstack.org/api-ref/messaging/>`_.
+Reference <https://docs.openstack.org/api-ref/messaging/>`_.
 
 Create Queue
 ------------
diff --git a/tox.ini b/tox.ini
index 4a61a3593..d39223841 100644
--- a/tox.ini
+++ b/tox.ini
@@ -70,7 +70,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.
 #
 whitelist_externals = bash
                       rm