diff --git a/endpoints/common.py b/endpoints/common.py
index e81b4facf..bc57c1beb 100644
--- a/endpoints/common.py
+++ b/endpoints/common.py
@@ -207,6 +207,8 @@ def render_page_template(name, **kwargs):
                                        cache_buster=cache_buster,
                                        has_billing=features.BILLING,
                                        contact_href=contact_href,
+                                       hostname=app.config['SERVER_HOSTNAME'],
+                                       preferred_scheme=app.config['PREFERRED_URL_SCHEME'],
                                        **kwargs))
 
   resp.headers['X-FRAME-OPTIONS'] = 'DENY'
diff --git a/templates/index.html b/templates/index.html
index a0bf60469..120b7865c 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,7 +10,7 @@
   <meta id="descriptionTag" name="description" content="Hosted private docker repositories. Includes full user management and history. Free for public repositories."></meta>
   <meta name="google-site-verification" content="GalDznToijTsHYmLjJvE4QaB9uk_IP16aaGDz5D75T4" />
   <meta name="fragment" content="!" />
-  <meta name="ac-discovery" content="10.0.2.2 http://10.0.2.2/c1/aci/{name}/{version}/{ext}/{os}/{arch}/">
+  <meta name="ac-discovery" content="{{ hostname }} {{ preferred_scheme }}://{{ hostname }}/c1/aci/{name}/{version}/{ext}/{os}/{arch}/">
 
 {% endblock %}