diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev
index 4877b21d85..4a787ae4b2 100644
--- a/inventory/group_vars/taskotron-dev
+++ b/inventory/group_vars/taskotron-dev
@@ -11,9 +11,8 @@ external_hostname: taskotron-dev.fedoraproject.org
 deployment_type: dev
 robots_path: /var/www/html
 
-# this enables extra repos during dnf install but that's broken right now, remember to re-enable
-# extra_enablerepos: 'infrastructure-testing'
-extra_enablerepos: ''
+# this enables extra repos during dnf operations
+extra_enablerepos: 'infrastructure-testing'
 
 
 ############################################################
diff --git a/inventory/group_vars/taskotron-prod b/inventory/group_vars/taskotron-prod
index 2a94e23d65..cf240bb8b7 100644
--- a/inventory/group_vars/taskotron-prod
+++ b/inventory/group_vars/taskotron-prod
@@ -1,32 +1,60 @@
 ---
+############################################################
+# general information
+############################################################
+
+deployment_type: prod
+external_hostname: taskotron.fedoraproject.org
+robots_path: /var/www/html
+tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
+
+# this enables extra repos during dnf operations
+extra_enablerepos: ''
+
+############################################################
+# task repo details
+############################################################
+
 grokmirror_basedir: /var/lib/git/mirror
-grokmirror_user: grokmirror
 grokmirror_repos:
   - { name: fedoraqa/rpmlint, url: 'https://bitbucket.org/fedoraqa/task-rpmlint.git'}
   - { name: fedoraqa/depcheck, url: 'https://bitbucket.org/fedoraqa/task-depcheck.git'}
   - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'}
-settings_dir: /etc/taskotron
-buildmaster_db_host: db-qa01.qa.fedoraproject.org
-buildmaster_db_name: buildmaster
-buildmaster_template: taskotron.master.cfg.j2
-buildmaster_endpoint: taskmaster
-buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3Fhg7qUJ1+3N2YficTWQGEPm5JYmqDE7JbnpTTjQixd51r36YJ93sMQV63UOPkVaqPHkzIETUuvWLa/fnDhyYEnLT8mSgCqGViyd93MHYFD+nIzL1OIewKPiVbBdmlDOABD+ROSkC/wAfqJMgleqdDonWC8R0Qo+Y2r4sLMF7dxdPdRe3+WIcvC5YqDUZN/2gfsZ2tnAakZ1sGcX0yPvnpF9FmtRfkNp60OK7NXMLGV7Tayhkib05rGHl0q5dK4/vxKKk/aNgIK7gE3XFF7f+S2PDjvH3q/yby2Z3Wkp61JpVl+RTGz/XKpejUSDkJyQkbIC5+QQFeei58RLDJhzLQ== tflink@lockbox01.phx2.fedoraproject.org'
-buildslave_port: 9989
-cgit_root_title: "Taskotron Git Mirror"
-buildmaster_dir: /home/buildmaster/master
-buildslave_dir: /home/buildslave/slave
-buildmaster_home: /home/buildmaster
-buildmaster_user: buildmaster
-external_hostname: taskotron.fedoraproject.org
-resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v1.0
-resultsdb_frontend_url: http://resultsdb01.qa.fedoraproject.org/resultsdb
-resultsdb_external_url: https://taskotron.fedoraproject.org/resultsdb/
-resultsdb_fe_endpoint: resultsdb
-landingpage_title: "Taskotron"
-deployment_type: prod
-tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
-taskotron_docs_url: https://docs.qadevel.cloud.fedoraproject.org/libtaskotron/latest/
-public_artifacts_dir: /srv/taskotron/artifacts
+grokmirror_user: grokmirror
+
+############################################################
+# urls and endpoints
+############################################################
+
 execdb_server: http://resultsdb01.qa.fedoraproject.org/execdb
 execdb_statuspush: http://resultsdb01.qa.fedoraproject.org/execdb/buildbottest
-robots_path: /var/www/html
+resultsdb_external_url: https://taskotron.fedoraproject.org/resultsdb/
+resultsdb_fe_endpoint: resultsdb
+resultsdb_frontend_url: http://resultsdb01.qa.fedoraproject.org/resultsdb
+resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v1.0
+taskotron_docs_url: https://docs.qadevel.cloud.fedoraproject.org/libtaskotron/latest/
+
+############################################################
+# taskotron details
+############################################################
+
+public_artifacts_dir: /srv/taskotron/artifacts
+cgit_root_title: "Taskotron Git Mirror"
+landingpage_title: "Taskotron"
+settings_dir: /etc/taskotron
+
+############################################################
+# buildbot details
+############################################################
+
+buildmaster_db_host: db-qa01.qa.fedoraproject.org
+buildmaster_db_name: buildmaster
+buildmaster_dir: /home/buildmaster/master
+buildmaster_endpoint: taskmaster
+buildmaster_home: /home/buildmaster
+buildmaster_user: buildmaster
+buildmaster_template: taskotron.master.cfg.j2
+
+buildslave_dir: /home/buildslave/slave
+buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3Fhg7qUJ1+3N2YficTWQGEPm5JYmqDE7JbnpTTjQixd51r36YJ93sMQV63UOPkVaqPHkzIETUuvWLa/fnDhyYEnLT8mSgCqGViyd93MHYFD+nIzL1OIewKPiVbBdmlDOABD+ROSkC/wAfqJMgleqdDonWC8R0Qo+Y2r4sLMF7dxdPdRe3+WIcvC5YqDUZN/2gfsZ2tnAakZ1sGcX0yPvnpF9FmtRfkNp60OK7NXMLGV7Tayhkib05rGHl0q5dK4/vxKKk/aNgIK7gE3XFF7f+S2PDjvH3q/yby2Z3Wkp61JpVl+RTGz/XKpejUSDkJyQkbIC5+QQFeei58RLDJhzLQ== tflink@lockbox01.phx2.fedoraproject.org'
+buildslave_port: 9989
diff --git a/inventory/group_vars/taskotron-stg b/inventory/group_vars/taskotron-stg
index 9d2f6742f3..9b29b333a8 100644
--- a/inventory/group_vars/taskotron-stg
+++ b/inventory/group_vars/taskotron-stg
@@ -1,7 +1,6 @@
 ---
 ############################################################
 # general information
-#
 ###########################################################
 
 tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
@@ -12,8 +11,7 @@ deployment_type: stg
 robots_path: /var/www/html
 
 # this enables extra repos during dnf install but that's broken right now, remember to re-enable
-# extra_enablerepos: 'infrastructure-testing'
-extra_enablerepos: ''
+extra_enablerepos: 'infrastructure-testing'
 
 
 ############################################################