diff --git a/scripts/minikube-setup.sh b/scripts/minikube-setup.sh
index 789fb1b5d4..885865e823 100755
--- a/scripts/minikube-setup.sh
+++ b/scripts/minikube-setup.sh
@@ -22,17 +22,41 @@ if ! conntrack --version &>/dev/null; then
   sudo apt-get -qq -y install conntrack
 fi
 
-curl -Lo minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64
-chmod +x minikube
-sudo mv minikube /usr/local/bin/
+if ! command -v minikube; then
+  curl -Lo minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64
+  chmod +x minikube
+  sudo mv minikube /usr/local/bin/
+fi
+
+
+
+# Minikube needs cri-dockerd to run clusters 1.24+
+CRI_DOCKERD_VERSION="${CRI_DOCKERD_VERSION:-0.2.3}"
+CRI_DOCKERD_BINARY_URL="https://github.com/Mirantis/cri-dockerd/releases/download/v${CRI_DOCKERD_VERSION}/cri-dockerd-${CRI_DOCKERD_VERSION}.amd64.tgz"
+
+curl -Lo cri-dockerd.tgz $CRI_DOCKERD_BINARY_URL
+tar xfz cri-dockerd.tgz
+sudo mv cri-dockerd/cri-dockerd /usr/bin/cri-docker
+
+git clone https://github.com/Mirantis/cri-dockerd.git /tmp/cri-dockerd
+sudo cp /tmp/cri-dockerd/packaging/systemd/* /etc/systemd/system
+sudo systemctl daemon-reload
+sudo systemctl enable cri-docker.service
+sudo systemctl enable --now cri-docker.socket
+
+if ! command -v crictl; then
+  CRICTL_VERSION="v1.24.1"
+  curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz
+  sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin
+  rm -f crictl-$CRICTL_VERSION-linux-amd64.tar.gz
+fi
 
 sudo apt-get update
 sudo apt-get install -y liblz4-tool
 cat /proc/cpuinfo
 
+sudo systemctl unmask docker
 minikube start --vm-driver=none --force
 minikube status
 minikube addons enable registry
 kubectl cluster-info
-
-kubectl port-forward --namespace kube-system service/registry 5000:80 &