diff --git a/inventory/group_vars/resultsdb-prod b/inventory/group_vars/resultsdb-prod
index 3b147a8a8a..49ffe029df 100644
--- a/inventory/group_vars/resultsdb-prod
+++ b/inventory/group_vars/resultsdb-prod
@@ -21,13 +21,15 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m
 
 deployment_type: prod
 
-resultsdb_db_host: db-qa01.qa.fedoraproject.org
+resultsdb_db_host_machine: db-qa01.qa.fedoraproject.org
+resultsdb_db_host: "{{ resultsdb_db_host_machine }}"
 resultsdb_db_port: 5432
 resultsdb_endpoint: 'resultsdb_api'
 resultsdb_fe_endpoint: 'resultsdb'
 resultsdb_db_name: resultsdb
 
-execdb_db_host: db-qa01.qa.fedoraproject.org
+execdb_db_host_machine: db-qa01.qa.fedoraproject.org
+execdb_db_host: "{{ execdb_db_host_machine }}"
 execdb_db_port: 5432
 execdb_endpoint: 'execdb'
 execdb_db_name: execdb
diff --git a/inventory/group_vars/resultsdb-stg b/inventory/group_vars/resultsdb-stg
index 69e141bb98..574ee6b93c 100644
--- a/inventory/group_vars/resultsdb-stg
+++ b/inventory/group_vars/resultsdb-stg
@@ -21,13 +21,15 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m
 
 deployment_type: stg
 
-resultsdb_db_host: db-qa01.qa.fedoraproject.org
+resultsdb_db_host_machine: db-qa01.qa.fedoraproject.org
+resultsdb_db_host: "{{ resultsdb_db_host_machine }}"
 resultsdb_db_port: 5432
 resultsdb_endpoint: 'resultsdb_api'
 resultsdb_fe_endpoint: 'resultsdb'
 resultsdb_db_name: resultsdb_stg
 
-execdb_db_host: db-qa01.qa.fedoraproject.org
+execdb_db_host_machine: db-qa01.qa.fedoraproject.org
+execdb_db_host: "{{ execdb_db_host_machine }}"
 execdb_db_port: 5432
 execdb_endpoint: 'execdb'
 execdb_db_name: execdb_stg
diff --git a/inventory/host_vars/testdays.fedorainfracloud.org b/inventory/host_vars/testdays.fedorainfracloud.org
index cff58749f5..ecd9998e6e 100644
--- a/inventory/host_vars/testdays.fedorainfracloud.org
+++ b/inventory/host_vars/testdays.fedorainfracloud.org
@@ -42,7 +42,8 @@ deployment_type: 'local'
 # resultsdb
 ############################################################
 
-resultsdb_db_host: "{{ public_ip }}"
+resultsdb_db_host_machine: "{{ public_ip }}"
+resultsdb_db_host: 127.0.0.1
 resultsdb_db_port: 5432
 resultsdb_endpoint: 'resultsdb_api'
 resultsdb_fe_endpoint: 'resultsdb'