diff --git a/HACKING.rst b/HACKING.rst
index 5599c6988d..45ecf047fe 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -2,7 +2,7 @@ Keystone 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
 
 Keystone Specific Commandments
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d8696235ec..924b820b36 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -18,7 +18,7 @@ source $KEYSTONE_PLUGIN/lib/federation.sh
 
 # For more information on Devstack plugins, including a more detailed
 # explanation on when the different steps are executed please see:
-# https://docs.openstack.org/developer/devstack/plugins.html
+# https://docs.openstack.org/devstack/latest/plugins.html
 
 if [[ "$1" == "stack" && "$2" == "install" ]]; then
     # This phase is executed after the projects have been installed
diff --git a/keystone/cmd/cli.py b/keystone/cmd/cli.py
index a75d91be5a..cce763cc75 100644
--- a/keystone/cmd/cli.py
+++ b/keystone/cmd/cli.py
@@ -481,8 +481,8 @@ class DbSync(BaseApp):
         if (contract_version > migrate_version or migrate_version >
                 expand_version):
             LOG.info('Your database is out of sync. For more information '
-                     'refer to https://docs.openstack.org/developer/'
-                     'keystone/upgrading.html')
+                     'refer to https://docs.openstack.org/keystone/'
+                     'latest/admin/identity-upgrading.html')
             status = 1
         elif migration_script_version > expand_version:
             LOG.info('Your database is not up to date. Your first step is '
diff --git a/keystone/i18n.py b/keystone/i18n.py
index 4ff6b69057..5654f45200 100644
--- a/keystone/i18n.py
+++ b/keystone/i18n.py
@@ -14,7 +14,7 @@
 
 """oslo.i18n integration module.
 
-See https://docs.openstack.org/developer/oslo.i18n/usage.html .
+See https://docs.openstack.org/oslo.i18n/latest/user/usage.html .
 
 """
 
diff --git a/keystone/tests/unit/test_sql_banned_operations.py b/keystone/tests/unit/test_sql_banned_operations.py
index c7c9420cee..2970dfaf79 100644
--- a/keystone/tests/unit/test_sql_banned_operations.py
+++ b/keystone/tests/unit/test_sql_banned_operations.py
@@ -181,7 +181,7 @@ class KeystoneMigrationsCheckers(test_migrations.WalkVersionsMixin):
         # constraint.
         #
         # Please follow the guidelines outlined at:
-        # https://docs.openstack.org/developer/keystone/devref/development_best_practices.html#database-migrations
+        # https://docs.openstack.org/keystone/latest/contributor/database-migrations.html
 
         if version >= self.first_version and version not in self.exceptions:
             banned_ops = self.banned_ops
diff --git a/keystone/tests/unit/test_sql_upgrade.py b/keystone/tests/unit/test_sql_upgrade.py
index 93119f2683..36f684bfee 100644
--- a/keystone/tests/unit/test_sql_upgrade.py
+++ b/keystone/tests/unit/test_sql_upgrade.py
@@ -1616,7 +1616,7 @@ class VersionTests(SqlMigrateBase):
 
         For more information, see "Database Migrations" here:
 
-            https://docs.openstack.org/developer/keystone/devref/development_best_practices.html#database-migrations
+            https://docs.openstack.org/keystone/latest/contributor/database-migrations.html
 
         """
         # Note to reviewers: this version number should never change.
@@ -1639,7 +1639,7 @@ class VersionTests(SqlMigrateBase):
 
         For more information, see "Database Migrations" here:
 
-            https://docs.openstack.org/developer/keystone/devref/development_best_practices.html#database-migrations
+            https://docs.openstack.org/keystone/latest/contributor/database-migrations.html
 
         """
         # Transitive comparison: expand == data migration == contract