diff --git a/HACKING.rst b/HACKING.rst
index 10edae00b1e..701e431a259 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -2,7 +2,7 @@ Cinder Style Commandments
 =========================
 
 - Step 1: Read the OpenStack Style Commandments
-  https://docs.openstack.org/developer/hacking/
+  https://docs.openstack.org/hacking/latest/
 - Step 2: Read on
 
 Cinder Specific Commandments
diff --git a/cinder/tests/tempest/README.rst b/cinder/tests/tempest/README.rst
index 47ed98ef80e..71248f46c64 100644
--- a/cinder/tests/tempest/README.rst
+++ b/cinder/tests/tempest/README.rst
@@ -5,7 +5,7 @@ Tempest Integration for Cinder
 This directory contains additional Cinder tempest tests.
 
 See the tempest plugin docs for information on using it:
-http://docs.openstack.org/developer/tempest/plugin.html#using-plugins
+https://docs.openstack.org/tempest/latest/plugin.html#using-plugins
 
 To run all tests from this plugin, install cinder into your environment. Then
 from the tempest directory run::
diff --git a/doc/source/configuration/block-storage/drivers/coho-data-driver.rst b/doc/source/configuration/block-storage/drivers/coho-data-driver.rst
index 702c30dc8f3..38249f2532e 100644
--- a/doc/source/configuration/block-storage/drivers/coho-data-driver.rst
+++ b/doc/source/configuration/block-storage/drivers/coho-data-driver.rst
@@ -40,7 +40,7 @@ following capabilities in the OpenStack Block Storage API
 The QoS keys above must be created and associated with a volume type.
 For information about how to set the key-value pairs and associate
 them with a volume type, see the `volume qos
-<https://docs.openstack.org/developer/python-openstackclient/command-objects/volume-qos.html>`_
+<https://docs.openstack.org/python-openstackclient/latest/cli/command-objects/volume-qos.html>`_
 section in the OpenStackClient command list.
 
 .. note::
diff --git a/doc/source/configuration/block-storage/drivers/kaminario-driver.rst b/doc/source/configuration/block-storage/drivers/kaminario-driver.rst
index d8b5b091606..985ec7e95c7 100644
--- a/doc/source/configuration/block-storage/drivers/kaminario-driver.rst
+++ b/doc/source/configuration/block-storage/drivers/kaminario-driver.rst
@@ -100,8 +100,8 @@ Cinder Driver for single FC or iSCSI backend.
       scheduler_default_filters = DriverFilter,CapabilitiesFilter
 
    See following links for more information:
-   `<https://docs.openstack.org/developer/cinder/scheduler-filters.html>`_
-   `<https://docs.openstack.org/admin-guide/blockstorage-driver-filter-weighing.html>`_
+   `<https://docs.openstack.org/cinder/latest/scheduler-filters.html>`_
+   `<https://docs.openstack.org/cinder/latest/admin/blockstorage-driver-filter-weighing.html>`_
 
 #. Under the ``[DEFAULT]`` section, set the enabled_backends parameter
    with the iSCSI or FC back-end group
diff --git a/doc/source/configuration/block-storage/drivers/solidfire-volume-driver.rst b/doc/source/configuration/block-storage/drivers/solidfire-volume-driver.rst
index 6bf93ea3bae..48af76cec56 100644
--- a/doc/source/configuration/block-storage/drivers/solidfire-volume-driver.rst
+++ b/doc/source/configuration/block-storage/drivers/solidfire-volume-driver.rst
@@ -94,7 +94,7 @@ following capabilities in the OpenStack Block Storage API
 The QoS keys above no longer require to be scoped but must be created and
 associated to a volume type. For information about how to set the key-value
 pairs and associate them with a volume type, see the `volume qos
-<https://docs.openstack.org/developer/python-openstackclient/command-objects/volume-qos.html>`_
+<https://docs.openstack.org/python-openstackclient/latest/cli/command-objects/volume-qos.html>`_
 section in the OpenStackClient command list.
 
 .. note::
diff --git a/doc/source/configuration/block-storage/schedulers.rst b/doc/source/configuration/block-storage/schedulers.rst
index 31f11280936..ada0d2b8a41 100644
--- a/doc/source/configuration/block-storage/schedulers.rst
+++ b/doc/source/configuration/block-storage/schedulers.rst
@@ -6,6 +6,6 @@ Block Storage service uses the ``cinder-scheduler`` service
 to determine how to dispatch block storage requests.
 
 For more information, see `Cinder Scheduler Filters
-<https://docs.openstack.org/developer/cinder/scheduler-filters.html>`_
+<https://docs.openstack.org/cinder/latest/scheduler-filters.html>`_
 and `Cinder Scheduler Weights
-<https://docs.openstack.org/developer/cinder/scheduler-weights.html>`_.
+<https://docs.openstack.org/cinder/latest/scheduler-weights.html>`_.
diff --git a/doc/source/configuration/block-storage/volume-encryption.rst b/doc/source/configuration/block-storage/volume-encryption.rst
index 2eef5df7abc..1814fb0255e 100644
--- a/doc/source/configuration/block-storage/volume-encryption.rst
+++ b/doc/source/configuration/block-storage/volume-encryption.rst
@@ -53,18 +53,18 @@ Key management access control
 Special privileges can be assigned on behalf of an end user to allow
 them to manage their own encryption keys, which are required when
 creating the encrypted volumes. The Barbican `Default Policy
-<https://docs.openstack.org/developer/barbican/admin-guide-cloud/access_control.html#default-policy>`_
+<https://docs.openstack.org/barbican/latest/admin/access_control.html#default-policy>`_
 for access control specifies that only users with an ``admin`` or
 ``creator`` role can create keys. The policy is very flexible and
 can be modified.
 
 To assign the ``creator`` role, the admin must know the user ID,
 project ID, and creator role ID. See `Assign a role
-<https://docs.openstack.org/admin-guide/cli-manage-projects-users-and-roles.html#assign-a-role>`_
+<https://docs.openstack.org/keystone/latest/admin/cli-manage-projects-users-and-roles.html#assign-a-role>`_
 for more information. An admin can list existing roles and associated
 IDs using the ``openstack role list`` command. If the creator
 role does not exist, the admin can `create the role
-<https://docs.openstack.org/admin-guide/cli-manage-projects-users-and-roles.html#create-a-role>`_.
+<https://docs.openstack.org/keystone/latest/admin/cli-manage-projects-users-and-roles.html#create-a-role>`_.
 
 
 Create an encrypted volume type
@@ -153,7 +153,7 @@ the creator role in the following way:
 
 For details, see the
 `Barbican Access Control page
-<https://docs.openstack.org/developer/barbican/admin-guide-cloud/access_control.html>`_.
+<https://docs.openstack.org/barbican/latest/admin/access_control.html>`_.
 
 .. note::