diff --git a/modules/developer_guide/pages/messaging.adoc b/modules/developer_guide/pages/messaging.adoc
index 0f3886f..2508708 100644
--- a/modules/developer_guide/pages/messaging.adoc
+++ b/modules/developer_guide/pages/messaging.adoc
@@ -16,13 +16,13 @@ through the proxies at `amqps://rabbitmq.fedoraproject.org` for
 production and `amqps://rabbitmq.stg.fedoraproject.org` for staging.
 Clients can connect using these URLs both inside and outside the Fedora
 VPN, but users outside need to use a separate virtual host. Consult the
-https://fedora-messaging.readthedocs.io/en/latest/quick-start.html#fedora-s-public-broker[fedora-messaging
+https://fedora-messaging.readthedocs.io/en/latest/user-guide/quick-start.html#fedora-s-public-broker[fedora-messaging
 documentation] for details on how to connect externally.
 
 === Identity
 
 In order to help with debugging, clients must configure the
-https://fedora-messaging.readthedocs.io/en/latest/configuration.html#client-properties[client_properties]
+https://fedora-messaging.readthedocs.io/en/latest/user-guide/configuration.html#client-properties[client_properties]
 option to include their application name under the `app` key. Clients
 should include the application version, if possible, in the
 `app_version` key.
@@ -31,7 +31,7 @@ should include the application version, if possible, in the
 
 When applications are deployed, clients must authenticate with the
 message broker over a TLS connection using x509 certificates. There are
-https://fedora-messaging.readthedocs.io/en/stable/configuration.html#tls[configuration
+https://fedora-messaging.readthedocs.io/en/stable/user-guide/configuration.html#tls[configuration
 options] for this in fedora-messaging.
 
 Clients require certificates issued by Fedora Infrastructure. If you're
@@ -64,8 +64,8 @@ with a helpful error message about which resource is not available.
 ====
 Because AMQP clients don't have permission to create objects, you need
 to set
-https://fedora-messaging.readthedocs.io/en/stable/configuration.html#passive-declares[passive_declares
-= true] or you will get 403 Permission Denied errors.
+https://fedora-messaging.readthedocs.io/en/stable/user-guide/configuration.html#passive-declares["passive_declares
+= true"] or you will get 403 Permission Denied errors.
 ====
 
 Users, exchanges, queues, bindings, and