diff --git a/roles/download/tasks/download_container.yml b/roles/download/tasks/download_container.yml
index cdd27fd52..919be714d 100644
--- a/roles/download/tasks/download_container.yml
+++ b/roles/download/tasks/download_container.yml
@@ -118,10 +118,10 @@
         use_ssh_args: "{{ has_bastion | default(false) }}"
         mode: pull
       delegate_facts: no
-      run_once: true
       when:
         - download_force_cache
         - not download_localhost
+        - download_delegate == inventory_hostname
         - not image_is_cached or (image_changed | default(true))
         - ansible_os_family not in ["CoreOS", "Container Linux by CoreOS"]
 
diff --git a/roles/download/tasks/download_file.yml b/roles/download/tasks/download_file.yml
index e2347699d..2aca43d5e 100644
--- a/roles/download/tasks/download_file.yml
+++ b/roles/download/tasks/download_file.yml
@@ -111,7 +111,6 @@
       dest: "{{ file_path_cached }}"
       use_ssh_args: "{{ has_bastion | default(false) }}"
       mode: pull
-    run_once: true
     when:
     - download_force_cache
     - not file_is_cached or get_url_result.changed