diff --git a/roles/download/tasks/check_pull_required.yml b/roles/download/tasks/check_pull_required.yml
index d367dd279..5d7cc5cae 100644
--- a/roles/download/tasks/check_pull_required.yml
+++ b/roles/download/tasks/check_pull_required.yml
@@ -10,7 +10,7 @@
 
 - name: Check_pull_required | Set pull_required if the desired image is not yet loaded
   set_fact:
-    pull_required: "{{ (image_reponame | regex_replace('^docker\\.io/(library/)?', '')) not in docker_images.stdout.split(',') }}"
+    pull_required: "{{ (download.image_name | regex_replace('^docker\\.io/(library/)?', '')) not in docker_images.stdout.split(',') }}"
   when: not download_always_pull
 
 - name: Check_pull_required | Check that the local digest sha256 corresponds to the given image tag
diff --git a/roles/download/tasks/download_container.yml b/roles/download/tasks/download_container.yml
index c27043c79..9f9fe4df9 100644
--- a/roles/download/tasks/download_container.yml
+++ b/roles/download/tasks/download_container.yml
@@ -21,7 +21,7 @@
         - not download_always_pull
 
     - debug:  # noqa name[missing]
-        msg: "Pull {{ image_reponame }} required is: {{ pull_required }}"
+        msg: "Pull {{ download.image_name }} required is: {{ pull_required }}"
 
     - name: Download_container | Determine if image is in cache
       stat:
@@ -49,13 +49,13 @@
     - name: Stop if image not in cache on ansible host when download_force_cache=true
       assert:
         that: image_is_cached
-        msg: "Image cache file {{ image_path_cached }} not found for {{ image_reponame }} on localhost"
+        msg: "Image cache file {{ image_path_cached }} not found for {{ download.image_name }} on localhost"
       when:
         - download_force_cache
         - not download_run_once
 
     - name: Download_container | Download image if required
-      command: "{{ image_pull_command_on_localhost if download_localhost else image_pull_command }} {{ image_reponame }}"
+      command: "{{ image_pull_command_on_localhost if download_localhost else image_pull_command }} {{ download.image_name }}"
       delegate_to: "{{ download_delegate if download_run_once else inventory_hostname }}"
       delegate_facts: true
       run_once: "{{ download_run_once }}"
diff --git a/roles/download/tasks/prep_kubeadm_images.yml b/roles/download/tasks/prep_kubeadm_images.yml
index 5c706d8f3..56327f949 100644
--- a/roles/download/tasks/prep_kubeadm_images.yml
+++ b/roles/download/tasks/prep_kubeadm_images.yml
@@ -42,8 +42,7 @@
       value:
         enabled: true
         container: true
-        repo: "{{ item | regex_replace('^(.*):.*$', '\\1') }}"
-        tag: "{{ item | regex_replace('^.*:(.*)$', '\\1') }}"
+        image_name: "{{ item }}"
         groups:
           - k8s_cluster
   loop: "{{ kubeadm_images_list | flatten(levels=1) }}"
diff --git a/roles/download/tasks/set_container_facts.yml b/roles/download/tasks/set_container_facts.yml
index 5b93f2953..cbaf133e4 100644
--- a/roles/download/tasks/set_container_facts.yml
+++ b/roles/download/tasks/set_container_facts.yml
@@ -1,8 +1,4 @@
 ---
-- name: Set_container_facts | Display the name of the image being processed
-  debug:
-    msg: "{{ download.repo }}"
-
 - name: Set_container_facts | Set if containers should be pulled by digest
   set_fact:
     pull_by_digest: "{{ download.sha256 is defined and download.sha256 }}"
@@ -14,7 +10,7 @@
 
 - name: Set_container_facts | Define file name of image
   set_fact:
-    image_filename: "{{ image_reponame | regex_replace('/|\0|:', '_') }}.tar"
+    image_filename: "{{ download.image_name | regex_replace('/|\0|:', '_') }}.tar"
 
 - name: Set_container_facts | Define path of image
   set_fact:
@@ -23,33 +19,33 @@
 
 - name: Set image save/load command for docker
   set_fact:
-    image_save_command: "{{ docker_bin_dir }}/docker save {{ image_reponame }} | gzip -{{ download_compress }} > {{ image_path_final }}"
+    image_save_command: "{{ docker_bin_dir }}/docker save {{ download.image_name }} | gzip -{{ download_compress }} > {{ image_path_final }}"
     image_load_command: "{{ docker_bin_dir }}/docker load < {{ image_path_final }}"
   when: container_manager == 'docker'
 
 - name: Set image save/load command for containerd
   set_fact:
-    image_save_command: "{{ bin_dir }}/nerdctl -n k8s.io image save -o {{ image_path_final }} {{ image_reponame }}"
+    image_save_command: "{{ bin_dir }}/nerdctl -n k8s.io image save -o {{ image_path_final }} {{ download.image_name }}"
     image_load_command: "{{ bin_dir }}/nerdctl -n k8s.io image load < {{ image_path_final }}"
   when: container_manager == 'containerd'
 
 - name: Set image save/load command for crio
   set_fact:
-    image_save_command: "{{ bin_dir }}/skopeo copy containers-storage:{{ image_reponame }} docker-archive:{{ image_path_final }} 2>/dev/null"
-    image_load_command: "{{ bin_dir }}/skopeo copy docker-archive:{{ image_path_final }} containers-storage:{{ image_reponame }} 2>/dev/null"
+    image_save_command: "{{ bin_dir }}/skopeo copy containers-storage:{{ download.image_name }} docker-archive:{{ image_path_final }} 2>/dev/null"
+    image_load_command: "{{ bin_dir }}/skopeo copy docker-archive:{{ image_path_final }} containers-storage:{{ download.image_name }} 2>/dev/null"
   when: container_manager == 'crio'
 
 - name: Set image save/load command for docker on localhost
   set_fact:
-    image_save_command_on_localhost: "{{ docker_bin_dir }}/docker save {{ image_reponame }} | gzip -{{ download_compress }} > {{ image_path_cached }}"
+    image_save_command_on_localhost: "{{ docker_bin_dir }}/docker save {{ download.image_name }} | gzip -{{ download_compress }} > {{ image_path_cached }}"
   when: container_manager_on_localhost == 'docker'
 
 - name: Set image save/load command for containerd on localhost
   set_fact:
-    image_save_command_on_localhost: "{{ containerd_bin_dir }}/ctr -n k8s.io image export --platform linux/{{ image_arch }} {{ image_path_cached }} {{ image_reponame }}"
+    image_save_command_on_localhost: "{{ containerd_bin_dir }}/ctr -n k8s.io image export --platform linux/{{ image_arch }} {{ image_path_cached }} {{ download.image_name }}"
   when: container_manager_on_localhost == 'containerd'
 
 - name: Set image save/load command for crio on localhost
   set_fact:
-    image_save_command_on_localhost: "{{ bin_dir }}/skopeo copy containers-storage:{{ image_reponame }} docker-archive:{{ image_path_final }} 2>/dev/null"
+    image_save_command_on_localhost: "{{ bin_dir }}/skopeo copy containers-storage:{{ download.image_name }} docker-archive:{{ image_path_final }} 2>/dev/null"
   when: container_manager_on_localhost == 'crio'