diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index 400bef99b7..50d80220de 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -194,7 +194,12 @@ authz_cfg=authz.Authz(
     {% if deployment_type == 'dev' %}
     auth=auth.BasicAuth([("{{ dev_buildbot_user }}","{{ dev_buildbot_password }}")]),
     {% endif %}
-    #auth=auth.BasicAuth([("{{ buildbot_user }}","{{ buildbot_pw }}")]),
+    {% if deployment_type == 'stg' %}
+    auth=auth.BasicAuth([("{{ stg_buildbot_user }}","{{ stg_buildbot_password }}")]),
+    {% endif %}
+    {% if deployment_type == 'prod' %}
+    auth=auth.BasicAuth([("{{ prod_buildbot_user }}","{{ prod_buildbot_password }}")]),
+    {% endif %}
     gracefulShutdown = False,
     forceBuild = 'auth', # use this to test your slave once it is set up
     forceAllBuilds = False,