diff --git a/playbooks/openshift-apps/kerneltest.yml b/playbooks/openshift-apps/kerneltest.yml
index 1cd4bf7a52..38471ed3fc 100644
--- a/playbooks/openshift-apps/kerneltest.yml
+++ b/playbooks/openshift-apps/kerneltest.yml
@@ -8,6 +8,7 @@
   - /srv/web/infra/ansible/vars/global.yml
   - /srv/private/ansible/vars.yml
   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+  - /srv/web/infra/ansible/vars/apps/kerneltest.yml
 
   tasks:
   - name: Kerneltest DB user
@@ -30,6 +31,7 @@
     - /srv/web/infra/ansible/vars/global.yml
     - "/srv/private/ansible/vars.yml"
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+    - /srv/web/infra/ansible/vars/apps/kerneltest.yml
 
   pre_tasks:
   - name: Include Global Variables
diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml
index ed52cacda3..cbb34d6fce 100644
--- a/playbooks/openshift-apps/release-monitoring.yml
+++ b/playbooks/openshift-apps/release-monitoring.yml
@@ -9,6 +9,7 @@
     - /srv/web/infra/ansible/vars/global.yml
     - "/srv/private/ansible/vars.yml"
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+    - /srv/web/infra/ansible/vars/apps/release-monitoring.yml
 
   roles:
   - role: rabbit/user
diff --git a/roles/openshift-apps/kerneltest/templates/alembic.ini b/roles/openshift-apps/kerneltest/templates/alembic.ini
index 3d22684b9c..073e9a3fb1 100644
--- a/roles/openshift-apps/kerneltest/templates/alembic.ini
+++ b/roles/openshift-apps/kerneltest/templates/alembic.ini
@@ -12,7 +12,7 @@ script_location = /opt/app-root/src/kerneltest/alembic
 # revision_environment = false
 
 {% if env == 'staging' %}
-sqlalchemy.url = postgresql://{{ kerneltest_stg_db_user }}:{{ kerneltest_stg_db_pass }}@{{ kerneltest_stg_db_host }}/kerneltest
+sqlalchemy.url = postgresql://{{ kerneltest_db_user }}:{{ kerneltest_stg_db_pass }}@{{ kerneltest_db_host }}/kerneltest
 {% else %}
 sqlalchemy.url = postgresql://{{ kerneltest_db_user }}:{{ kerneltest_db_pass }}@{{ kerneltest_db_host }}/kerneltest
 {% endif %}
diff --git a/roles/openshift-apps/kerneltest/templates/config.toml b/roles/openshift-apps/kerneltest/templates/config.toml
index 1769bd4c54..f8c7b1d194 100644
--- a/roles/openshift-apps/kerneltest/templates/config.toml
+++ b/roles/openshift-apps/kerneltest/templates/config.toml
@@ -1,7 +1,7 @@
 {% if env == 'staging' %}
 SECRET_KEY = "{{ kerneltest_stg_secret_key }}"
 API_KEY = "{{ kerneltest_stg_api_key }}"
-DB_URL = "postgresql://{{ kerneltest_stg_db_user }}:{{ kerneltest_stg_db_pass }}@{{ kerneltest_stg_db_host }}/kerneltest"
+DB_URL = "postgresql://{{ kerneltest_db_user }}:{{ kerneltest_stg_db_pass }}@{{ kerneltest_db_host }}/kerneltest"
 {% else %}
 SECRET_KEY = "{{ kerneltest_secret_key }}"
 API_KEY = "{{ kerneltest_api_key }}"
@@ -11,4 +11,4 @@ ADMIN_GROUP = ["sysadmin-kernel", "sysadmin-main"]
 OIDC_CLIENT_SECRETS = "/etc/kerneltest-config/client_secrets.json"
 OIDC_CALLBACK_ROUTE = '/oidc_callback'
 
-LOG_DIR = '/srv/testlogs'
\ No newline at end of file
+LOG_DIR = '/srv/testlogs'
diff --git a/roles/openshift-apps/release-monitoring/templates/alembic.ini b/roles/openshift-apps/release-monitoring/templates/alembic.ini
index d002366719..7a4ab85657 100644
--- a/roles/openshift-apps/release-monitoring/templates/alembic.ini
+++ b/roles/openshift-apps/release-monitoring/templates/alembic.ini
@@ -2,7 +2,7 @@
 script_location = anitya:db/migrations
 sourceless = false
 {% if env == 'staging' %}
-sqlalchemy.url = postgresql://{{ anitya_stg_db_admin_user }}:{{ anitya_stg_db_admin_pass }}@{{ anitya_stg_db_host }}/{{ anitya_stg_db_name }}
+sqlalchemy.url = postgresql://{{ anitya_db_admin_user }}:{{ anitya_stg_db_admin_pass }}@{{ anitya_db_host }}/{{ anitya_db_name }}
 {% else %}
 sqlalchemy.url = postgresql://{{ anitya_db_admin_user }}:{{ anitya_db_admin_pass }}@{{ anitya_db_host }}/{{ anitya_db_name }}
 {% endif %}
diff --git a/roles/openshift-apps/release-monitoring/templates/anitya.toml b/roles/openshift-apps/release-monitoring/templates/anitya.toml
index 4a143735a7..4d4bbc8e30 100644
--- a/roles/openshift-apps/release-monitoring/templates/anitya.toml
+++ b/roles/openshift-apps/release-monitoring/templates/anitya.toml
@@ -14,7 +14,7 @@ preferred_url_scheme = "https"
 permanent_session_lifetime = 604800
 
 {% if env == 'staging' %}
-db_url = "postgresql://{{ anitya_stg_db_user }}:{{ anitya_stg_db_pass }}@{{ anitya_stg_db_host }}/{{ anitya_stg_db_name }}"
+db_url = "postgresql://{{ anitya_db_user }}:{{ anitya_stg_db_pass }}@{{ anitya_db_host }}/{{ anitya_db_name }}"
 {% else %}
 db_url = "postgresql://{{ anitya_db_user }}:{{ anitya_db_pass }}@{{ anitya_db_host }}/{{ anitya_db_name }}"
 {% endif %}
diff --git a/roles/openshift-apps/resultsdb/templates/backend/imagestream.yml.j2 b/roles/openshift-apps/resultsdb/templates/backend/imagestream.yml.j2
index 4c4fe877ca..6ad34c4bff 100644
--- a/roles/openshift-apps/resultsdb/templates/backend/imagestream.yml.j2
+++ b/roles/openshift-apps/resultsdb/templates/backend/imagestream.yml.j2
@@ -11,7 +11,7 @@ spec:
     from:
       kind: DockerImage
 {% if env == 'staging' %}
-      name: "{{ stg_resultsdb_image }}"
+      name: "{{ resultsdb_image }}"
 {% else %}
-      name: "{{ prod_resultsdb_image }}"
+      name: "{{ resultsdb_image }}"
 {% endif %}
diff --git a/roles/openshift-apps/resultsdb/templates/backend/secrets.yml.j2 b/roles/openshift-apps/resultsdb/templates/backend/secrets.yml.j2
index da0d5a05f9..d9befd19d8 100644
--- a/roles/openshift-apps/resultsdb/templates/backend/secrets.yml.j2
+++ b/roles/openshift-apps/resultsdb/templates/backend/secrets.yml.j2
@@ -13,9 +13,9 @@ stringData:
     SECRET_KEY = '{{ prod_resultsdb_secret_key }}'
 {% endif %}
 {% if env == 'staging' %}
-    SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ stg_resultsdb_db_user }}:{{ stg_resultsdb_db_password }}@{{ stg_resultsdb_db_host }}:{{ stg_resultsdb_db_port }}/{{ stg_resultsdb_db_name }}'
+    SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ resultsdb_db_user }}:{{ stg_resultsdb_db_password }}@{{ resultsdb_db_host }}:{{ resultsdb_db_port }}/{{ resultsdb_db_name }}'
 {% else %}
-    SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ prod_resultsdb_db_user }}:{{ prod_resultsdb_db_password }}@{{ prod_resultsdb_db_host }}:{{ prod_resultsdb_db_port }}/{{ prod_resultsdb_db_name }}'
+    SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ resultsdb_db_user }}:{{ prod_resultsdb_db_password }}@{{ resultsdb_db_host }}:{{ resultsdb_db_port }}/{{ resultsdb_db_name }}'
 {% endif %}
     LOGGING = {
         'version': 1,
diff --git a/vars/apps/kerneltest.yml b/vars/apps/kerneltest.yml
new file mode 100644
index 0000000000..e7be5b892f
--- /dev/null
+++ b/vars/apps/kerneltest.yml
@@ -0,0 +1,3 @@
+kerneltest_db_host: "db01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
+kerneltest_db_user: "kerneltestuser"
+kerneltest_db_name: "kerneltest"
diff --git a/vars/apps/release-monitoring.yml b/vars/apps/release-monitoring.yml
new file mode 100644
index 0000000000..fa80e007e3
--- /dev/null
+++ b/vars/apps/release-monitoring.yml
@@ -0,0 +1,5 @@
+---
+anitya_db_host: "db01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
+anitya_db_name: anitya
+anitya_db_user: anitya
+anitya_db_admin_user: anitya_admin
diff --git a/vars/apps/resultsdb.yml b/vars/apps/resultsdb.yml
new file mode 100644
index 0000000000..fc63e36712
--- /dev/null
+++ b/vars/apps/resultsdb.yml
@@ -0,0 +1,6 @@
+---
+resultsdb_db_user: "{{ (env == 'production')|ternary('prodresultsdbuser', 'stgresultsdb') }}"
+resultsdb_db_host: db01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org
+resultsdb_db_port: 5432
+resultsdb_db_name: resultsdb
+resultsdb_image:   "quay.io/fedora/resultsdb:latest"