diff --git a/inventory/group_vars/taskotron-stg b/inventory/group_vars/taskotron-stg
index e2146c8e87..ec0096109d 100644
--- a/inventory/group_vars/taskotron-stg
+++ b/inventory/group_vars/taskotron-stg
@@ -60,6 +60,8 @@ cgit_root_title: "Taskotron Stg Server Git Mirror"
 
 buildmaster_db_host: db-qa01.qa.fedoraproject.org
 buildmaster_db_name: buildmaster_stg
+buildmaster_db_user: "{{ stg_buildmaster_db_user }}"
+buildmaster_db_password: "{{ stg_buildmaster_db_password }}"
 buildmaster_dir: /srv/buildmaster/master
 buildmaster_endpoint: taskmaster
 buildmaster_home: /srv/buildmaster
diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index c07a24a118..fe69efef6d 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -402,12 +402,9 @@ c['buildbotURL'] = "http://{{ external_hostname }}/{{buildmaster_endpoint}}/"
 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' %}
+    {% if deployment_type in ['dev', 'stg'] %}
     '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 }}",
-    {% endif %}
     {% if deployment_type == 'prod' %}
     'db_url' : "postgresql://{{ prod_buildmaster_db_user }}:{{ prod_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
     {% endif %}