diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index 27bc277ce2..5377d0826a 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -220,7 +220,7 @@ c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
 # 'titleURL') and is embedded in the title of the waterfall HTML page.
 
 c['title'] = "Taskotron"
-c['titleURL'] = "http://{{ hostname }}/{{buildmaster_endpoint}}"
+c['titleURL'] = "http://{{ external_hostname }}/{{buildmaster_endpoint}}"
 
 # the 'buildbotURL' string should point to the location where the buildbot's
 # internal web server (usually the html.WebStatus page) is visible. This
@@ -228,7 +228,7 @@ c['titleURL'] = "http://{{ hostname }}/{{buildmaster_endpoint}}"
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
-c['buildbotURL'] = "http://{{ hostname }}/{{buildmaster_endpoint}}"
+c['buildbotURL'] = "http://{{ external_hostname }}/{{buildmaster_endpoint}}"
 
 ####### DB URL