diff --git a/roles/openshift_node/tasks/config.yml b/roles/openshift_node/tasks/config.yml
index b5e07e6723e..1f1abb33c9e 100644
--- a/roles/openshift_node/tasks/config.yml
+++ b/roles/openshift_node/tasks/config.yml
@@ -75,6 +75,14 @@
   - name: Pull MCD image
     command: "podman pull --tls-verify={{ openshift_node_tls_verify }} --authfile {{ tempfile.path }}/pull-secret.json {{ release_image_mcd.stdout }}"
 
+  - name: Create CNI dir
+    file:
+      path: /opt/cni/bin
+      state: directory
+      owner: root
+      group: root
+      mode: 0755
+
   - name: Apply ignition manifest
     command: "podman run {{ podman_mounts }} {{ podman_flags }} {{ mcd_command }}"
     vars:
@@ -82,6 +90,22 @@
       podman_mounts: "-v /:/rootfs -v /var/run/dbus:/var/run/dbus -v /run/systemd:/run/systemd"
       mcd_command: "start --node-name {{ ansible_hostname }} --once-from {{ tempfile.path }}/bootstrap.ign --skip-reboot"
 
+  # Temporary work around for invalid crio.conf
+  - name: Update crio.conf network_dir
+    lineinfile:
+      path: /etc/crio/crio.conf
+      regexp: '^network_dir'
+      line: 'network_dir = "/etc/cni/net.d/"'
+  - name: Update crio.conf plugin_dir
+    lineinfile:
+      path: /etc/crio/crio.conf
+      regexp: '^plugin_dir'
+      line: 'plugin_dir = ["/var/lib/cni/bin"]'
+  - name: Create /var/lib/cni/bin
+    file:
+      path: /var/lib/cni/bin
+      state: directory
+
   - name: Reboot the host and wait for it to come back
     reboot:
     #  reboot_timeout: 600  # default, 10 minutes
diff --git a/test/aws/scaleup.yml b/test/aws/scaleup.yml
index 32b38edd002..ad6644d0477 100644
--- a/test/aws/scaleup.yml
+++ b/test/aws/scaleup.yml
@@ -134,3 +134,6 @@
       name: "{{ item }}"
       state: absent
     with_items: "{{ pre_scaleup_workers_name }}"
+
+  - name: Wait for worker configs to roll out
+    command: oc wait machineconfigpool/worker --for=condition=Updated --timeout=5m