diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml
index dbae68ea009..9fc0c9d866f 100644
--- a/roles/openshift_node/handlers/main.yml
+++ b/roles/openshift_node/handlers/main.yml
@@ -1,4 +1,9 @@
 ---
+- name: reload systemd units
+  command: systemctl daemon-reload
+  when:
+  - (not skip_node_svc_handlers | default(False) | bool)
+
 - name: restart NetworkManager
   systemd:
     name: NetworkManager
@@ -13,8 +18,3 @@
     state: restarted
   when:
   - (not skip_node_svc_handlers | default(False) | bool)
-
-- name: reload systemd units
-  command: systemctl daemon-reload
-  when:
-  - (not skip_node_svc_handlers | default(False) | bool)
diff --git a/roles/openshift_node/tasks/config.yml b/roles/openshift_node/tasks/config.yml
index 8596d59f022..8b932b775c9 100644
--- a/roles/openshift_node/tasks/config.yml
+++ b/roles/openshift_node/tasks/config.yml
@@ -26,15 +26,3 @@
 - name: include aws provider credentials
   import_tasks: aws.yml
   when: not (openshift_node_use_instance_profiles | default(False))
-
-- name: Check status of node image pre-pull
-  async_status:
-    jid: "{{ image_prepull.ansible_job_id }}"
-  register: job_result
-  until: job_result.finished
-  when:
-  - node_image.stdout_lines == []
-  - not openshift_is_atomic | bool
-  retries: 20
-  delay: 30
-  failed_when: false
diff --git a/roles/openshift_node/tasks/copy_image_to_ostree.yml b/roles/openshift_node/tasks/copy_image_to_ostree.yml
new file mode 100644
index 00000000000..6758f6a8c29
--- /dev/null
+++ b/roles/openshift_node/tasks/copy_image_to_ostree.yml
@@ -0,0 +1,9 @@
+---
+- name: Copy node container image to ostree storage
+  command: >
+    atomic pull --storage=ostree docker:{{ osn_image }}
+  register: pull_result
+  retries: 3
+  delay: 5
+  until: pull_result.rc == 0
+  changed_when: "'Pulling layer' in pull_result.stdout"
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index e86600c9198..626501d121f 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -59,6 +59,11 @@
 
 - import_tasks: registry_auth.yml
 
+- import_tasks: prepull_check.yml
+
+- import_tasks: copy_image_to_ostree.yml
+  when: openshift_is_atomic | bool
+
 - name: include standard node config
   import_tasks: config.yml
 
diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml
index 502d7086992..2fa7598df89 100644
--- a/roles/openshift_node/tasks/node_system_container.yml
+++ b/roles/openshift_node/tasks/node_system_container.yml
@@ -16,27 +16,6 @@
   - "/var/lib/kubelet"
   - "/opt/cni/bin"
 
-- name: Check status of node image pre-pull
-  async_status:
-    jid: "{{ image_prepull.ansible_job_id }}"
-  register: job_result
-  until: job_result.finished
-  when:
-  - node_image is defined
-  - node_image.stdout_lines == []
-  retries: 20
-  delay: 30
-  failed_when: false
-
-- name: Copy node container image to ostree storage
-  command: >
-    atomic pull --storage=ostree docker:{{ osn_image }}
-  register: pull_result
-  retries: 3
-  delay: 5
-  until: pull_result.rc == 0
-  changed_when: "'Pulling layer' in pull_result.stdout"
-
 - import_tasks: node_system_container_install.yml
 
 # TODO: network manager on RHEL is failing to execute 99-origin-dns.sh with signal 13, an immediate
diff --git a/roles/openshift_node/tasks/prepull.yml b/roles/openshift_node/tasks/prepull.yml
index 57f2dcb36b5..9e89b872b4e 100644
--- a/roles/openshift_node/tasks/prepull.yml
+++ b/roles/openshift_node/tasks/prepull.yml
@@ -14,3 +14,19 @@
   async: 600
   poll: 0
   register: image_prepull
+
+- name: Check that pod image is present
+  command: "{{ openshift_container_cli }} images -q {{ osn_pod_image }}"
+  register: pod_image
+
+# This task runs async to save time while other downloads proceed
+- name: pre-pull pod image
+  docker_image:
+    name: "{{ osn_pod_image }}"
+  environment:
+    NO_PROXY: "{{ openshift.common.no_proxy | default('') }}"
+  when: pod_image.stdout_lines == []
+  # 10 minutes to pull the image
+  async: 600
+  poll: 0
+  register: pod_image_prepull
diff --git a/roles/openshift_node/tasks/prepull_check.yml b/roles/openshift_node/tasks/prepull_check.yml
new file mode 100644
index 00000000000..59f09323ddb
--- /dev/null
+++ b/roles/openshift_node/tasks/prepull_check.yml
@@ -0,0 +1,22 @@
+---
+- name: Check status of node image pre-pull
+  async_status:
+    jid: "{{ image_prepull.ansible_job_id }}"
+  register: job_result
+  until: job_result.finished
+  when:
+  - node_image.stdout_lines == []
+  - not openshift_is_atomic | bool
+  retries: 20
+  delay: 30
+  failed_when: false
+
+- name: Check status of node pod image pre-pull
+  async_status:
+    jid: "{{ pod_image_prepull.ansible_job_id }}"
+  register: job_result
+  until: job_result.finished
+  when: pod_image.stdout_lines == []
+  retries: 20
+  delay: 30
+  failed_when: false
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index 620bf927515..58de48de946 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -17,6 +17,5 @@
   import_tasks: node_system_container.yml
   when: openshift_is_atomic | bool
 
-
 - import_tasks: config/configure-node-settings.yml
 - import_tasks: configure-proxy-settings.yml
diff --git a/roles/openshift_node/tasks/upgrade.yml b/roles/openshift_node/tasks/upgrade.yml
index 2670ce294b2..0be5589518f 100644
--- a/roles/openshift_node/tasks/upgrade.yml
+++ b/roles/openshift_node/tasks/upgrade.yml
@@ -4,7 +4,6 @@
 # - openshift_is_atomic
 # - node_config_hook
 # - openshift_pkg_version
-# - openshift_release
 
 # tasks file for openshift_node_upgrade
 
@@ -70,9 +69,11 @@
     msg: "Restarting dnsmasq"
   # changed_when: True required for debug tasks to trigger handlers.
   changed_when: True
-  notify: restart dnsmasq
+  notify:
+  - systemctl daemon-reload
+  - restart dnsmasq
 
-# Need to flush handlers here so dnsmasq is restarted.
+# Need to flush handlers here so dnsmasq is restarted and daemon-reload
 - meta: flush_handlers
 
 # Restart all services
diff --git a/roles/openshift_node/tasks/upgrade/config_changes.yml b/roles/openshift_node/tasks/upgrade/config_changes.yml
index 1d559f348fe..e3a8885edbf 100644
--- a/roles/openshift_node/tasks/upgrade/config_changes.yml
+++ b/roles/openshift_node/tasks/upgrade/config_changes.yml
@@ -38,11 +38,3 @@
     line: pause_image = "{{ openshift_crio_pause_image }}"
     regexp: '^pause_image ='
   when: crio_conf.stat.exists == True
-
-# NOTE: This is needed to make sure we are using the correct set
-#       of systemd unit files. The RPMs lay down defaults but
-#       the install/upgrade may override them in /etc/systemd/system/.
-# NOTE: We don't use the systemd module as some versions of the module
-#       require a service to be part of the call.
-- name: Reload systemd units
-  command: systemctl daemon-reload
diff --git a/roles/openshift_node/tasks/upgrade_pre.yml b/roles/openshift_node/tasks/upgrade_pre.yml
index 9aafc64256e..d0bda41651a 100644
--- a/roles/openshift_node/tasks/upgrade_pre.yml
+++ b/roles/openshift_node/tasks/upgrade_pre.yml
@@ -7,21 +7,8 @@
 
 - import_tasks: registry_auth.yml
 
-- name: Check that pod image is present
-  command: "{{ openshift_container_cli }} images -q {{ osn_pod_image }}"
-  register: pod_image
-
-# This task runs async to save time while other downloads proceed
-- name: pre-pull pod image
-  docker_image:
-    name: "{{ osn_pod_image }}"
-  environment:
-    NO_PROXY: "{{ openshift.common.no_proxy | default('') }}"
-  when: pod_image.stdout_lines == []
-  # 10 minutes to pull the image
-  async: 600
-  poll: 0
-  register: pod_image_prepull
+# Prepull the node and pod image, it's used by lots of components
+- import_tasks: prepull.yml
 
 - name: update package meta data to speed install later.
   command: "{{ ansible_pkg_mgr }} makecache"
@@ -52,12 +39,7 @@
 - import_tasks: upgrade/rpm_upgrade.yml
   when: not openshift_is_atomic | bool
 
-- name: Check status of node pod image pre-pull
-  async_status:
-    jid: "{{ pod_image_prepull.ansible_job_id }}"
-  register: job_result
-  until: job_result.finished
-  when: pod_image.stdout_lines == []
-  retries: 20
-  delay: 30
-  failed_when: false
+- import_tasks: prepull_check.yml
+
+- import_tasks: copy_image_to_ostree.yml
+  when: openshift_is_atomic | bool