diff --git a/playbooks/manual/staging-sync/koschei.yml b/playbooks/manual/staging-sync/koschei.yml
index a32f3db748..7a1058ed88 100644
--- a/playbooks/manual/staging-sync/koschei.yml
+++ b/playbooks/manual/staging-sync/koschei.yml
@@ -19,14 +19,17 @@
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
   tasks:
-  - name: Stop backend services
-    shell: oc -n koschei scale dc/{{item.name}} --replicas=0
-    with_items: "{{ koschei_backend_services }}"
-    loop_control:
-      label: "{{ item.name }}"
+  - name: Delete all jobs
+    shell: oc -n koschei delete job --all
 
-  - name: Stop frontend
-    shell: oc -n koschei scale dc/frontend --replicas=0
+  - name: Pause all deployments
+    shell: oc -n koschei rollout pause deploy
+
+  - name: Delete all replica sets
+    shell: oc -n koschei delete rs --all
+
+  - name: Delete all pods
+    shell: oc -n koschei delete pod --all
 
   - name: Drop koschei database
     postgresql_db: name=koschei state=absent
@@ -46,11 +49,5 @@
       name: db-create
       command: "koschei-admin create-db && koschei-admin create-collection f41 --display-name 'Fedora Rawhide' --target f41 --bugzilla-product Fedora --bugzilla-version rawhide && koschei-admin create-group php"
 
-  - name: Start frontend
-    shell: oc -n koschei scale dc/frontend --replicas={{koschei_frontend_replicas}}
-
-  - name: Start backend services
-    shell: oc -n koschei scale dc/{{item.name}} --replicas=1
-    with_items: "{{ koschei_backend_services }}"
-    loop_control:
-      label: "{{ item.name }}"
+  - name: Resume all deployments
+    shell: oc -n koschei rollout resume deploy
diff --git a/playbooks/manual/upgrade/koschei-full.yml b/playbooks/manual/upgrade/koschei-full.yml
index 1235a52e3a..aea5ed1b9c 100644
--- a/playbooks/manual/upgrade/koschei-full.yml
+++ b/playbooks/manual/upgrade/koschei-full.yml
@@ -16,14 +16,17 @@
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
   tasks:
-  - name: Stop backend services
-    shell: oc -n koschei scale dc/{{item.name}} --replicas=0
-    with_items: "{{ koschei_backend_services }}"
-    loop_control:
-      label: "{{ item.name }}"
+  - name: Delete all jobs
+    shell: oc -n koschei delete job --all
 
-  - name: Stop frontend
-    shell: oc -n koschei scale dc/frontend --replicas=0
+  - name: Pause all deployments
+    shell: oc -n koschei rollout pause deploy
+
+  - name: Delete all replica sets
+    shell: oc -n koschei delete rs --all
+
+  - name: Delete all pods
+    shell: oc -n koschei delete pod --all
 
   - name: Import upstream image into OpenShift
     include_role: name=openshift/import-image
@@ -44,11 +47,5 @@
       name: db-vacuum
       command: "koschei-admin psql <<<'VACUUM FULL ANALYZE'"
 
-  - name: Start frontend
-    shell: oc -n koschei scale dc/frontend --replicas={{koschei_frontend_replicas}}
-
-  - name: Start backend services
-    shell: oc -n koschei scale dc/{{item.name}} --replicas=1
-    with_items: "{{ koschei_backend_services }}"
-    loop_control:
-      label: "{{ item.name }}"
+  - name: Resume all deployments
+    shell: oc -n koschei rollout resume deploy
diff --git a/playbooks/manual/upgrade/koschei-rolling.yml b/playbooks/manual/upgrade/koschei-rolling.yml
index fdc4f1f8dc..c033a998b5 100644
--- a/playbooks/manual/upgrade/koschei-rolling.yml
+++ b/playbooks/manual/upgrade/koschei-rolling.yml
@@ -14,10 +14,11 @@
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
-  # Simply import latest upstream Koschei image from Quay.io, which
-  # should automatically trigger new OpenShift deployments as needed.
   tasks:
   - name: Import upstream image into OpenShift
     include_role: name=openshift/import-image
     vars:
       imagestreamname: koschei
+
+  - name: Restart all deployments
+    shell: oc -n koschei rollout restart deploy
diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml
index 711b252465..3661681276 100644
--- a/playbooks/openshift-apps/koschei.yml
+++ b/playbooks/openshift-apps/koschei.yml
@@ -50,7 +50,7 @@
         - frontend-deployment
         - frontend-service
 
-    - name: Apply DeploymentConfig
+    - name: Apply Deployment
       include_role: name=openshift/object
       vars:
         template: backend-deployment.yml