diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev
index 83958240c4..c6d0c0463b 100644
--- a/inventory/group_vars/taskotron-dev
+++ b/inventory/group_vars/taskotron-dev
@@ -40,4 +40,3 @@ fakefedorainfra_url: https://taskotron-dev.fedoraproject.org/fakefedorainfra
 taskotron_docs_url: https://docs.qadevel.cloud.fedoraproject.org/libtaskotron/latest/
 freezes: false
 public_artifacts_dir: /srv/taskotron/artifacts
-execdb_server: http://resultsdb-dev01.qa.fedoraproject.org/execdb
diff --git a/inventory/group_vars/taskotron-dev-clients b/inventory/group_vars/taskotron-dev-clients
index f40a460cc4..ad4b105c47 100644
--- a/inventory/group_vars/taskotron-dev-clients
+++ b/inventory/group_vars/taskotron-dev-clients
@@ -5,7 +5,7 @@ num_cpus: 2
 
 slave_user: buildslave
 taskotron_fas_user: taskotron
-execdb_server: http://resultsdb-dev01.qa.fedoraproject.org/execdb
+execdb_external_url: http://taskotron-dev.fedoraproject.org/execdb/
 resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0/
 bodhi_server: http://10.5.124.181/fakefedorainfra/bodhi/
 kojihub_url: http://koji.fedoraproject.org/kojihub
diff --git a/inventory/group_vars/taskotron-prod-clients b/inventory/group_vars/taskotron-prod-clients
index bce0e5e8aa..201d467e7e 100644
--- a/inventory/group_vars/taskotron-prod-clients
+++ b/inventory/group_vars/taskotron-prod-clients
@@ -5,7 +5,7 @@ num_cpus: 2
 
 slave_user: buildslave
 taskotron_fas_user: taskotron
-execdb_server: http://resultsdb01.qa.fedoraproject.org/execdb
+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
diff --git a/inventory/group_vars/taskotron-stg-clients b/inventory/group_vars/taskotron-stg-clients
index 116e6b77fb..8c5c08e5c4 100644
--- a/inventory/group_vars/taskotron-stg-clients
+++ b/inventory/group_vars/taskotron-stg-clients
@@ -5,7 +5,7 @@ num_cpus: 2
 
 slave_user: buildslave
 taskotron_fas_user: taskotron
-execdb_server: http://resultsdb-stg01.qa.fedoraproject.org/execdb
+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
diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
index c5e9bd108f..63165e262d 100644
--- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
+++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
@@ -55,10 +55,8 @@ bodhi_server: {{ bodhi_server }}
 ## URL of ResultsDB server API interface, which can store all test results
 resultsdb_server: {{ resultsdb_server }}
 
-{% if deployment_type in ['dev', 'stg'] %}
 ## URL of ExecDB server API interface, which tracks task execution status
-execdb_server: {{ execdb_server }}
-{% endif %}
+execdb_server: {{ execdb_external_url }}
 
 ## URL of taskotron buildmaster
 taskotron_master: {{ taskotron_master }}