diff --git a/roles/openshift-apps/koschei/vars/production.yml b/roles/openshift-apps/koschei/vars/production.yml
index cbf3f4b5fd..675de6fc07 100644
--- a/roles/openshift-apps/koschei/vars/production.yml
+++ b/roles/openshift-apps/koschei/vars/production.yml
@@ -27,18 +27,16 @@ koschei_oidc_crypto_secret: "{{ koschei_oidc_crypto_secret_prod }}"
 
 koschei_topic_prefix: org.fedoraproject.prod
 
-koschei_frontend_replicas: 1
+koschei_frontend_replicas: 3
 
-koschei_backend_services: []
-prev_koschei_backend_services:
+koschei_backend_services:
   - { name: polling,        cpu: [ 1000, 1500 ],  memory: [  512, 1024 ] } # yamllint disable-line rule:commas rule:brackets
   - { name: scheduler,      cpu: [  200,  500 ],  memory: [  128,  256 ] } # yamllint disable-line rule:commas rule:brackets
   - { name: build-resolver, cpu: [ 1000, 2000 ],  memory: [ 1536, 4096 ] } # yamllint disable-line rule:commas rule:brackets
   - { name: repo-resolver,  cpu: [ 2000, 8000 ],  memory: [ 2048, 4096 ] } # yamllint disable-line rule:commas rule:brackets
   - { name: watcher,        cpu: [  200, 1000 ],  memory: [  128,  512 ] } # yamllint disable-line rule:commas rule:brackets
 
-koschei_cron_jobs: []
-prev_koschei_cron_jobs:
+koschei_cron_jobs:
   - name: db-cleanup
     schedule: "0 3 * * *"
     command: "koschei-admin cleanup --older-than 6"
diff --git a/roles/openshift-apps/koschei/vars/staging.yml b/roles/openshift-apps/koschei/vars/staging.yml
index fc2499dd66..c45018253b 100644
--- a/roles/openshift-apps/koschei/vars/staging.yml
+++ b/roles/openshift-apps/koschei/vars/staging.yml
@@ -27,10 +27,9 @@ koschei_oidc_crypto_secret: "{{ koschei_oidc_crypto_secret_stg }}"
 
 koschei_topic_prefix: org.fedoraproject.stg
 
-koschei_frontend_replicas: 1
+koschei_frontend_replicas: 2
 
-koschei_backend_services: []
-prev_koschei_backend_services:
+koschei_backend_services:
   - { name: polling,        cpu: [ 1000, 1500 ],  memory: [  512, 1024 ] } # yamllint disable-line rule:commas rule:brackets
   - { name: scheduler,      cpu: [  200,  500 ],  memory: [  128,  256 ] } # yamllint disable-line rule:commas rule:brackets
   - { name: build-resolver, cpu: [ 1000, 2000 ],  memory: [ 1536, 4096 ] } # yamllint disable-line rule:commas rule:brackets
@@ -39,8 +38,7 @@ prev_koschei_backend_services:
   - { name: copr-resolver,  cpu: [ 2000, 8000 ],  memory: [ 1024, 4096 ] } # yamllint disable-line rule:commas rule:brackets
   - { name: copr-scheduler, cpu: [ 1000, 2000 ],  memory: [ 1024, 2048 ] } # yamllint disable-line rule:commas rule:brackets
 
-koschei_cron_jobs: []
-prev_koschei_cron_jobs:
+koschei_cron_jobs:
   - name: db-cleanup
     schedule: "0 3 * * *"
     command: "koschei-admin cleanup --older-than 2"