diff --git a/inventory/group_vars/taskotron-dev-client-hosts b/inventory/group_vars/taskotron-dev-client-hosts
index 635600b7d7..08b35a9e2f 100644
--- a/inventory/group_vars/taskotron-dev-client-hosts
+++ b/inventory/group_vars/taskotron-dev-client-hosts
@@ -24,6 +24,7 @@ extra_enablerepos: 'infrastructure-testing'
 slaves_group: buildslaves
 buildmaster: 10.5.124.181
 buildslave_port: 9989
+buildslave_password: "{{ dev_buildslave_password }}"
 taskotron_admin_email: taskotron-admin-members@fedoraproject.org
 
 
diff --git a/inventory/group_vars/taskotron-prod-client-hosts b/inventory/group_vars/taskotron-prod-client-hosts
index 84398b4f98..08ed988a13 100644
--- a/inventory/group_vars/taskotron-prod-client-hosts
+++ b/inventory/group_vars/taskotron-prod-client-hosts
@@ -22,6 +22,7 @@ extra_enablerepos: ''
 slaves_group: buildslaves
 buildmaster: 10.5.124.206
 buildslave_port: 9989
+buildslave_password: "{{ prod_buildslave_password }}"
 taskotron_admin_email: taskotron-admin-members@fedoraproject.org
 
 
diff --git a/inventory/group_vars/taskotron-stg-client-hosts b/inventory/group_vars/taskotron-stg-client-hosts
index a9f04bfa5a..ff2914635d 100644
--- a/inventory/group_vars/taskotron-stg-client-hosts
+++ b/inventory/group_vars/taskotron-stg-client-hosts
@@ -24,6 +24,7 @@ extra_enablerepos: 'infrastructure-testing'
 slaves_group: buildslaves
 buildmaster: 10.5.124.232
 buildslave_port: 9989
+buildslave_password: "{{ stg_buildslave_password }}"
 taskotron_admin_email: taskotron-admin-members@fedoraproject.org
 
 
diff --git a/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 b/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2
index 875395d4e4..6c90560310 100644
--- a/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2
+++ b/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2
@@ -34,24 +34,13 @@ except ImportError:
 
 buildmaster_host = '{{ buildmaster }}'
 port = 9989
-{% if deployment_type in ['prod', 'stg', 'local', 'qa-stg'] %}
+{% if deployment_type in ['local', 'qa-stg'] %}
 slavename = '{{ buildslave_name }}'
+passwd = '{{ buildslave_password }}'
 {% endif %}
-{% if deployment_type == 'dev' %}
+{% if deployment_type in ['dev', 'stg', 'prod'] %}
 slavename = '{{ item.user }}'
 {% endif %}
-{% if deployment_type == 'dev' %}
-passwd = '{{ dev_buildslave_password }}'
-{% endif %}
-{% if deployment_type == 'stg' %}
-passwd = '{{ stg_buildslave_password }}'
-{% endif %}
-{% if deployment_type == 'prod' %}
-passwd = '{{ prod_buildslave_password }}'
-{% endif %}
-{% if deployment_type == 'local' %}
-passwd = '{{ local_buildslave_password }}'
-{% endif %}
 
 {% if deployment_type == 'qadevel-prod' %}
 passwd = '{{ qadevel_prod_buildslave_password }}'