diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index 3a4db6c27e..9a443a777d 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -234,6 +234,6 @@ 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_pw }}@{{ dev_buildmaster_db_host }}/{{ dev_buildmaster_db_name }}",
+    'db_url' : "postgresql://{{ dev_buildmaster_db_user }}:{{ dev_buildmaster_db_password }}@{{ dev_buildmaster_db_host }}/{{ dev_buildmaster_db_name }}",
     {% endif %}
 }
diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml
index 32a8857f31..fc1a6a85fa 100644
--- a/roles/taskotron/buildmaster/tasks/main.yml
+++ b/roles/taskotron/buildmaster/tasks/main.yml
@@ -28,4 +28,4 @@
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_user db={{ dev_buildmaster_db_name }} user={{ dev_buildmaster_db_user }} password={{ dev_buildmaster_db_pw }} role_attr_flags=NOSUPERUSER
+  action: postgresql_user db={{ dev_buildmaster_db_name }} user={{ dev_buildmaster_db_user }} password={{ dev_buildmaster_db_password }} role_attr_flags=NOSUPERUSER