diff --git a/docs/qa/environments.rst b/docs/qa/environments.rst
index 5018144b7..8c959b8a4 100644
--- a/docs/qa/environments.rst
+++ b/docs/qa/environments.rst
@@ -11,15 +11,11 @@ auth admin server, and an API CDN. Not all environments have all of these.
 Production
 ----------
 Production is the live, user-facing instance of Normandy that is hit by every
-active user of Firefox.
+active user of Firefox. The public read-only API server is served through a CDN with a cache
+time of a few minutes.
 
-- **Read-only server:** https://normandy.services.mozilla.com/
-- **API CDN:** https://normandy.cdn.mozilla.net/
-- **Legacy admin:** https://normandy-admin.prod.mozaws.net/ (VPN Required)
-- **Bearer auth admin:** https://normandy-admin-bearer.prod.mozaws.net/ (VPN Required)
-
-For new usage, the API CDN server is preferred for read-only usages, and the
-Bearer auth server is preferred for read-write usages.
+- **Public Read-only API server:** https://normandy.cdn.mozilla.net/
+- **VPN-Only Admin API server:** https://prod-admin.normandy.prod.cloudops.mozgcp.net/
 
 Preferences
 ~~~~~~~~~~~
@@ -38,13 +34,11 @@ Staging
 -------
 Staging is a test environment used to test the deployment process. It is useful
 for testing a version of Normandy before it is deployed to users, but is not
-guaranteed to be functional or available at all times.
-
-- **Read-only server:** https://normandy.stage.mozaws.net/
-- **Legacy admin:** https://normandy-admin.stage.mozaws.net/ (VPN Required)
-- **Bearer auth admin:** https://normandy-admin-bearer.stage.mozaws.net/ (VPN Required)
+guaranteed to be functional or available at all times. Unlike Production, Stage
+does not use a VPN for the public API server.
 
-Staging does not have a API CDN.
+- **Public Read-only API server:** https://stage.normandy.nonprod.cloudops.mozgcp.net/
+- **VPN-Only Admin API server:** https://stage-admin.normandy.nonprod.cloudops.mozgcp.net/ (VPN Required)
 
 Preferences
 ~~~~~~~~~~~
@@ -53,7 +47,7 @@ server:
 
 .. describe:: app.normandy.api_url
 
-   ``https://normandy.stage.mozaws.net/api/v1``
+   ``https://stage.normandy.nonprod.cloudops.mozgcp.net/api/v1``
 
 .. describe:: security.content.signature.root_hash
 
@@ -62,15 +56,12 @@ server:
 Dev
 ---
 Dev is an environment that deploys automatically from the master branch. It can be used
-for testing admin frontends to Normandy, and always has the latest  code. Sometimes it
-is broken. Dev doesn't have a separate read-only and admin server, there is only one
-server.
-
-- **Legacy admin:** https://normandy.dev.mozaws.net/
-- **Bearer auth admin:** https://normandy-admin-bearer.dev.mozaws.net/
+for testing admin frontends to Normandy, and always has the latest code. Sometimes it
+is broken. Unlike Production and Staging, Dev doesn't require use of the VPN to access
+the admin server.
 
-Dev does not have a separate read-only server, nor an API CDN. None of its server
-require VPN to access.
+- **Read-only API server:** https://dev.normandy.nonprod.cloudops.mozgcp.net/
+- **Admin API server:** https://dev-admin.normandy.nonprod.cloudops.mozgcp.net/
 
 Preferences
 ~~~~~~~~~~~
@@ -79,7 +70,7 @@ server:
 
 .. describe:: app.normandy.api_url
 
-   ``https://normandy.dev.mozaws.net/api/v1``
+   ``https://dev.normandy.nonprod.cloudops.mozgcp.net/api/v1``
 
 .. describe:: security.content.signature.root_hash
 
@@ -114,4 +105,4 @@ local server:
 
 .. describe:: security.content.signature.root_hash
 
-   ``4C:35:B1:C3:E3:12:D9:55:E7:78:ED:D0:A7:E7:8A:38:83:04:EF:01:BF:FA:03:29:B2:46:9F:3C:C5:EC:36:04``
\ No newline at end of file
+   ``4C:35:B1:C3:E3:12:D9:55:E7:78:ED:D0:A7:E7:8A:38:83:04:EF:01:BF:FA:03:29:B2:46:9F:3C:C5:EC:36:04``