diff --git a/playbooks/manual/mirrormanager/emergency-expire-repo.yml b/playbooks/manual/mirrormanager/emergency-expire-repo.yml
index edfbfc794c..c388f294ea 100644
--- a/playbooks/manual/mirrormanager/emergency-expire-repo.yml
+++ b/playbooks/manual/mirrormanager/emergency-expire-repo.yml
@@ -33,6 +33,6 @@
 
   roles:
     - role: openshift/job
-      app: mirrormanager
-      jobname: emergency-expire-repo-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }}
-      command: "/opt/app-root/bin/mm2_emergency-expire-repo {{ product }} {{ version }} && bash /opt/scripts/update-mirrorlist-cache.sh"
+      job_app: mirrormanager
+      job_name: emergency-expire-repo-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }}
+      job_command: "/opt/app-root/bin/mm2_emergency-expire-repo {{ product }} {{ version }} && bash /opt/scripts/update-mirrorlist-cache.sh"
diff --git a/playbooks/manual/mirrormanager/move-devel-to-release.yml b/playbooks/manual/mirrormanager/move-devel-to-release.yml
index 1a50199339..0b16adb554 100644
--- a/playbooks/manual/mirrormanager/move-devel-to-release.yml
+++ b/playbooks/manual/mirrormanager/move-devel-to-release.yml
@@ -26,11 +26,11 @@
   roles:
 
     - role: openshift/job
-      app: mirrormanager
-      jobname: move-devel-to-release-fedora-linux-{{ version|lower|replace(" ", "-") }}
-      command: "/opt/app-root/bin/mm2_move-devel-to-release --version {{ version }} --category 'Fedora Linux'"
+      job_app: mirrormanager
+      job_name: move-devel-to-release-fedora-linux-{{ version|lower|replace(" ", "-") }}
+      job_command: "/opt/app-root/bin/mm2_move-devel-to-release --version {{ version }} --category 'Fedora Linux'"
 
     - role: openshift/job
-      app: mirrormanager
-      jobname: move-devel-to-release-fedora-secondary-{{ version|lower|replace(" ", "-") }}
-      command: "/opt/app-root/bin/mm2_move-devel-to-release --version {{ version }} --category 'Fedora Secondary Arches'"
+      job_app: mirrormanager
+      job_name: move-devel-to-release-fedora-secondary-{{ version|lower|replace(" ", "-") }}
+      job_command: "/opt/app-root/bin/mm2_move-devel-to-release --version {{ version }} --category 'Fedora Secondary Arches'"
diff --git a/playbooks/manual/mirrormanager/move-to-archive.yml b/playbooks/manual/mirrormanager/move-to-archive.yml
index a8c66c77f2..404504c6a9 100644
--- a/playbooks/manual/mirrormanager/move-to-archive.yml
+++ b/playbooks/manual/mirrormanager/move-to-archive.yml
@@ -33,6 +33,6 @@
 
   roles:
     - role: openshift/job
-      app: mirrormanager
-      jobname: move-to-archive-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }}
-      command: "/opt/app-root/bin/mm2_move-to-archive --product {{ product }} --version {{ version }}"
+      job_app: mirrormanager
+      job_name: move-to-archive-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }}
+      job_command: "/opt/app-root/bin/mm2_move-to-archive --product {{ product }} --version {{ version }}"
diff --git a/roles/openshift-apps/mirrormanager/templates/job.yml b/roles/openshift-apps/mirrormanager/templates/job.yml
index 321d6631f8..cb51a7bea3 100644
--- a/roles/openshift-apps/mirrormanager/templates/job.yml
+++ b/roles/openshift-apps/mirrormanager/templates/job.yml
@@ -4,7 +4,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: "job-{{ jobname }}"
+  name: "job-{{ job_name }}"
 spec:
   parallelism: 1
   completions: 1
diff --git a/roles/openshift/job/defaults/main.yml b/roles/openshift/job/defaults/main.yml
index 0906cb3deb..ed5e3f082f 100644
--- a/roles/openshift/job/defaults/main.yml
+++ b/roles/openshift/job/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
-os_app: "{{app}}"
-template: job.yml
+os_app: "{{job_app}}"
+job_template: job.yml
diff --git a/roles/openshift/job/tasks/main.yml b/roles/openshift/job/tasks/main.yml
index 84cb523a50..9aea2167a7 100644
--- a/roles/openshift/job/tasks/main.yml
+++ b/roles/openshift/job/tasks/main.yml
@@ -1,31 +1,31 @@
 ---
-- name: Validate the job name {{ jobname }}
+- name: Validate the job name {{ job_name }}
   assert:
     that:
-    - jobname is defined
-    fail_msg: "The 'jobname' variable is not defined"
+    - job_name is defined
+    fail_msg: "The 'job_name' variable is not defined"
 
-- name: Validate the command {{ command }}
+- name: Validate the command {{ job_command }}
   assert:
     that:
-    - command is defined
-    fail_msg: "The 'command' variable is not defined"
+    - job_command is defined
+    fail_msg: "The 'job_command' variable is not defined"
 
 - name: Copy job template to a temporary file
   template:
-    src: "{{roles_path}}/openshift-apps/{{app}}/templates/{{template}}"
-    dest: "/etc/openshift_apps/{{app}}/job-{{jobname}}.yml"
+    src: "{{roles_path}}/openshift-apps/{{job_app}}/templates/{{job_template}}"
+    dest: "/etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml"
 
 - name: Delete previous job (if any)
-  shell: oc -n {{os_app}} delete --ignore-not-found=true -f /etc/openshift_apps/{{app}}/job-{{jobname}}.yml
+  shell: oc -n {{os_app}} delete --ignore-not-found=true -f /etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml
 
 - name: Start job
-  shell: oc -n {{os_app}} create -f /etc/openshift_apps/{{app}}/job-{{jobname}}.yml
+  shell: oc -n {{os_app}} create -f /etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml
 
 - debug:
-    msg: "Job started. You can watch the logs with: oc -n {{os_app}} logs -f job/job-{{jobname}}"
+    msg: "Job started. You can watch the logs with: oc -n {{os_app}} logs -f job/job-{{job_name}}"
 - debug:
-    msg: "You can cancel it with: oc -n {{os_app}} delete job/job-{{jobname}}"
+    msg: "You can cancel it with: oc -n {{os_app}} delete job/job-{{job_name}}"
 
 - name: Wait for job to complete
-  shell: oc -n {{os_app}} wait job/job-{{jobname}} --for condition=complete
+  shell: oc -n {{os_app}} wait job/job-{{job_name}} --for condition=complete