diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev
index a9f8f951ea..eff73dace6 100644
--- a/inventory/group_vars/taskotron-dev
+++ b/inventory/group_vars/taskotron-dev
@@ -21,3 +21,4 @@ buildslave_dir: /home/buildslave/slave
 master_dir: /home/buildmaster/master
 master_user: buildmaster
 external_hostname: taskotron.dev.fedoraproject.org
+deployment_type: dev
diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index 5074b77600..3a4db6c27e 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -184,7 +184,10 @@ from buildbot.status.web import authz, auth
 authz_cfg=authz.Authz(
     # change any of these to True to enable; see the manual for more
     # options
-    auth=auth.BasicAuth([("{{ buildbot_user }}","{{ buildbot_pw }}")]),
+    {% if deployment_type == 'dev' %}
+    auth=auth.BasicAuth([("{{ dev_buildbot_user }}","{{ dev_buildbot_pw }}")]),
+    {% endif %}
+    #auth=auth.BasicAuth([("{{ buildbot_user }}","{{ buildbot_pw }}")]),
     gracefulShutdown = False,
     forceBuild = 'auth', # use this to test your slave once it is set up
     forceAllBuilds = False,
@@ -230,6 +233,7 @@ c['buildbotURL'] = "http://{{ 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.
-    #'db_url' : "sqlite:///state.sqlite",
-    'db_url' : "postgresql://{{ buildmaster_db_user }}:{{ buildmaster_db_pw }}@{{ buildmaster_db_host }}/{{ buildmaster_db }}",
+    {% if deployment_type == 'dev' %}
+    'db_url' : "postgresql://{{ dev_buildmaster_db_user }}:{{ dev_buildmaster_db_pw }}@{{ 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 847bf241ce..32a8857f31 100644
--- a/roles/taskotron/buildmaster/tasks/main.yml
+++ b/roles/taskotron/buildmaster/tasks/main.yml
@@ -16,14 +16,16 @@
   notify:
     - restart httpd
 
-- name: ensure database is created
+- name: ensure dev database is created
+  when: deployment_type == 'dev'
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_db db={{ buildmaster_db_name }}
+  action: postgresql_db db={{ dev_buildmaster_db_name }}
 
-- name: ensure user has access to database
+- name: ensure dev user has access to dev database
+  when: deployment_type == 'dev'
   delegate_to: "{{ buildmaster_db_host }}"
   sudo: true
   sudo_user: postgres
-  action: postgresql_user db={{ buildmaster_db_name }} user={{ buildmaster_db_user }} password={{ buildmaster_db_pw }} role_attr_flags=NOSUPERUSER
+  action: postgresql_user db={{ dev_buildmaster_db_name }} user={{ dev_buildmaster_db_user }} password={{ dev_buildmaster_db_pw }} role_attr_flags=NOSUPERUSER