--- a/browser/app/permissions
+++ b/browser/app/permissions
@@ -6,17 +6,17 @@
 # * permission is an integer between 1 and 15
 # See nsPermissionManager.cpp for more...
 
 # UITour
 origin	uitour	1	https://www.mozilla.org
 origin	uitour	1	https://self-repair.mozilla.org
 origin	uitour	1	https://support.mozilla.org
 origin	uitour	1	https://addons.mozilla.org
-origin	uitour	1	https://services.addons.mozilla.org
+origin	uitour	1	https://discovery.addons.mozilla.org
 origin	uitour	1	about:home
 
 # XPInstall
 origin	install	1	https://addons.mozilla.org
 
 # Remote troubleshooting
 origin	remote-troubleshooting	1	https://input.mozilla.org
 origin	remote-troubleshooting	1	https://support.mozilla.org

--- a/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp
+++ b/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp
@@ -35,26 +35,26 @@ AddonManagerWebAPI::IsValidSite(nsIURI* 
 
   nsCString host;
   rv = uri->GetHost(host);
   if (NS_FAILED(rv)) {
     return false;
   }
 
   if (host.Equals("addons.mozilla.org") ||
-      host.Equals("services.addons.mozilla.org")) {
+      host.Equals("discovery.addons.mozilla.org")) {
     return true;
   }
 
   // When testing allow access to the developer sites.
   if (Preferences::GetBool("extensions.webapi.testing", false)) {
     if (host.Equals("addons.allizom.org") ||
-        host.Equals("services.addons.allizom.org") ||
+        host.Equals("discovery.addons.allizom.org") ||
         host.Equals("addons-dev.allizom.org") ||
-        host.Equals("services.addons-dev.allizom.org") ||
+        host.Equals("discovery.addons-dev.allizom.org") ||
         host.Equals("example.com")) {
       return true;
     }
   }
 
   return false;
 }