diff --git a/README.rst b/README.rst
index 6115702..f19bda9 100644
--- a/README.rst
+++ b/README.rst
@@ -168,7 +168,7 @@
 
 #. Log information from tests is captured in ``tempest.log`` under the Tempest
    repository. Some Patrole debugging information is captured in that log
-   related to expected test results and `Role Overriding <https://docs.openstack.org/patrole/latest/framework/rbac_utils.html#role-overriding>`_.
+   related to expected test results and `Role Overriding <https://docs.openstack.org/patrole/latest/test_writing_guide.html#role-overriding>`_.
 
    More detailed RBAC testing log output is emitted to ``patrole.log`` under
    the Patrole repository. To configure Patrole's logging, see the
diff --git a/doc/source/rbac-overview.rst b/doc/source/rbac-overview.rst
index 68e86ac..cf130b0 100644
--- a/doc/source/rbac-overview.rst
+++ b/doc/source/rbac-overview.rst
@@ -281,5 +281,5 @@
 .. _do_raise: https://docs.openstack.org/oslo.policy/latest/reference/api/oslo_policy.policy.html#oslo_policy.policy.Enforcer.enforce
 .. _authorization policy enforcement: https://docs.openstack.org/neutron/latest/contributor/internals/policy.html
 .. _official documentation: https://docs.openstack.org/oslo.policy/latest/
-.. _Keystone Roles API: https://developer.openstack.org/api-ref/identity/v3/#roles
+.. _Keystone Roles API: https://docs.openstack.org/api-ref/identity/v3/#roles
 .. _response filtering: https://docs.openstack.org/neutron/latest/contributor/internals/policy.html#response-filtering
diff --git a/patrole_tempest_plugin/rbac_utils.py b/patrole_tempest_plugin/rbac_utils.py
index 922851b..b11ae38 100644
--- a/patrole_tempest_plugin/rbac_utils.py
+++ b/patrole_tempest_plugin/rbac_utils.py
@@ -198,7 +198,7 @@
               "1": ["2", "3"]  # "admin": ["member", "reader"]
             }
 
-        .. _list-all-role-inference-rules: https://developer.openstack.org/api-ref/identity/v3/#list-all-role-inference-rules
+        .. _list-all-role-inference-rules: https://docs.openstack.org/api-ref/identity/v3/#list-all-role-inference-rules
         """  # noqa: E501
         def process_roles(role_id, data):
             roles = data.get(role_id, set())
diff --git a/patrole_tempest_plugin/tests/api/compute/test_fixed_ips_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_fixed_ips_rbac.py
index 2aae19d..64dd0d1 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_fixed_ips_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_fixed_ips_rbac.py
@@ -26,7 +26,7 @@
 
     # Tests will fail with a 404 starting from microversion 2.36:
     # See the following link for details:
-    # https://developer.openstack.org/api-ref/compute/#fixed-ips-os-fixed-ips-deprecated
+    # https://docs.openstack.org/api-ref/compute/#fixed-ips-os-fixed-ips-deprecated
     max_microversion = '2.35'
 
     @classmethod
diff --git a/patrole_tempest_plugin/tests/api/compute/test_floating_ip_pools_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_floating_ip_pools_rbac.py
index 327ed08..3736f8d 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_floating_ip_pools_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_floating_ip_pools_rbac.py
@@ -27,7 +27,7 @@
 
     # Tests will fail with a 404 starting from microversion 2.36:
     # See the following link for details:
-    # https://developer.openstack.org/api-ref/compute/#floating-ip-pools-os-floating-ip-pools-deprecated
+    # https://docs.openstack.org/api-ref/compute/#floating-ip-pools-os-floating-ip-pools-deprecated
     max_microversion = '2.35'
 
     @classmethod
diff --git a/patrole_tempest_plugin/tests/api/compute/test_floating_ips_bulk_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_floating_ips_bulk_rbac.py
index 337ca6d..2a86053 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_floating_ips_bulk_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_floating_ips_bulk_rbac.py
@@ -33,7 +33,7 @@
 
     # Tests will fail with a 404 starting from microversion 2.36:
     # See the following link for details:
-    # https://developer.openstack.org/api-ref/compute/#floating-ips-bulk-os-floating-ips-bulk-deprecated
+    # https://docs.openstack.org/api-ref/compute/#floating-ips-bulk-os-floating-ips-bulk-deprecated
     max_microversion = '2.35'
     depends_on_nova_network = True
 
diff --git a/patrole_tempest_plugin/tests/api/compute/test_floating_ips_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_floating_ips_rbac.py
index bfd8811..d313494 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_floating_ips_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_floating_ips_rbac.py
@@ -28,7 +28,7 @@
 
     # Tests will fail with a 404 starting from microversion 2.36:
     # See the following link for details:
-    # https://developer.openstack.org/api-ref/compute/#floating-ips-os-floating-ips-deprecated
+    # https://docs.openstack.org/api-ref/compute/#floating-ips-os-floating-ips-deprecated
     max_microversion = '2.35'
 
     @classmethod
diff --git a/patrole_tempest_plugin/tests/api/compute/test_hosts_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_hosts_rbac.py
index 45be09d..1dbf792 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_hosts_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_hosts_rbac.py
@@ -23,7 +23,7 @@
 class HostsRbacTest(rbac_base.BaseV2ComputeRbacTest):
     # These tests will fail with a 404 starting from microversion 2.43:
     # See the following links for details:
-    # https://developer.openstack.org/api-ref/compute/#hosts-os-hosts-deprecated
+    # https://docs.openstack.org/api-ref/compute/#hosts-os-hosts-deprecated
     max_microversion = '2.42'
 
     @classmethod
diff --git a/patrole_tempest_plugin/tests/api/compute/test_hypervisor_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_hypervisor_rbac.py
index bef9332..e0cdc52 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_hypervisor_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_hypervisor_rbac.py
@@ -81,8 +81,8 @@
 class HypervisorMaxv252RbacTest(rbac_base.BaseV2ComputeRbacTest):
     # These tests will fail with a 404 starting from microversion 2.53:
     # See the following links for details:
-    # https://developer.openstack.org/api-ref/compute/#list-hypervisor-servers
-    # https://developer.openstack.org/api-ref/compute/#search-hypervisor
+    # https://docs.openstack.org/api-ref/compute/#list-hypervisor-servers
+    # https://docs.openstack.org/api-ref/compute/#search-hypervisor
     max_microversion = '2.52'
 
     @classmethod
diff --git a/patrole_tempest_plugin/tests/api/compute/test_images_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_images_rbac.py
index 1f94400..66590e9 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_images_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_images_rbac.py
@@ -40,7 +40,7 @@
 
     # These tests will fail with a 404 starting from microversion 2.36.
     # See the following link for details:
-    # https://developer.openstack.org/api-ref/compute/#images-deprecated
+    # https://docs.openstack.org/api-ref/compute/#images-deprecated
     max_microversion = '2.35'
 
     @classmethod
@@ -125,7 +125,7 @@
 
     # These tests will fail with a 404 starting from microversion 2.39.
     # See the following link for details:
-    # https://developer.openstack.org/api-ref/compute/#images-deprecated
+    # https://docs.openstack.org/api-ref/compute/#images-deprecated
     max_microversion = '2.38'
 
     @classmethod
@@ -245,7 +245,7 @@
 
     # These tests will fail with a 404 starting from microversion 2.36.
     # See the following link for details:
-    # https://developer.openstack.org/api-ref/compute/#images-deprecated
+    # https://docs.openstack.org/api-ref/compute/#images-deprecated
     max_microversion = '2.35'
 
     @classmethod
diff --git a/patrole_tempest_plugin/tests/api/compute/test_security_groups_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_security_groups_rbac.py
index 4333918..471d7da 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_security_groups_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_security_groups_rbac.py
@@ -97,7 +97,7 @@
 
     # Tests in this class will fail with a 404 from microversion 2.36,
     # according to:
-    # https://developer.openstack.org/api-ref/compute/#security-groups-os-security-groups-deprecated
+    # https://docs.openstack.org/api-ref/compute/#security-groups-os-security-groups-deprecated
     max_microversion = '2.35'
 
     @classmethod
diff --git a/patrole_tempest_plugin/tests/api/compute/test_server_actions_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_server_actions_rbac.py
index dfb36ca..1410caa 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_server_actions_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_server_actions_rbac.py
@@ -395,7 +395,7 @@
 
     # This class has test case(s) that requires at least microversion 2.16.
     # See the following link for details:
-    # https://developer.openstack.org/api-ref/compute/#show-server-details
+    # https://docs.openstack.org/api-ref/compute/#show-server-details
     min_microversion = '2.16'
     max_microversion = 'latest'
 
diff --git a/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py
index 13c4b66..f41253d 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py
@@ -28,7 +28,7 @@
 
     # Tests will fail with a 404 starting from microversion 2.36.
     # See the following link for details:
-    # https://developer.openstack.org/api-ref/compute/#project-networks-os-tenant-networks-deprecated
+    # https://docs.openstack.org/api-ref/compute/#project-networks-os-tenant-networks-deprecated
     max_microversion = '2.35'
 
     @classmethod
diff --git a/patrole_tempest_plugin/tests/api/compute/test_virtual_interfaces_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_virtual_interfaces_rbac.py
index 5146b1d..62eb0bf 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_virtual_interfaces_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_virtual_interfaces_rbac.py
@@ -28,7 +28,7 @@
 class VirtualInterfacesRbacTest(rbac_base.BaseV2ComputeRbacTest):
     # The compute os-virtual-interfaces API is deprecated from the Microversion
     # 2.44 onward. For more information, see:
-    # https://developer.openstack.org/api-ref/compute/#servers-virtual-interfaces-servers-os-virtual-interfaces-deprecated
+    # https://docs.openstack.org/api-ref/compute/#servers-virtual-interfaces-servers-os-virtual-interfaces-deprecated
     depends_on_nova_network = True
     max_microversion = '2.43'
 
diff --git a/patrole_tempest_plugin/tests/api/compute/test_volume_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_volume_rbac.py
index 77a1ee2..97b2579 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_volume_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_volume_rbac.py
@@ -31,7 +31,7 @@
 
     # These tests will fail with a 404 starting from microversion 2.36.
     # For more information, see:
-    # https://developer.openstack.org/api-ref/compute/#volume-extension-os-volumes-os-snapshots-deprecated
+    # https://docs.openstack.org/api-ref/compute/#volume-extension-os-volumes-os-snapshots-deprecated
     max_microversion = '2.35'
 
     @classmethod