diff --git a/README.rst b/README.rst
index c7e2f4e15..80ef7c70d 100644
--- a/README.rst
+++ b/README.rst
@@ -20,8 +20,8 @@ Please fill here a long description which must be at least 3 lines wrapped on
 Note that this is a hard requirement.
 
 * Free software: Apache license
-* Get Started: https://docs.openstack.org/developer/zun/dev/quickstart.html
-* Documentation: https://docs.openstack.org/developer/zun
+* Get Started: https://docs.openstack.org/zun/latest/dev/quickstart.html
+* Documentation: https://docs.openstack.org/zun/latest/
 * Source: https://git.openstack.org/cgit/openstack/zun
 * Bugs: https://bugs.launchpad.net/zun
 * Blueprints:** https://blueprints.launchpad.net/zun
diff --git a/devstack/README.rst b/devstack/README.rst
index 22815cc84..7d26b9b29 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -5,7 +5,7 @@ DevStack Integration
 This directory contains the files necessary to integrate zun with devstack.
 
 Refer the quickstart guide at
-https://docs.openstack.org/developer/zun/dev/quickstart.html
+https://docs.openstack.org/zun/latest/dev/quickstart.html
 for more information on using devstack and zun.
 
 To install zun into devstack, add the following settings to enable the
diff --git a/doc/source/objects.rst b/doc/source/objects.rst
index 44c25f7c8..eb8908854 100644
--- a/doc/source/objects.rst
+++ b/doc/source/objects.rst
@@ -59,7 +59,7 @@ This results in a unit test failure with the following output:
 
   .. code-block:: console
 
-    : Fields or remotable methods in some objects have changed. Make sure the versions of the objects has been bumped, and update the hashes in the static fingerprints tree (object_data). For more information, read https://docs.openstack.org/developer/zun/objects.html.
+    : Fields or remotable methods in some objects have changed. Make sure the versions of the objects has been bumped, and update the hashes in the static fingerprints tree (object_data). For more information, read https://docs.openstack.org/zun/latest/.
 
 This is an indication that me adding the 'foo' field to Container means I need
 to bump the version of Container, so I increase the version and add a comment
diff --git a/zun/tests/unit/objects/test_objects.py b/zun/tests/unit/objects/test_objects.py
index 96928f99d..1a48c9cfa 100644
--- a/zun/tests/unit/objects/test_objects.py
+++ b/zun/tests/unit/objects/test_objects.py
@@ -342,7 +342,7 @@ class TestObject(test_base.TestCase, _TestObject):
 # object (fields and remotable methods). If either the version or hash
 # change, the static tree needs to be updated.
 # For more information on object version testing, read
-# https://docs.openstack.org/developer/zun/objects.html
+# https://docs.openstack.org/zun/latest/
 object_data = {
     'Container': '1.17-dd8ca54832bf3a0ff78249a5a0ab4143',
     'Image': '1.0-0b976be24f4f6ee0d526e5c981ce0633',