diff --git a/playbooks/manual/staging-sync/koschei.yml b/playbooks/manual/staging-sync/koschei.yml
index 9ca05fa0ca..0ea6e57a87 100644
--- a/playbooks/manual/staging-sync/koschei.yml
+++ b/playbooks/manual/staging-sync/koschei.yml
@@ -47,8 +47,9 @@
   - name: Populate koschei database with schema and initial data
     include_role: name=openshift-apps/koschei/job
     vars:
-      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"
+      job_app: "{{ app }}"
+      job_name: db-create
+      job_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: 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 d7bb2ca963..09a541d8f7 100644
--- a/playbooks/manual/upgrade/koschei-full.yml
+++ b/playbooks/manual/upgrade/koschei-full.yml
@@ -38,16 +38,18 @@
   - name: Run database migrations
     include_role: name=openshift-apps/koschei/job
     vars:
-      name: db-migrate
-      command: "koschei-admin alembic upgrade head"
+      job_app: "{{ app }}"
+      job_name: db-migrate
+      job_command: "koschei-admin alembic upgrade head"
 
   # Since everything is stopped and users are seeing downtime anyway,
   # we may as well want to vacuum the DB to improve performance.
   - name: Vacuum database
     include_role: name=openshift-apps/koschei/job
     vars:
-      name: db-vacuum
-      command: "koschei-admin psql <<<'VACUUM FULL ANALYZE'"
+      job_app: "{{ app }}"
+      job_name: db-vacuum
+      job_command: "koschei-admin psql <<<'VACUUM FULL ANALYZE'"
 
   - name: Resume all deployments
     shell: oc -n koschei rollout resume deploy
diff --git a/roles/openshift-apps/koschei/job/tasks/main.yml b/roles/openshift-apps/koschei/job/tasks/main.yml
index 66a7909500..a1716aa6c3 100644
--- a/roles/openshift-apps/koschei/job/tasks/main.yml
+++ b/roles/openshift-apps/koschei/job/tasks/main.yml
@@ -1,14 +1,14 @@
 ---
 - name: Copy job template to a temporary file
   template:
-    src: "{{roles_path}}/openshift-apps/{{app}}/templates/job.yml"
-    dest: "/etc/openshift_apps/{{app}}/job-{{name}}.yml"
+    src: "{{roles_path}}/openshift-apps/{{job_app}}/templates/job.yml"
+    dest: "/etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml"
 
 - name: Delete previous job (if any)
-  shell: oc -n koschei delete --ignore-not-found=true -f /etc/openshift_apps/{{app}}/job-{{name}}.yml
+  shell: oc -n {{ job_app }} delete --ignore-not-found=true -f /etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml
 
 - name: Start job
-  shell: oc -n koschei create -f /etc/openshift_apps/{{app}}/job-{{name}}.yml
+  shell: oc -n {{ job_app }} create -f /etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml
 
 - name: Wait for job to complete
-  shell: oc -n koschei wait job/job-{{name}} --for condition=complete
+  shell: oc -n {{ job_app }} wait job/job-{{job_name}} --for condition=complete