diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 1f3c04ee6c..705389308e 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -502,9 +502,9 @@
     website: koschei.fedoraproject.org
     destname: koschei
     balancer_name: app-os
-    balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}"
+    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
     targettype: openshift
-    ocp4: false
+    ocp4: true
     keephost: true
     tags: koschei
 
diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml
index 8513ed08c4..bb0f0986c1 100644
--- a/playbooks/openshift-apps/koschei.yml
+++ b/playbooks/openshift-apps/koschei.yml
@@ -1,5 +1,5 @@
 - name: provision koschei
-  hosts: os_masters[0]:os_masters_stg[0]
+  hosts: os_control[0]:os_control_stg[0]
   user: root
   gather_facts: False
 
diff --git a/roles/openshift-apps/koschei/templates/admin-deployment.yml b/roles/openshift-apps/koschei/templates/admin-deployment.yml
index 359b4b63af..a18c405c5b 100644
--- a/roles/openshift-apps/koschei/templates/admin-deployment.yml
+++ b/roles/openshift-apps/koschei/templates/admin-deployment.yml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: admin
-        image: docker-registry.default.svc:5000/koschei/koschei:latest
+        image: image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest
         command: ["/usr/bin/sleep", "infinity"]
         env:
           - name: SUDO_USER
diff --git a/roles/openshift-apps/koschei/templates/backend-deployment.yml b/roles/openshift-apps/koschei/templates/backend-deployment.yml
index 7c20a7c785..ea9a5a3da4 100644
--- a/roles/openshift-apps/koschei/templates/backend-deployment.yml
+++ b/roles/openshift-apps/koschei/templates/backend-deployment.yml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: {{service}}
-        image: docker-registry.default.svc:5000/koschei/koschei:latest
+        image: image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest
         command: [/usr/bin/koschei-{{service}}]
         env:
           - name: SUDO_USER
diff --git a/roles/openshift-apps/koschei/templates/cronjob.yml b/roles/openshift-apps/koschei/templates/cronjob.yml
index e2f3fdefe9..7fbeefe0ab 100644
--- a/roles/openshift-apps/koschei/templates/cronjob.yml
+++ b/roles/openshift-apps/koschei/templates/cronjob.yml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: "cron-{{name}}"
@@ -11,7 +11,7 @@ spec:
         spec:
           containers:
           - name: "cron-{{name}}"
-            image: "docker-registry.default.svc:5000/koschei/koschei:latest"
+            image: "image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest"
             command: ["/bin/bash", "-euxc", "{{command}}"]
             env:
               - name: SUDO_USER
diff --git a/roles/openshift-apps/koschei/templates/frontend-deployment.yml b/roles/openshift-apps/koschei/templates/frontend-deployment.yml
index db021e1324..b569d0139b 100644
--- a/roles/openshift-apps/koschei/templates/frontend-deployment.yml
+++ b/roles/openshift-apps/koschei/templates/frontend-deployment.yml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: frontend
-        image: docker-registry.default.svc:5000/koschei/koschei:latest
+        image: image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest
         command: [/usr/bin/koschei-frontend]
         ports:
         - containerPort: 8080
diff --git a/roles/openshift-apps/koschei/templates/job.yml b/roles/openshift-apps/koschei/templates/job.yml
index ab003fd5db..c824bd30f6 100644
--- a/roles/openshift-apps/koschei/templates/job.yml
+++ b/roles/openshift-apps/koschei/templates/job.yml
@@ -7,7 +7,7 @@ spec:
     spec:
       containers:
       - name: "job-{{name}}"
-        image: "docker-registry.default.svc:5000/koschei/koschei:latest"
+        image: "image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest"
         command: ["/bin/bash", "-euxc", "{{command}}"]
         env:
           - name: SUDO_USER