diff --git a/roles/container-engine/cri-o/meta/main.yml b/roles/container-engine/cri-o/meta/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ec9d9a55e9b6f41d4d685bbdd5c235da791459ff
--- /dev/null
+++ b/roles/container-engine/cri-o/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: container-engine/crictl
diff --git a/roles/container-engine/crictl/tasks/crictl.yml b/roles/container-engine/crictl/tasks/crictl.yml
index 134c054b2483e727fc78e7f02eac4402aecb4c9f..36e09e4a8a3f56b59c4c85a153dd2336d6653adb 100644
--- a/roles/container-engine/crictl/tasks/crictl.yml
+++ b/roles/container-engine/crictl/tasks/crictl.yml
@@ -20,7 +20,3 @@
   notify:
     - Get crictl completion
     - Install crictl completion
-
-- name: Set fact crictl_installed
-  set_fact:
-    crictl_installed: true
diff --git a/roles/container-engine/crictl/tasks/main.yml b/roles/container-engine/crictl/tasks/main.yml
index 30f1004c285d9f9c4c559421bf44b522e7fa74ad..99ed216cdb49b7fb69db6d530920ada6c43b2877 100644
--- a/roles/container-engine/crictl/tasks/main.yml
+++ b/roles/container-engine/crictl/tasks/main.yml
@@ -1,4 +1,3 @@
 ---
 - name: install crictĺ
   include_tasks: crictl.yml
-  when: not crictl_installed | default(false)
diff --git a/roles/download/tasks/download_file.yml b/roles/download/tasks/download_file.yml
index 2e054eff5f768054ae39b90b51514e83de26167f..b6d3ad1b6bf79d013d9d89e73f55269f17aa1bdb 100644
--- a/roles/download/tasks/download_file.yml
+++ b/roles/download/tasks/download_file.yml
@@ -1,5 +1,9 @@
 ---
 - block:
+  - name: prep_download | Set a few facts
+    set_fact:
+      download_force_cache: "{{ true if download_run_once else download_force_cache }}"
+
   - name: download_file | Starting download of file
     debug:
       msg: "{{ download.url }}"
@@ -31,7 +35,6 @@
     become: false
     when:
     - download_force_cache
-    - download_localhost
     tags:
     - localhost
 
diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml
index 94e9d03aabe1a4b911828324012dde9cfa855136..536c293a7c22a7c3a65448c5403f25f7d9074687 100644
--- a/roles/download/tasks/main.yml
+++ b/roles/download/tasks/main.yml
@@ -7,20 +7,6 @@
     - download
     - upload
 
-- name: install crictl
-  import_role:
-    name: container-engine/crictl
-  when:
-    - not skip_downloads|default(false)
-    - container_manager in ['containerd', 'crio']
-
-- name: install nerdctl
-  import_role:
-    name: container-engine/nerdctl
-  when:
-    - not skip_downloads|default(false)
-    - container_manager in ['containerd']
-
 - name: download | Get kubeadm binary and list of required images
   include_tasks: prep_kubeadm_images.yml
   when: