diff --git a/inventory/group_vars/taskotron-dev-clients b/inventory/group_vars/taskotron-dev-clients
index 815ab9e7e9..0dcfdde8b9 100644
--- a/inventory/group_vars/taskotron-dev-clients
+++ b/inventory/group_vars/taskotron-dev-clients
@@ -3,8 +3,38 @@ lvm_size: 20000
 mem_size: 4096
 num_cpus: 2
 
+############################################################
+# general config
+############################################################
+
+deployment_type: dev
+tcp_ports: [ "{{ buildslave_port }}" ]
+sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
+freezes: false
+
+
+############################################################
+# buildslave config
+############################################################
+
 slave_user: buildslave
+slave_home: /home/buildslave/
+slave_dir: /home/buildslave/slave
+slave_user: buildslave
+buildmaster: 10.5.124.181
+buildslave_port: 9989
+taskotron_admin_email: taskotron-admin-members@fedoraproject.org
+
+
+############################################################
+# taskotron config
+############################################################
+
 taskotron_fas_user: taskotron
+# stuff is kinda not working for stg bodhi right now. workaround by having empty fas password
+#taskotron_fas_password: '{{ dev_taskotron_fas_password}}'
+taskotron_fas_password: ''
+
 execdb_external_url: http://taskotron-dev.fedoraproject.org/execdb
 resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0
 bodhi_server: https://bodhi.stg.fedoraproject.org/
@@ -12,16 +42,12 @@ kojihub_url: http://koji.fedoraproject.org/kojihub
 taskotron_master: http://taskotron-dev.fedoraproject.org/taskmaster
 resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb
 artifacts_base_url: http://taskotron-dev.fedoraproject.org/artifacts
-deployment_type: dev
-slave_home: /home/buildslave/
-slave_dir: /home/buildslave/slave
-slave_user: buildslave
-buildmaster: 10.5.124.181
-buildslave_port: 9989
-tcp_ports: [ "{{ buildslave_port }}" ]
+
+
+############################################################
+# task git mirror config
+############################################################
+
 buildslave_private_sshkey_file: dev-buildslave-sshkey/dev_buildslave
 buildslave_public_sshkey_file: dev-buildslave-sshkey/dev_buildslave.pub
-taskotron_admin_email: taskotron-admin-members@fedoraproject.org
-sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 buildmaster_pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvKJQa9MCUXhnqv/MQrc22Th6WnTS9oWQK3nbic8U5fCssM7FMCbsNnaJtKEFw40TyVGTje14ETLLocN6wPZhS2rSN/QNclSawV9R1JUA9NyA8gqNGTkpZU0bLf8LK2frpr7WvmaKBPC9aFTMHJzIe8ppmoRKGfVneHpqbFUmRyf8Ks+TtEOAk38LFnlqnWWttiHs7AIutcBvdaCkBAkFxZCPh/FDLg2S29UyqJ5JWNHlAocDblYetmjsnWwhWnL8Fsi2hpfJrXLaF6J99oXqVeZivC+5LFGjCwhT+QBSvoniKGPM1ZeqPmQsvWFbFRBPZdNcNvqz9piUxQhd45+Nb"
-freezes: false
diff --git a/inventory/group_vars/taskotron-prod-clients b/inventory/group_vars/taskotron-prod-clients
index 201d467e7e..69475003fa 100644
--- a/inventory/group_vars/taskotron-prod-clients
+++ b/inventory/group_vars/taskotron-prod-clients
@@ -3,23 +3,50 @@ lvm_size: 60000
 mem_size: 8096
 num_cpus: 2
 
-slave_user: buildslave
-taskotron_fas_user: taskotron
-execdb_external_url: https://taskotron.fedoraproject.org/execdb/
-resultsdb_server: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v1.0/
-# this is proxy01.phx2
-bodhi_server: https://admin.fedoraproject.org/updates
-kojihub_url: http://koji.fedoraproject.org/kojihub
-taskotron_master: https://taskotron.fedoraproject.org/taskmaster/
+############################################################
+# general config
+############################################################
+
 deployment_type: prod
+tcp_ports: [ "{{ buildslave_port }}" ]
+sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
+freezes: true
+
+
+############################################################
+# buildslave config
+############################################################
+
+slave_user: buildslave
 slave_home: /home/buildslave/
 slave_dir: /home/buildslave/slave
 slave_user: buildslave
 buildmaster: 10.5.124.206
 buildslave_port: 9989
-tcp_ports: [ "{{ buildslave_port }}" ]
+taskotron_admin_email: taskotron-admin-members@fedoraproject.org
+
+
+############################################################
+# taskotron config
+############################################################
+
+taskotron_fas_user: taskotron
+taskotron_fas_password: '{{ taskotron_fas_password}}'
+
+execdb_external_url: https://taskotron.fedoraproject.org/execdb/
+resultsdb_server: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v1.0/
+# this should be proxy01.phx2 through /etc/hosts
+bodhi_server: https://bodhi.fedoraproject.org/
+kojihub_url: http://koji.fedoraproject.org/kojihub
+taskotron_master: https://taskotron.fedoraproject.org/taskmaster/
+resultsdb_external_url: https://taskotron.fedoraproject.org/resultsdb
+artifacts_base_url: http://taskotron.fedoraproject.org/artifacts
+
+
+############################################################
+# task git mirror config
+############################################################
+
 buildslave_private_sshkey_file: prod-buildslave-sshkey/prod_buildslave
 buildslave_public_sshkey_file: prod-buildslave-sshkey/prod_buildslave.pub
-taskotron_admin_email: taskotron-admin-members@fedoraproject.org
-sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 buildmaster_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtxF0c0WKY/awWpDyTsN9WLXKthHpKiT1gWfbJ6yNCXXwgC0r7B77kxvMUnr8SMnlrTk0+GHTx9XACMDdOcctBnnH0dGqq1k9ux6egRBSY4X9PG1udiNHzKfVU7CIghHJf9JaXr7k1DoyVj4MAXgGVQocBZqXkULieGYAOcHfBqnrf477wrljQUx2Unso1xqGhigJoIIO848fEAK0b87OXlxDdiRYhqLcHXelAE0RhUhr4Vkuot8bhVqtANJBzc4/whRKSyrTMPbRwQdIK8Sclp3sEZE1NgtYKr8GhTXd9IEsudz1i4vYB94fw7gSYoVAbpRw5JRVw0iJOOFDZLojr'
diff --git a/inventory/group_vars/taskotron-stg-clients b/inventory/group_vars/taskotron-stg-clients
index c9073cb88a..43149e5143 100644
--- a/inventory/group_vars/taskotron-stg-clients
+++ b/inventory/group_vars/taskotron-stg-clients
@@ -3,25 +3,52 @@ lvm_size: 20000
 mem_size: 4096
 num_cpus: 2
 
-slave_user: buildslave
-taskotron_fas_user: taskotron
-execdb_external_url: https://taskotron.stg.fedoraproject.org/execdb/
-resultsdb_server: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v1.0/
-bodhi_server: http://10.5.124.232/fakefedorainfra/bodhi/
-kojihub_url: http://koji.fedoraproject.org/kojihub
-taskotron_master: https://taskotron.stg.fedoraproject.org/taskmaster/
-resultsdb_external_url: https://taskotron.stg.fedoraproject.org/resultsdb
-artifacts_base_url: http://taskotron.stg.fedoraproject.org/artifacts
+############################################################
+# general config
+############################################################
+
 deployment_type: stg
+tcp_ports: [ "{{ buildslave_port }}" ]
+sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
+freezes: false
+
+
+############################################################
+# buildslave config
+############################################################
+
+slave_user: buildslave
 slave_home: /home/buildslave/
 slave_dir: /home/buildslave/slave
 slave_user: buildslave
 buildmaster: 10.5.124.232
 buildslave_port: 9989
-tcp_ports: [ "{{ buildslave_port }}" ]
+taskotron_admin_email: taskotron-admin-members@fedoraproject.org
+
+
+############################################################
+# taskotron config
+############################################################
+
+taskotron_fas_user: taskotron
+# stuff is kinda not working for stg bodhi right now. workaround by having empty fas password
+#taskotron_fas_password: {{ stg_taskotron_fas_password }}
+taskotron_fas_password: ''
+
+execdb_external_url: https://taskotron.stg.fedoraproject.org/execdb/
+resultsdb_server: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v1.0/
+# this should be proxy01.stg through /etc/hosts
+bodhi_server: http://bodhi.stg.fedoraproject.org/
+kojihub_url: http://koji.fedoraproject.org/kojihub
+taskotron_master: https://taskotron.stg.fedoraproject.org/taskmaster/
+resultsdb_external_url: https://taskotron.stg.fedoraproject.org/resultsdb
+artifacts_base_url: http://taskotron.stg.fedoraproject.org/artifacts
+
+
+############################################################
+# task git mirror config
+############################################################
+
 buildslave_private_sshkey_file: stg-buildslave-sshkey/stg_buildslave
 buildslave_public_sshkey_file: stg-buildslave-sshkey/stg_buildslave.pub
-taskotron_admin_email: taskotron-admin-members@fedoraproject.org
-sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 buildmaster_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuQEcpLRlXo1deywQsJVoLiPbdlUplQ3f+6WBIoWh5FjGu3t79fLyJqNX9ebuMw8HRG/5os/6COqxxin/rFRKYWT260lqxoj77wTWn9ZRNrYu42ualfgyYdE2zII8h7Of26x64AmYT5ZJpGoudic9II3nrm39osoQ7UzfCz4KzYxvi2YCCVStk3vq7k7yxt+k3W6DOu2RpQryOsimCtv2hacD2kYrH+nCtRovUmlAD3RlEAKTCfudmalsfKwaZRcgtNDJGMjgrTB7Y5XNe3GjbkYT+2M/MvIkZDXUNZ2WYGjPsXzknqe6sL9JAO/DGGCAxvKiMk6kxfHc1ERdWVOal'
-freezes: false