diff --git a/modules/sysadmin_guide/nav.adoc b/modules/sysadmin_guide/nav.adoc
index ab6b53e..6adea96 100644
--- a/modules/sysadmin_guide/nav.adoc
+++ b/modules/sysadmin_guide/nav.adoc
@@ -42,7 +42,7 @@
 ** xref:geoip-city-wsgi.adoc[geoip-city-wsgi - SOP]
 ** xref:github2fedmsg.adoc[github2fedmsg - SOP]
 ** xref:github.adoc[Using github for Infra Projects - SOP]
-** xref:greenwave.adoc[greenwave - SOP in review ]
+** xref:greenwave.adoc[Greenwave - SOP]
 ** xref:guestdisk.adoc[guestdisk - SOP in review ]
 ** xref:guestedit.adoc[guestedit - SOP in review ]
 ** xref:haproxy.adoc[haproxy - SOP in review ]
diff --git a/modules/sysadmin_guide/pages/greenwave.adoc b/modules/sysadmin_guide/pages/greenwave.adoc
index 2de247e..4aa7932 100644
--- a/modules/sysadmin_guide/pages/greenwave.adoc
+++ b/modules/sysadmin_guide/pages/greenwave.adoc
@@ -8,8 +8,6 @@ Contact::
   #fedora-qa, #fedora-admin
 Persons::
   gnaponie (giulia), mprahl, lucarval, ralph (threebean)
-Location::
-  Phoenix
 Public addresses::
   * https://greenwave-web-greenwave.app.os.fedoraproject.org/api/v1.0/version
   * https://greenwave-web-greenwave.app.os.fedoraproject.org/api/v1.0/policies
@@ -24,7 +22,7 @@ Purpose::
 * See
 http://fedoraproject.org/wiki/Infrastructure/Factory2/Focus/Greenwave[the
 focus document] for background.
-* See https://pagure.io/docs/greenwave/[the upstream docs] for more
+* See https://gating-greenwave.readthedocs.io/en/latest/[the upstream docs] for more
 detailed info.
 
 Greenwave's job is:
@@ -36,18 +34,18 @@ Greenwave's job is:
 * according to some policy
 
 In particular, we'll be using Greenwave to provide yes/no gating
-decisions _to Bodhi_ about rpms in each update. Greenwave will do this
+decisions to _Bodhi_ about rpms in each update. Greenwave will do this
 by consulting resultsdb and waiverdb for individual test results and
 then combining those results into an aggregate decision.
 
 The _policies_ for how those results should be combined or ignored, are
 defined in ansible in
-`roles/openshift-apps/greenwave/templates/configmap.yml`. We expect to
-grow these over time to new use cases (rawhide compose gating, etc..)
+https://pagure.io/fedora-infra/ansible/blob/main/f/roles/openshift-apps/greenwave/templates/configmap.yml[roles/openshift-apps/greenwave/templates/configmap.yml].
+We expect to grow these over time to new use cases (rawhide compose gating, etc..)
 
 == Observing Greenwave Behavior
 
-Login to `os-master01.phx2.fedoraproject.org` as `root` (or,
+Login to `os-master01.iad2.fedoraproject.org` as `root` (or,
 authenticate remotely with openshift using
 `oc login https://os.fedoraproject.org`), and run:
 
@@ -65,14 +63,14 @@ It relies on `resultsdb` and `waiverdb` for information.
 == Upgrading
 
 You can roll out configuration changes by changing the files in
-`roles/openshift-apps/greenwave/` and running the
-`playbooks/openshift-apps/greenwave.yml` playbook.
+https://pagure.io/fedora-infra/ansible/blob/main/f/roles/openshift-apps/greenwave[roles/openshift-apps/greenwave/] and running the
+https://pagure.io/fedora-infra/ansible/blob/main/f/playbooks/openshift-apps/greenwave.yml[playbooks/openshift-apps/greenwave.yml] playbook.
 
 To understand how the software is deployed, take a look at these two
 files:
 
-* `roles/openshift-apps/greenwave/templates/imagestream.yml`
-* `roles/openshift-apps/greenwave/templates/buildconfig.yml`
+* https://pagure.io/fedora-infra/ansible/blob/main/f/roles/openshift-apps/greenwave/templates/imagestream.yml[roles/openshift-apps/greenwave/templates/imagestream.yml]
+* https://pagure.io/fedora-infra/ansible/blob/main/f/roles/openshift-apps/greenwave/templates/buildconfig.yml[roles/openshift-apps/greenwave/templates/buildconfig.yml]
 
 See that we build a fedora-infra specific image on top of an app image
 published by upstream. The `latest` tag is automatically deployed to
@@ -87,6 +85,7 @@ a new os.fp.o build and deployment should be automatically created.
 You can watch the build and deployment with `oc` commands.
 
 You can poll this URL to see what version is live at the moment:
+
 https://greenwave-web-greenwave.app.os.fedoraproject.org/api/v1.0/version
 
 == Troubleshooting