diff --git a/inventory/group_vars/taskotron-prod-clients b/inventory/group_vars/taskotron-prod-clients
index eff7e44f68..91ef8bd47f 100644
--- a/inventory/group_vars/taskotron-prod-clients
+++ b/inventory/group_vars/taskotron-prod-clients
@@ -4,7 +4,7 @@ mem_size: 8096
 num_cpus: 2
 
 slave_user: buildslave
-taskotron_fas_user: autoqa
+taskotron_fas_user: taskotron
 resultsdb_server: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v1.0/
 # this is proxy01.phx2
 bodhi_server: https://admin.fedoraproject.org/updates
diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
index 6aa1c053ae..379aba77eb 100644
--- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
+++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
@@ -92,6 +92,6 @@ fas_password: '{{ dev_taskotron_fas_password}}'
 fas_password: '{{ stg_taskotron_fas_password}}'
 {% endif %}
 {% if deployment_type == 'prod' %}
-fas_password: '{{ prod_taskotron_fas_password}}'
+fas_password: '{{ taskotron_fas_password }}'
 {% endif %}