diff --git a/settings.py b/settings.py
index d9bca6357d..5a56a6b2e5 100644
--- a/settings.py
+++ b/settings.py
@@ -5,6 +5,7 @@ won't be tracked in git).
 
 """
 import os
+import re
 
 from olympia.lib.settings_base import *  # noqa
 
@@ -70,8 +71,8 @@ ADDONS_LINTER_BIN = os.getenv(
 ES_DEFAULT_NUM_REPLICAS = 0
 
 SITE_URL = os.environ.get('OLYMPIA_SITE_URL') or 'http://localhost:8000'
-SERVICES_DOMAIN = 'localhost:8000'
-SERVICES_URL = 'http://%s' % SERVICES_DOMAIN
+SERVICES_DOMAIN = re.sub(r'^https?:\/\/', '', SITE_URL)
+SERVICES_URL = SITE_URL
 
 ADDON_COLLECTOR_ID = 1