diff --git a/modules/sysadmin_guide/nav.adoc b/modules/sysadmin_guide/nav.adoc
index 6515cb5..90c47cd 100644
--- a/modules/sysadmin_guide/nav.adoc
+++ b/modules/sysadmin_guide/nav.adoc
@@ -90,7 +90,7 @@
 ** xref:pesign-upgrade.adoc[Pesign upgrades/reboots - SOP]
 ** xref:planetsubgroup.adoc[Planet Subgroup Infrastructure - SOP]
 ** xref:publictest-dev-stg-production.adoc[Fedora Infrastructure Machine Classes - SOP]
-** xref:rabbitmq.adoc[rabbitmq - SOP in review ]
+** xref:rabbitmq.adoc[RabbitMQ - SOP]
 ** xref:rdiff-backup.adoc[rdiff-backup - SOP in review ]
 ** xref:registry.adoc[registry - SOP in review ]
 ** xref:requestforresources.adoc[requestforresources - SOP in review ]
diff --git a/modules/sysadmin_guide/pages/rabbitmq.adoc b/modules/sysadmin_guide/pages/rabbitmq.adoc
index d7bbd49..a14628e 100644
--- a/modules/sysadmin_guide/pages/rabbitmq.adoc
+++ b/modules/sysadmin_guide/pages/rabbitmq.adoc
@@ -1,6 +1,6 @@
 = RabbitMQ SOP
 
-link:[RabbitMQ] is the message broker Fedora uses to allow applications
+https://www.rabbitmq.com/[RabbitMQ] is the message broker Fedora uses to allow applications
 to send each other (or themselves) messages.
 
 == Contact Information
@@ -15,8 +15,8 @@ Fedora Infrastructure Team
 
 === Servers
 
-* rabbitmq0[1-3].phx2.fedoraproject.org
-* rabbitmq0[1-3].stg.phx2.fedoraproject.org
+* rabbitmq0[1-3].iad2.fedoraproject.org
+* rabbitmq0[1-3].stg.iad2.fedoraproject.org
 
 === Purpose
 
@@ -34,7 +34,8 @@ repository as it has a more up-to-date version.
 
 === The Cluster
 
-RabbitMQ supports link:[clustering] a set of hosts into a single logical
+RabbitMQ supports https://www.rabbitmq.com/clustering.html[clustering]
+a set of hosts into a single logical
 message broker. The Fedora cluster is composed of 3 nodes,
 rabbitmq01-03, in both staging and production. `groups/rabbitmq.yml` is
 the playbook that deploys the cluster.
@@ -55,7 +56,8 @@ sent via "zmq.topic".
 ==== /public_pubsub
 
 This virtual host has the "amq.topic" and "zmq.topic" exchanges from
-/pubsub link:[federated] to it, and we allow anyone on the Internet to
+/pubsub https://www.rabbitmq.com/federation.html[federated] to it,
+and we allow anyone on the Internet to
 connect to this virtual host. For the moment it is on the same broker
 cluster, but if people abuse it it can be moved to a separate cluster.
 
@@ -100,8 +102,8 @@ It should not return the empty array (`[]`) but something like:
   {upstream,<<"pubsub-to-public_pubsub">>},
   {id,<<"b40208be0a999cc93a78eb9e41531618f96d4cb2">>},
   {status,running},
-  {local_connection,<<"<rabbit@rabbitmq01.phx2.fedoraproject.org.2.8709.481>">>},
-  {uri,<<"amqps://rabbitmq01.phx2.fedoraproject.org/%2Fpubsub">>},
+  {local_connection,<<"<rabbit@rabbitmq01.iad2.fedoraproject.org.2.8709.481>">>},
+  {uri,<<"amqps://rabbitmq01.iad2.fedoraproject.org/%2Fpubsub">>},
   {timestamp,{{2020,3,11},{16,45,18}}}],
  [{exchange,<<"zmq.topic">>},
   {upstream_exchange,<<"zmq.topic">>},
@@ -110,8 +112,8 @@ It should not return the empty array (`[]`) but something like:
   {upstream,<<"pubsub-to-public_pubsub">>},
   {id,<<"c1e7747425938349520c60dda5671b2758e210b8">>},
   {status,running},
-  {local_connection,<<"<rabbit@rabbitmq01.phx2.fedoraproject.org.2.8718.481>">>},
-  {uri,<<"amqps://rabbitmq01.phx2.fedoraproject.org/%2Fpubsub">>},
+  {local_connection,<<"<rabbit@rabbitmq01.iad2.fedoraproject.org.2.8718.481>">>},
+  {uri,<<"amqps://rabbitmq01.iad2.fedoraproject.org/%2Fpubsub">>},
   {timestamp,{{2020,3,11},{16,45,17}}}]]
 ....
 
@@ -125,9 +127,3 @@ rabbitmqctl set_policy -p /public_pubsub --apply-to exchanges pubsub-to-public_p
 
 After which the Federation link status can be checked with the same
 command as before.
-
-https://www.rabbitmq.com/
-
-https://www.rabbitmq.com/clustering.html
-
-https://www.rabbitmq.com/federation.html