diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml
index f9cdb6460c..942f37c4d3 100644
--- a/playbooks/openshift-apps/resultsdb.yml
+++ b/playbooks/openshift-apps/resultsdb.yml
@@ -8,22 +8,23 @@
     - /srv/web/infra/ansible/vars/global.yml
     - /srv/private/ansible/vars.yml
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+    - /srv/web/infra/ansible/roles/openshift-apps/resultsdb/vars/main.yml
 
   tasks:
     - name: Resultsdb DB user - prod
       community.postgresql.postgresql_user:
-        name: "resultsdb"
+        name: "{{ resultsdb_db_user }}"
         password: "{{ prod_resultsdb_db_password }}"
       when: env != 'staging'
     - name: Resultsdb DB user - staging
       community.postgresql.postgresql_user:
-        name: "resultsdb"
+        name: "{{ resultsdb_db_user }}"
         password: "{{ stg_resultsdb_db_password }}"
       when: env == 'staging'
     - name: Resultsdb database creation
       community.postgresql.postgresql_db:
-        name: "resultsdb"
-        owner: "resultsdb"
+        name: "{{ resultsdb_db_name }}"
+        owner: "{{ resultsdb_db_user }}"
         encoding: UTF-8
 
 
diff --git a/roles/openshift-apps/resultsdb/templates/frontend/configmaps.yml.j2 b/roles/openshift-apps/resultsdb/templates/frontend/configmaps.yml.j2
index 2bc93923a4..eb469c96c5 100644
--- a/roles/openshift-apps/resultsdb/templates/frontend/configmaps.yml.j2
+++ b/roles/openshift-apps/resultsdb/templates/frontend/configmaps.yml.j2
@@ -9,11 +9,7 @@ metadata:
 data:
   settings.py: |-
     import os
-{% if env == 'staging' %}
-    RDB_URL = '{{ stg_resultsdb_frontend_api_url }}'
-{% else %}
-    RDB_URL = '{{ prod_resultsdb_frontend_api_url }}'
-{% endif %}
+    RDB_URL = '{{ resultsdb_frontend_api_url }}'
     SECRET_KEY = os.environ['RESULTSDB_FRONTEND_SECRET_KEY']
 
     FILE_LOGGING = False
diff --git a/roles/openshift-apps/resultsdb/templates/frontend/deploymentconfigs.yml.j2 b/roles/openshift-apps/resultsdb/templates/frontend/deploymentconfigs.yml.j2
index d278c1436f..b796855ada 100644
--- a/roles/openshift-apps/resultsdb/templates/frontend/deploymentconfigs.yml.j2
+++ b/roles/openshift-apps/resultsdb/templates/frontend/deploymentconfigs.yml.j2
@@ -21,11 +21,7 @@ spec:
     spec:
       containers:
         - name: webapp
-{% if env == 'staging' %}
-          image: "{{ stg_resultsdb_frontend_image }}"
-{% else %}
-          image: "{{ prod_resultsdb_frontend_image }}"
-{% endif %}
+          image: "{{ resultsdb_frontend_image }}"
           imagePullPolicy: Always
           ports:
             - containerPort: 5002
diff --git a/roles/openshift-apps/resultsdb/templates/frontend/secrets.yml.j2 b/roles/openshift-apps/resultsdb/templates/frontend/secrets.yml.j2
index 326461ea18..34c0b87e63 100644
--- a/roles/openshift-apps/resultsdb/templates/frontend/secrets.yml.j2
+++ b/roles/openshift-apps/resultsdb/templates/frontend/secrets.yml.j2
@@ -9,11 +9,7 @@ metadata:
     service: web
 stringData:
   settings.py: |-
-{% if env == 'staging' %}
-    RDB_URL = '{{ stg_resultsdb_frontend_api_url }}'
-{% else %}
-    RDB_URL = '{{ prod_resultsdb_frontend_api_url }}'
-{% endif %}
+    RDB_URL = '{{ resultsdb_frontend_api_url }}'
 {% if env == 'staging' %}
     SECRET_KEY = '{{ stg_resultsdb_frontend_secret_key }}'
 {% else %}
diff --git a/roles/openshift-apps/resultsdb/vars/main.yml b/roles/openshift-apps/resultsdb/vars/main.yml
index 02fe9556f4..f86e832c08 100644
--- a/roles/openshift-apps/resultsdb/vars/main.yml
+++ b/roles/openshift-apps/resultsdb/vars/main.yml
@@ -1,7 +1,6 @@
 # backend vars
 ---
-prod_resultsdb_image: quay.io/factory2/resultsdb:prod-fedora
-stg_resultsdb_image: quay.io/factory2/resultsdb:latest
+resultsdb_image:   "quay.io/fedora/resultsdb:{{ (env == 'production')|ternary('prod-fedora', 'latest') }}"
 
 resultsdb_publish: true
 resultsdb_mod_wsgi_dir: '${MOD_WSGI_MODULES_DIRECTORY}'
@@ -11,7 +10,11 @@ resultsdb_mod_wsgi_dir: '${MOD_WSGI_MODULES_DIRECTORY}'
 resultsdb_additional_result_outcomes: ['CRASHED', 'QUEUED', 'RUNNING']
 
 # frontend vars
-stg_resultsdb_frontend_image: 'quay.io/factory2/resultsdb_frontend:latest'
-prod_resultsdb_frontend_image: 'quay.io/factory2/resultsdb_frontend:prod-fedora'
-prod_resultsdb_frontend_api_url: 'http://resultsdb-api.resultsdb.svc.cluster.local:5001/api/v2.0'
-stg_resultsdb_frontend_api_url: 'http://resultsdb-api.resultsdb.svc.cluster.local:5001/api/v2.0'
+resultsdb_frontend_image:   "quay.io/fedora/resultsdb_frontend:{{ (env == 'production')|ternary('prod-fedora', 'latest') }}"
+resultsdb_frontend_api_url: 'http://resultsdb-api.resultsdb.svc.cluster.local:5001/api/v2.0'
+
+# Database
+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
diff --git a/vars/apps/resultsdb.yml b/vars/apps/resultsdb.yml
deleted file mode 100644
index fc63e36712..0000000000
--- a/vars/apps/resultsdb.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-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"