diff --git a/templates/common/_base/units/machine-config-daemon-host.service b/templates/common/_base/units/machine-config-daemon-host.service
index 16ac972194..4827ed2be6 100644
--- a/templates/common/_base/units/machine-config-daemon-host.service
+++ b/templates/common/_base/units/machine-config-daemon-host.service
@@ -10,6 +10,7 @@ contents: |
   # If pivot exists, defer to it.  Note similar code in update.go
   ConditionPathExists=!/usr/lib/systemd/system/pivot.service
   After=ignition-firstboot-complete.service
+  Before=crio.service crio-wipe.service
   Before=kubelet.service
 
   [Service]