diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index c9d8016e61..c07a24a118 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -151,7 +151,7 @@ from buildbot.steps.master import MasterShellCommand
 
 factory = BuildFactory()
 
-{% if deployment_type in ['prod', 'stg', 'local'] %}
+{% if deployment_type in ['prod',  'local'] %}
 # clean out /var/tmp/taskotron (see T253)
 factory.addStep(ShellCommand(command="rm -rf /var/tmp/taskotron/*", name="rm_tmp", descriptionDone=['Clean tmp']))
 
@@ -159,7 +159,7 @@ factory.addStep(ShellCommand(command="rm -rf /var/tmp/taskotron/*", name="rm_tmp
 factory.addStep(ShellCommand(command=["rm", "-f", "/var/log/taskotron/taskotron.log"], name="rm_log", descriptionDone=['Clean log']))
 {% endif %}
 
-{% if deployment_type == 'dev' %}
+{% if deployment_type in ['dev', 'stg'] %}
 # clean out /var/tmp/taskotron (see T253)
 factory.addStep(ShellCommand(command=Interpolate("rm -rf /var/tmp/taskotron/%(prop:slavename)s/*"), name="rm_tmp", descriptionDone=['Clean tmp']))
 {% endif %}
@@ -179,7 +179,7 @@ factory.addStep(ShellCommand(command=["runtask",
                              descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')],
                              name='runtask',
                              timeout=2400,
-{% if deployment_type == 'dev' %}
+{% if deployment_type in ['dev', 'stg'] %}
                              logfiles={
                                  'taskotron-initiator.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron-initiator.log')},
                                  'taskotron-stdio.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron-stdio.log')},
@@ -187,7 +187,7 @@ factory.addStep(ShellCommand(command=["runtask",
                              }
 ))
 {% endif %}
-{% if deployment_type in ['prod', 'stg', 'local'] %}
+{% if deployment_type in ['prod', 'local'] %}
                              logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }}))
 {% endif %}
 
@@ -200,7 +200,7 @@ factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifac
                                 masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/task_output')))
 
 
-{% if deployment_type in ['prod', 'stg', 'local'] %}
+{% if deployment_type in ['prod', 'local'] %}
 # copy taskotron log to master
 factory.addStep(FileUpload(slavesrc='/var/log/taskotron/taskotron.log',
                            masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log'),
@@ -403,7 +403,7 @@ c['db'] = {
     # This specifies what database buildbot uses to store its state.  You can leave
     # this at its default for all but the largest installations.
     {% if deployment_type == 'dev' %}
-    'db_url' : "postgresql://{{ dev_buildmaster_db_user }}:{{ dev_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
+    'db_url' : "postgresql://{{ buildmaster_db_user }}:{{ buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
     {% endif %}
     {% if deployment_type == 'stg' %}
     'db_url' : "postgresql://{{ stg_buildmaster_db_user }}:{{ stg_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",