diff --git a/modules/sysadmin_guide/nav.adoc b/modules/sysadmin_guide/nav.adoc
index 70340c1..8d48a63 100644
--- a/modules/sysadmin_guide/nav.adoc
+++ b/modules/sysadmin_guide/nav.adoc
@@ -80,8 +80,8 @@
 ** xref:nonhumanaccounts.adoc[Non-human Accounts Infrastructure - SOP]
 ** xref:nuancier.adoc[Nuancier - SOP]
 ** xref:odcs.adoc[On Demand Compose Service - SOP]
-** xref:openqa.adoc[openqa - SOP in review ]
-** xref:openshift.adoc[openshift - SOP in review ]
+** xref:openqa.adoc[OpenQA Infrastructure - SOP]
+** xref:openshift.adoc[OpenShift - SOP]
 ** xref:openvpn.adoc[openvpn - SOP in review ]
 ** xref:outage.adoc[outage - SOP in review ]
 ** xref:packagedatabase.adoc[packagedatabase - SOP in review ]
diff --git a/modules/sysadmin_guide/pages/openqa.adoc b/modules/sysadmin_guide/pages/openqa.adoc
index 786acf2..07b60ee 100644
--- a/modules/sysadmin_guide/pages/openqa.adoc
+++ b/modules/sysadmin_guide/pages/openqa.adoc
@@ -1,14 +1,18 @@
-= openQA Infrastructure SOP
+= OpenQA Infrastructure SOP
 
-openQA is an automated test system used to run validation tests on
+OpenQA is an automated test system used to run validation tests on
 nightly and candidate Fedora composes, and also to run a subset of these
 tests on critical path updates.
 
-openQA production instance: https://openqa.fedoraproject.org openQA
-staging instance: https://openqa.stg.fedoraproject.org Wiki page on
-Fedora openQA deployment: https://fedoraproject.org/wiki/OpenQA Upstream
-project page: http://open.qa/ Upstream repositories:
-https://github.com/os-autoinst
+OpenQA production instance: https://openqa.fedoraproject.org
+
+OpenQA staging instance: https://openqa.stg.fedoraproject.org
+
+Wiki page on Fedora openQA deployment: https://fedoraproject.org/wiki/OpenQA
+
+Upstream project page: http://open.qa/
+
+Upstream repositories: https://github.com/os-autoinst
 
 == Contact Information
 
@@ -18,8 +22,6 @@ Contact::
   #fedora-qa, #fedora-admin, qa-devel mailing list
 People::
   Adam Williamson (adamwill / adamw), Petr Schindler (pschindl)
-Location::
-  PHX2
 Machines::
   See ansible inventory groups with 'openqa' in name
 Purpose::
diff --git a/modules/sysadmin_guide/pages/openshift.adoc b/modules/sysadmin_guide/pages/openshift.adoc
index 2c252b0..0ce8fb0 100644
--- a/modules/sysadmin_guide/pages/openshift.adoc
+++ b/modules/sysadmin_guide/pages/openshift.adoc
@@ -4,10 +4,9 @@ OpenShift is used in Fedora Infrastructure to host a number of
 applications. This SOP is applicable to the OpenShift cluster and not
 the application running on it.
 
-Production instance: https://os.fedoraproject.org/ Staging instance:
-https://os.stg.fedoraproject.org/
+Production instance: https://os.fedoraproject.org/
 
-Contents
+Staging instance: https://os.stg.fedoraproject.org/
 
 == Contact information
 
@@ -17,17 +16,15 @@ Contact::
   #fedora-admin
 Persons::
   .oncall
-Location::
-  Phoenix
 Servers::
-  * os-master01.phx2.fedoraproject.org
-  * os-master02.phx2.fedoraproject.org
-  * os-master03.phx2.fedoraproject.org
-  * os-node01.phx2.fedoraproject.org
-  * os-node02.phx2.fedoraproject.org
-  * os-node03.phx2.fedoraproject.org
-  * os-node04.phx2.fedoraproject.org
-  * os-node05.phx2.fedoraproject.org
+  * os-master01.iad2.fedoraproject.org
+  * os-master02.iad2.fedoraproject.org
+  * os-master03.iad2.fedoraproject.org
+  * os-node01.iad2.fedoraproject.org
+  * os-node02.iad2.fedoraproject.org
+  * os-node03.iad2.fedoraproject.org
+  * os-node04.iad2.fedoraproject.org
+  * os-node05.iad2.fedoraproject.org
 Purpose::
   Run Fedora Infrastructure applications
 
@@ -38,16 +35,16 @@ Purpose::
 If an application build seems stuck, it generally helps to restart the
 docker service on the node used for the build.
 
-First check which builds are currently running on the cluster. :
+First check which builds are currently running on the cluster:
 
 ....
 [os-master01] # oc get builds --all-namespaces | grep -i running
 ....
 
-if the builds seems stuck (ie running for more than 20 mins), Check on
+If the builds seems stuck (ie running for more than 20 mins) check on
 which nodes they are scheduled.
 
-Let's take a bodhi build for example :
+Let's take a bodhi build for example:
 
 ....
 [os-master01] # oc -n bodhi get builds
@@ -56,20 +53,20 @@ Let's take a bodhi build for example :
 ....
 
 Once you have identified which node the build is running on, you can
-restart the docker service on this node. :
+restart the docker service on this node:
 
 ....
 [os-node02] # systemctl restart docker
 ....
 
-You can start a new build.:
+You can start a new build:
 
 ....
 [os-master01] # oc -n bodhi start-build bodhi-base
 ....
 
 Finally you can check if there are any more build stuck. If that's the
-case just repeat these steps. :
+case just repeat these steps:
 
 ....
 [os-master01] # oc get builds --all-namespaces