diff --git a/doc/source/user/multi-cloud-demo.rst b/doc/source/user/multi-cloud-demo.rst
index fdd9dcb1b..a594d4eb5 100644
--- a/doc/source/user/multi-cloud-demo.rst
+++ b/doc/source/user/multi-cloud-demo.rst
@@ -175,7 +175,7 @@ or system-wide: `/etc/openstack/clouds.yaml`.
 Information in your homedir, if it exists, takes precedence.
 
 Full docs on `clouds.yaml` are at
-https://docs.openstack.org/developer/os-client-config/
+https://docs.openstack.org/os-client-config/latest/
 
 What about Mac and Windows?
 ===========================
@@ -221,7 +221,7 @@ Simple example of a clouds.yaml
 * Config for a named `cloud` "my-citycloud"
 * Reference a well-known "named" profile: `citycloud`
 * `os-client-config` has a built-in list of profiles at
-  https://docs.openstack.org/developer/os-client-config/vendor-support.html
+  https://docs.openstack.org/os-client-config/latest/user/vendor-support.html
 * Vendor profiles contain various advanced config
 * `cloud` name can match `profile` name (using different names for clarity)
 
@@ -613,7 +613,7 @@ Cleanup Script
 Normalization
 =============
 
-* https://docs.openstack.org/developer/shade/model.html#image
+* https://docs.openstack.org/shade/latest/user/model.html#image
 * doc/source/examples/normalization.py
 
 .. code:: python
diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py
index a9e0ff23e..937d98851 100644
--- a/shade/openstackcloud.py
+++ b/shade/openstackcloud.py
@@ -64,7 +64,7 @@ DEFAULT_MAX_FILE_SIZE = (5 * 1024 * 1024 * 1024 + 2) / 2
 DEFAULT_SERVER_AGE = 5
 DEFAULT_PORT_AGE = 5
 DEFAULT_FLOAT_AGE = 5
-_OCC_DOC_URL = "https://docs.openstack.org/developer/os-client-config"
+_OCC_DOC_URL = "https://docs.openstack.org/os-client-config/latest/"
 
 
 OBJECT_CONTAINER_ACLS = {