diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
index 364f205146..8e2bd965ef 100644
--- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
+++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
@@ -33,7 +33,7 @@ reporting_enabled: True
 ## If True, test results (for selected tests) will be sent as comments to
 ## Fedora Update System (Bodhi). This requires that you have Bodhi
 ## credentials filled in secrets.conf.
-{% if deployment_type == 'dev' %}
+{% if deployment_type == 'dev' or deployment_type == 'stg'%}
 report_to_bodhi: False
 {% else %}
 report_to_bodhi: True
@@ -105,10 +105,12 @@ buildbot_task_step: 'runtask'
 ## These credentials are used when reporting results into Bodhi.
 fas_username: '{{ taskotron_fas_user }}'
 {% if deployment_type == 'dev' %}
-fas_password: '{{ dev_taskotron_fas_password}}'
+#fas_password: '{{ dev_taskotron_fas_password}}'
+fas_password: ''
 {% endif %}
 {% if deployment_type == 'stg' %}
-fas_password: '{{ stg_taskotron_fas_password}}'
+#fas_password: '{{ stg_taskotron_fas_password}}'
+fas_password: ''
 {% endif %}
 {% if deployment_type == 'prod' %}
 fas_password: '{{ taskotron_fas_password }}'