diff --git a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
index 9b71e779e08..11fa1f4da95 100755
--- a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
+++ b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
@@ -54,6 +54,9 @@ if [ ! -f .pivot-done ]; then
   /usr/local/bin/machine-config-daemon pivot
 fi
 
+# Run crio-configure after the pivot
+/usr/local/bin/crio-configure.sh
+
 mkdir --parents ./{bootstrap-manifests,manifests}
 
 if [ ! -f openshift-manifests.done ]
diff --git a/data/data/bootstrap/systemd/units/bootkube.service b/data/data/bootstrap/systemd/units/bootkube.service
index ba01e7254bf..8d76fdbfd5c 100644
--- a/data/data/bootstrap/systemd/units/bootkube.service
+++ b/data/data/bootstrap/systemd/units/bootkube.service
@@ -1,8 +1,6 @@
 [Unit]
 Description=Bootstrap a Kubernetes cluster
-Requires=crio-configure.service
-Wants=kubelet.service
-After=kubelet.service crio-configure.service
+After=release-image.service
 ConditionPathExists=!/opt/openshift/.bootkube.done
 
 [Service]