Repository: kubernetes/minikube
Pull request #16453 (2023-05-05 21:24:04)

Fix not prepending `unix://` to CRI socket
Starting minikube would make kubeadm output the following warning:
```
Usage of CRI endpoints without URL scheme is deprecated and can cause kubelet errors in the future. Automatically prepending scheme "unix" to the "criSocket" with value "/var/run/cri-dockerd.sock". Please update your configuration!
```

Prepended `unix://` to the CRI socket

k8s-ci-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/kubernetes/minikube/pull/16453#" title="Author self-approved">spowelljr</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubernetes%2Fminikube).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/kubernetes/minikube/blob/master/OWNERS)~~ [spowelljr]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
medyagh: /ok-to-test
minikube-pr-bot: **kvm2 driver with docker runtime**
```
+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 16453) |
+----------------+----------+---------------------+
| minikube start | 50.2s    | 50.9s               |
| enable ingress | 26.3s    | 26.1s               |
+----------------+----------+---------------------+
```

<details>

Times for minikube start: 49.7s 46.7s 51.5s 51.9s 51.4s 
Times for minikube (PR 16453) start: 52.0s 51.2s 50.0s 51.2s 49.9s 

Times for minikube ingress: 23.6s 28.6s 24.1s 27.6s 27.6s 
Times for minikube (PR 16453) ingress: 27.6s 26.7s 24.6s 27.6s 24.1s 

</details>

**docker driver with docker runtime**
```
+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 16453) |
+----------------+----------+---------------------+
| minikube start | 24.0s    | 22.8s               |
| enable ingress | 21.8s    | 21.5s               |
+----------------+----------+---------------------+
```

<details>

Times for minikube start: 22.2s 25.1s 23.8s 23.7s 25.2s 
Times for minikube (PR 16453) start: 23.9s 21.9s 22.0s 20.9s 25.2s 

Times for minikube ingress: 21.3s 20.8s 24.3s 20.8s 21.8s 
Times for minikube (PR 16453) ingress: 20.8s 20.8s 21.3s 22.3s 22.3s 

</details>

**docker driver with containerd runtime**
```
+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 16453) |
+----------------+----------+---------------------+
| minikube start | 22.6s    | 21.5s               |
| enable ingress | 34.4s    | 30.9s               |
+----------------+----------+---------------------+
```

<details>

Times for minikube start: 23.6s 23.9s 20.6s 20.5s 24.2s 
Times for minikube (PR 16453) start: 22.5s 19.9s 23.2s 21.2s 20.5s 

Times for minikube ingress: 31.8s 31.3s 31.3s 31.3s 46.3s 
Times for minikube (PR 16453) ingress: 32.3s 31.4s 31.3s 28.3s 31.3s 

</details>
minikube-pr-bot: These are the flake rates of all failed tests.
|Environment|Failed Tests|Flake Rate (%)|
|---|---|---|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestIngressAddonLegacy/serial/ValidateIngressAddons ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestIngressAddonLegacy/serial/ValidateIngressAddons))|n/a|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestIngressAddonLegacy/serial/ValidateIngressAddonActivation ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestIngressAddonLegacy/serial/ValidateIngressAddonActivation))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestIngressAddonLegacy/serial/ValidateIngressAddonActivation))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestIngressAddonLegacy/serial/ValidateIngressAddons ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestIngressAddonLegacy/serial/ValidateIngressAddons))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestIngressAddonLegacy/serial/ValidateIngressAddons))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestIngressAddonLegacy/StartLegacyK8sCluster ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestIngressAddonLegacy/StartLegacyK8sCluster))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestIngressAddonLegacy/StartLegacyK8sCluster))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestStartStop/group/old-k8s-version/serial/AddonExistsAfterStop ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestStartStop/group/old-k8s-version/serial/AddonExistsAfterStop))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestStartStop/group/old-k8s-version/serial/AddonExistsAfterStop))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestStartStop/group/old-k8s-version/serial/DeployApp ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestStartStop/group/old-k8s-version/serial/DeployApp))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestStartStop/group/old-k8s-version/serial/DeployApp))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestStartStop/group/old-k8s-version/serial/EnableAddonWhileActive ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestStartStop/group/old-k8s-version/serial/EnableAddonWhileActive))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestStartStop/group/old-k8s-version/serial/EnableAddonWhileActive))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestStartStop/group/old-k8s-version/serial/FirstStart ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestStartStop/group/old-k8s-version/serial/FirstStart))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestStartStop/group/old-k8s-version/serial/FirstStart))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestStartStop/group/old-k8s-version/serial/Pause ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestStartStop/group/old-k8s-version/serial/Pause))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestStartStop/group/old-k8s-version/serial/Pause))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestStartStop/group/old-k8s-version/serial/SecondStart ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestStartStop/group/old-k8s-version/serial/SecondStart))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestStartStop/group/old-k8s-version/serial/SecondStart))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestStartStop/group/old-k8s-version/serial/UserAppExistsAfterStop ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestStartStop/group/old-k8s-version/serial/UserAppExistsAfterStop))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestStartStop/group/old-k8s-version/serial/UserAppExistsAfterStop))|
|[Docker_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90)|TestStartStop/group/old-k8s-version/serial/VerifyKubernetesImages ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Linux.html#fail_TestStartStop/group/old-k8s-version/serial/VerifyKubernetesImages))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Linux&period=last90&test=TestStartStop/group/old-k8s-version/serial/VerifyKubernetesImages))|
|[Docker_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_macOS&period=last90)|TestFunctional/parallel/TunnelCmd/serial/AccessDirect ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_macOS.html#fail_TestFunctional/parallel/TunnelCmd/serial/AccessDirect))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_macOS&period=last90&test=TestFunctional/parallel/TunnelCmd/serial/AccessDirect))|
|[Docker_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_macOS&period=last90)|TestFunctional/parallel/TunnelCmd/serial/WaitService/Setup ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_macOS.html#fail_TestFunctional/parallel/TunnelCmd/serial/WaitService/Setup))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_macOS&period=last90&test=TestFunctional/parallel/TunnelCmd/serial/WaitService/Setup))|
|[Docker_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_macOS&period=last90)|TestNetworkPlugins/group/calico/ControllerPod ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_macOS.html#fail_TestNetworkPlugins/group/calico/ControllerPod))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_macOS&period=last90&test=TestNetworkPlugins/group/calico/ControllerPod))|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestIngressAddonLegacy/serial/ValidateIngressAddonActivation ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestIngressAddonLegacy/serial/ValidateIngressAddonActivation))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90&test=TestIngressAddonLegacy/serial/ValidateIngressAddonActivation))|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90&test=TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation))|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestIngressAddonLegacy/StartLegacyK8sCluster ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestIngressAddonLegacy/StartLegacyK8sCluster))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90&test=TestIngressAddonLegacy/StartLegacyK8sCluster))|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestStartStop/group/old-k8s-version/serial/AddonExistsAfterStop ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestStartStop/group/old-k8s-version/serial/AddonExistsAfterStop))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90&test=TestStartStop/group/old-k8s-version/serial/AddonExistsAfterStop))|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestStartStop/group/old-k8s-version/serial/DeployApp ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestStartStop/group/old-k8s-version/serial/DeployApp))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90&test=TestStartStop/group/old-k8s-version/serial/DeployApp))|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestStartStop/group/old-k8s-version/serial/EnableAddonWhileActive ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestStartStop/group/old-k8s-version/serial/EnableAddonWhileActive))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90&test=TestStartStop/group/old-k8s-version/serial/EnableAddonWhileActive))|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestStartStop/group/old-k8s-version/serial/FirstStart ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestStartStop/group/old-k8s-version/serial/FirstStart))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90&test=TestStartStop/group/old-k8s-version/serial/FirstStart))|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestStartStop/group/old-k8s-version/serial/SecondStart ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestStartStop/group/old-k8s-version/serial/SecondStart))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90&test=TestStartStop/group/old-k8s-version/serial/SecondStart))|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestStartStop/group/old-k8s-version/serial/UserAppExistsAfterStop ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestStartStop/group/old-k8s-version/serial/UserAppExistsAfterStop))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90&test=TestStartStop/group/old-k8s-version/serial/UserAppExistsAfterStop))|
|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)|TestStartStop/group/old-k8s-version/serial/VerifyKubernetesImages ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Docker_Windows.html#fail_TestStartStop/group/old-k8s-version/serial/VerifyKubernetesImages))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90&test=TestStartStop/group/old-k8s-version/serial/VerifyKubernetesImages))|
|[Hyperkit_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90)|TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Hyperkit_macOS.html#fail_TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90&test=TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation))|
|[Hyperkit_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90)|TestIngressAddonLegacy/StartLegacyK8sCluster ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Hyperkit_macOS.html#fail_TestIngressAddonLegacy/StartLegacyK8sCluster))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90&test=TestIngressAddonLegacy/StartLegacyK8sCluster))|
|[Hyperkit_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90)|TestKubernetesUpgrade ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Hyperkit_macOS.html#fail_TestKubernetesUpgrade))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90&test=TestKubernetesUpgrade))|
|[Hyperkit_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90)|TestPause/serial/Start ([gopogh](https://storage.googleapis.com/minikube-builds/logs/16453/29113/Hyperkit_macOS.html#fail_TestPause/serial/Start))|0.00 ([chart](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90&test=TestPause/serial/Start))|
|More tests...|Continued...|

Too many tests failed - See test logs for more details.

To see the flake rates of all tests by environment, click [here](https://minikube.sigs.k8s.io/docs/contrib/test_flakes/).

Patch:
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 3f72272ed..6c7537c66 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -547,7 +547,7 @@ jobs:
           chmod a+x e2e-*
           chmod a+x minikube-*
           START_TIME=$(date -u +%s)
-          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=10m -test.v -timeout-multiplier=1.5 -test.run TestFunctional -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=10m -test.v -timeout-multiplier=1.5 -test.run TestFunctional -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
           END_TIME=$(date -u +%s)
           TIME_ELAPSED=$(($END_TIME-$START_TIME))
           min=$((${TIME_ELAPSED}/60))
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index b99bccfd5..aa78ac6d6 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -667,7 +667,7 @@ jobs:
           chmod a+x minikube-*
           MINIKUBE_HOME=$(pwd)/testhome ./minikube-linux-amd64 delete --all --purge
           START_TIME=$(date -u +%s)
-          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=10m -test.v -timeout-multiplier=1.5 -test.run TestFunctional -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
+          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=10m -test.v -timeout-multiplier=1.5 -test.run TestFunctional -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
           END_TIME=$(date -u +%s)
           TIME_ELAPSED=$(($END_TIME-$START_TIME))
           min=$((${TIME_ELAPSED}/60))
diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml
index b7ce74d6f..da2437625 100644
--- a/.github/workflows/update-ubuntu-version.yml
+++ b/.github/workflows/update-ubuntu-version.yml
@@ -22,9 +22,7 @@ jobs:
       - name: Bump Ubuntu version
         id: bumpUbuntu
         run: |
-          echo "OLD_VERSION=$(DEP=ubuntu make get-dependency-version)" >> $GITHUB_OUTPUT
           make update-ubuntu-version
-          echo "NEW_VERSION=$(DEP=ubuntu make get-dependency-version)" >> $GITHUB_OUTPUT
           c=$(git status --porcelain)
           c="${c//$'\n'/'%0A'}"
           c="${c//$'\r'/'%0D'}"
@@ -37,14 +35,14 @@ jobs:
         uses: peter-evans/create-pull-request@284f54f989303d2699d373481a0cfa13ad5a6666
         with:
           token: ${{ secrets.MINIKUBE_BOT_PAT }}
-          commit-message: 'Kicbase: Bump ubuntu:focal from ${{ steps.bumpUbuntu.outputs.OLD_VERSION }} to ${{ steps.bumpUbuntu.outpus.NEW_VERSION }}'
+          commit-message: update ubuntu:focal image version
           committer: minikube-bot <minikube-bot@google.com>
           author: minikube-bot <minikube-bot@google.com>
           branch: auto_bump_ubuntu_version
           push-to-fork: minikube-bot/minikube
           base: master
           delete-branch: true
-          title: 'Kicbase: Bump ubuntu:focal from ${{ steps.bumpUbuntu.outputs.OLD_VERSION }} to ${{ steps.bumpUbuntu.outpus.NEW_VERSION }}'
+          title: 'Kicbase: Bump ubuntu:focal image version'
           body: |
             The ubuntu:focal image released a new version
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82d42af70..f8fc373d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -652,7 +652,7 @@ Bug Fixes:
 * Fix port validation error on specifying tcp/udp or range of ports. [#13812](https://github.com/kubernetes/minikube/pull/13812)
 * Fix not downloading kic for offline mode [#13910](https://github.com/kubernetes/minikube/pull/13910)
 * Fix trying to pause multiple containers with runc [#13783](https://github.com/kubernetes/minikube/pull/13783)
-* Fix `minikube service` docker/port-forward issues [#13756](https://github.com/kubernetes/minikube/pull/13756)
+* Fix `minikube servce` docker/port-forward issues [#13756](https://github.com/kubernetes/minikube/pull/13756)
 
 Version Upgrades:
 * Upgrade Kubernetes default: v1.23.6 and latest: v1.23.6 [#14144](https://github.com/kubernetes/minikube/pull/14144)
diff --git a/Makefile b/Makefile
index 1d5b53472..7ffff9dc4 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
 KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.30.1-1683246251-16426
+ISO_VERSION ?= v1.30.1-1683022510-16417
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
@@ -367,7 +367,7 @@ integration: out/minikube$(IS_EXE) ## Trigger minikube integration test, logs to
 
 .PHONY: integration-none-driver
 integration-none-driver: e2e-linux-$(GOARCH) out/minikube-linux-$(GOARCH)  ## Trigger minikube none driver test, logs to ./out/testout_COMMIT.txt
-	out/e2e-linux-$(GOARCH) -testdata-dir "test/integration/testdata" -minikube-start-args="--driver=none" -test.v -test.timeout=60m -binary=out/minikube-linux-amd64 $(TEST_ARGS) 2>&1 | tee "./out/testout_$(COMMIT_SHORT).txt"
+	sudo -E out/e2e-linux-$(GOARCH) -testdata-dir "test/integration/testdata" -minikube-start-args="--driver=none" -test.v -test.timeout=60m -binary=out/minikube-linux-amd64 $(TEST_ARGS) 2>&1 | tee "./out/testout_$(COMMIT_SHORT).txt"
 
 .PHONY: integration-versioned
 integration-versioned: out/minikube ## Trigger minikube integration testing, logs to ./out/testout_COMMIT.txt
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index b1b964756..cd7b59f3f 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -1581,7 +1581,7 @@ func validateInsecureRegistry() {
 	}
 }
 
-func createNode(cc config.ClusterConfig, existing *config.ClusterConfig) (config.ClusterConfig, config.Node, error) {
+func createNode(cc config.ClusterConfig, kubeNodeName string, existing *config.ClusterConfig) (config.ClusterConfig, config.Node, error) {
 	// Create the initial node, which will necessarily be a control plane
 	if existing != nil {
 		cp, err := config.PrimaryControlPlane(existing)
@@ -1608,6 +1608,7 @@ func createNode(cc config.ClusterConfig, existing *config.ClusterConfig) (config
 		Port:              cc.KubernetesConfig.NodePort,
 		KubernetesVersion: getKubernetesVersion(&cc),
 		ContainerRuntime:  getContainerRuntime(&cc),
+		Name:              kubeNodeName,
 		ControlPlane:      true,
 		Worker:            true,
 	}
diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index 4e6a3359b..12e22c982 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -329,7 +329,11 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 		proxy.SetDockerEnv()
 	}
 
-	return createNode(cc, existing)
+	var kubeNodeName string
+	if driver.BareMetal(cc.Driver) {
+		kubeNodeName = "m01"
+	}
+	return createNode(cc, kubeNodeName, existing)
 }
 
 func getCPUCount(drvName string) int {
diff --git a/deploy/addons/kong/kong-ingress-controller.yaml.tmpl b/deploy/addons/kong/kong-ingress-controller.yaml.tmpl
index 39180af7f..8ba9d1d2c 100644
--- a/deploy/addons/kong/kong-ingress-controller.yaml.tmpl
+++ b/deploy/addons/kong/kong-ingress-controller.yaml.tmpl
@@ -7,67 +7,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
-  name: ingressclassparameterses.configuration.konghq.com
-spec:
-  group: configuration.konghq.com
-  names:
-    kind: IngressClassParameters
-    listKind: IngressClassParametersList
-    plural: ingressclassparameterses
-    singular: ingressclassparameters
-  scope: Namespaced
-  versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: IngressClassParameters is the Schema for the IngressClassParameters
-          API.
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: Spec is the IngressClassParameters specification.
-            properties:
-              enableLegacyRegexDetection:
-                default: false
-                description: EnableLegacyRegexDetection automatically detects if ImplementationSpecific
-                  Ingress paths are regular expression paths using the legacy 2.x
-                  heuristic. The controller adds the "~" prefix to those paths if
-                  the Kong version is 3.0 or higher.
-                type: boolean
-              serviceUpstream:
-                default: false
-                description: Offload load-balancing to kube-proxy or sidecar.
-                type: boolean
-            type: object
-        type: object
-    served: true
-    storage: true
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: kongclusterplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
   names:
-    categories:
-    - kong-ingress-controller
     kind: KongClusterPlugin
     listKind: KongClusterPluginList
     plural: kongclusterplugins
@@ -98,7 +43,7 @@ spec:
     name: v1
     schema:
       openAPIV3Schema:
-        description: KongClusterPlugin is the Schema for the kongclusterplugins API.
+        description: KongClusterPlugin is the Schema for the kongclusterplugins API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -106,33 +51,24 @@ spec:
               internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           config:
-            description: Config contains the plugin configuration. It's a list of
-              keys and values required to configure the plugin. Please read the documentation
-              of the plugin being configured to set values in here. For any plugin
-              in Kong, anything that goes in the `config` JSON key in the Admin API
-              request, goes into this property. Only one of `config` or `configFrom`
-              may be used in a KongClusterPlugin, not both at once.
+            description: Config contains the plugin configuration.
             type: object
             x-kubernetes-preserve-unknown-fields: true
           configFrom:
             description: ConfigFrom references a secret containing the plugin configuration.
-              This should be used when the plugin configuration contains sensitive
-              information, such as AWS credentials in the Lambda plugin or the client
-              secret in the OIDC plugin. Only one of `config` or `configFrom` may
-              be used in a KongClusterPlugin, not both at once.
             properties:
               secretKeyRef:
-                description: Specifies a name, a namespace, and a key of a secret
-                  to refer to.
+                description: NamespacedSecretValueFromSource represents the source
+                  of a secret value specifying the secret namespace
                 properties:
                   key:
-                    description: The key containing the value.
+                    description: the key containing the value
                     type: string
                   name:
-                    description: The secret containing the key.
+                    description: the secret containing the key
                     type: string
                   namespace:
-                    description: The namespace containing the secret.
+                    description: The namespace containing the secret
                     type: string
                 required:
                 - key
@@ -141,10 +77,10 @@ spec:
                 type: object
             type: object
           consumerRef:
-            description: ConsumerRef is a reference to a particular consumer.
+            description: ConsumerRef is a reference to a particular consumer
             type: string
           disabled:
-            description: Disabled set if the plugin is disabled or not.
+            description: Disabled set if the plugin is disabled or not
             type: boolean
           kind:
             description: 'Kind is a string value representing the REST resource this
@@ -153,42 +89,14 @@ spec:
             type: string
           metadata:
             type: object
-          ordering:
-            description: 'Ordering overrides the normal plugin execution order. It''s
-              only available on Kong Enterprise. `<phase>` is a request processing
-              phase (for example, `access` or `body_filter`) and `<plugin>` is the
-              name of the plugin that will run before or after the KongPlugin. For
-              example, a KongPlugin with `plugin: rate-limiting` and `before.access:
-              ["key-auth"]` will create a rate limiting plugin that limits requests
-              _before_ they are authenticated.'
-            properties:
-              after:
-                additionalProperties:
-                  items:
-                    type: string
-                  type: array
-                description: PluginOrderingPhase indicates which plugins in a phase
-                  should affect the target plugin's order
-                type: object
-              before:
-                additionalProperties:
-                  items:
-                    type: string
-                  type: array
-                description: PluginOrderingPhase indicates which plugins in a phase
-                  should affect the target plugin's order
-                type: object
-            type: object
           plugin:
             description: PluginName is the name of the plugin to which to apply the
-              config.
+              config
             type: string
           protocols:
             description: Protocols configures plugin to run on requests received on
               specific protocols.
             items:
-              description: KongProtocol is a valid Kong protocol. This alias is necessary
-                to deal with https://github.com/kubernetes-sigs/controller-tools/issues/342
               enum:
               - http
               - https
@@ -214,19 +122,23 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: kongconsumers.configuration.konghq.com
 spec:
   group: configuration.konghq.com
   names:
-    categories:
-    - kong-ingress-controller
     kind: KongConsumer
     listKind: KongConsumerList
     plural: kongconsumers
@@ -247,7 +159,7 @@ spec:
     name: v1
     schema:
       openAPIV3Schema:
-        description: KongConsumer is the Schema for the kongconsumers API.
+        description: KongConsumer is the Schema for the kongconsumers API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -261,8 +173,8 @@ spec:
               type: string
             type: array
           custom_id:
-            description: CustomID is a Kong cluster-unique existing ID for the consumer
-              - useful for mapping Kong with users in your existing database.
+            description: CustomID existing unique ID for the consumer - useful for
+              mapping Kong with users in your existing database
             type: string
           kind:
             description: 'Kind is a string value representing the REST resource this
@@ -272,26 +184,30 @@ spec:
           metadata:
             type: object
           username:
-            description: Username is a Kong cluster-unique username of the consumer.
+            description: Username unique username of the consumer.
             type: string
         type: object
     served: true
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: kongingresses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
   names:
-    categories:
-    - kong-ingress-controller
     kind: KongIngress
     listKind: KongIngressList
     plural: kongingresses
@@ -303,7 +219,7 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: KongIngress is the Schema for the kongingresses API.
+        description: KongIngress is the Schema for the kongingresses API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -318,25 +234,15 @@ spec:
           metadata:
             type: object
           proxy:
-            description: Proxy defines additional connection options for the routes
-              to be configured in the Kong Gateway, e.g. `connection_timeout`, `retries`,
-              etc.
+            description: KongIngressService contains KongIngress service configuration
             properties:
               connect_timeout:
-                description: "The timeout in milliseconds for\testablishing a connection
-                  to the upstream server. Deprecated: use Service's \"konghq.com/connect-timeout\"
-                  annotation instead."
                 minimum: 0
                 type: integer
               path:
-                description: '(optional) The path to be used in requests to the upstream
-                  server. Deprecated: use Service''s "konghq.com/path" annotation
-                  instead.'
                 pattern: ^/.*$
                 type: string
               protocol:
-                description: 'The protocol used to communicate with the upstream.
-                  Deprecated: use Service''s "konghq.com/protocol" annotation instead.'
                 enum:
                 - http
                 - https
@@ -347,73 +253,39 @@ spec:
                 - udp
                 type: string
               read_timeout:
-                description: 'The timeout in milliseconds between two successive read
-                  operations for transmitting a request to the upstream server. Deprecated:
-                  use Service''s "konghq.com/read-timeout" annotation instead.'
                 minimum: 0
                 type: integer
               retries:
-                description: 'The number of retries to execute upon failure to proxy.
-                  Deprecated: use Service''s "konghq.com/retries" annotation instead.'
                 minimum: 0
                 type: integer
               write_timeout:
-                description: 'The timeout in milliseconds between two successive write
-                  operations for transmitting a request to the upstream server. Deprecated:
-                  use Service''s "konghq.com/write-timeout" annotation instead.'
                 minimum: 0
                 type: integer
             type: object
           route:
-            description: Route define rules to match client requests. Each Route is
-              associated with a Service, and a Service may have multiple Routes associated
-              to it.
+            description: KongIngressRoute contains KongIngress route configuration
             properties:
               headers:
                 additionalProperties:
                   items:
                     type: string
                   type: array
-                description: 'Headers contains one or more lists of values indexed
-                  by header name that will cause this Route to match if present in
-                  the request. The Host header cannot be used with this attribute.
-                  Deprecated: use Ingress'' "konghq.com/headers" annotation instead.'
                 type: object
               https_redirect_status_code:
-                description: 'HTTPSRedirectStatusCode is the status code Kong responds
-                  with when all properties of a Route match except the protocol. Deprecated:
-                  use Ingress'' "ingress.kubernetes.io/force-ssl-redirect" or "konghq.com/https-redirect-status-code"
-                  annotations instead.'
                 type: integer
               methods:
-                description: 'Methods is a list of HTTP methods that match this Route.
-                  Deprecated: use Ingress'' "konghq.com/methods" annotation instead.'
                 items:
                   type: string
                 type: array
               path_handling:
-                description: 'PathHandling controls how the Service path, Route path
-                  and requested path are combined when sending a request to the upstream.
-                  Deprecated: use Ingress'' "konghq.com/path-handling" annotation
-                  instead.'
                 enum:
                 - v0
                 - v1
                 type: string
               preserve_host:
-                description: 'PreserveHost sets When matching a Route via one of the
-                  hosts domain names, use the request Host header in the upstream
-                  request headers. If set to false, the upstream Host header will
-                  be that of the Service’s host. Deprecated: use Ingress'' "konghq.com/preserve-host"
-                  annotation instead.'
                 type: boolean
               protocols:
-                description: 'Protocols is an array of the protocols this Route should
-                  allow. Deprecated: use Ingress'' "konghq.com/protocols" annotation
-                  instead.'
                 items:
-                  description: KongProtocol is a valid Kong protocol. This alias is
-                    necessary to deal with https://github.com/kubernetes-sigs/controller-tools/issues/342
                   enum:
                   - http
                   - https
@@ -425,91 +297,41 @@ spec:
                   type: string
                 type: array
               regex_priority:
-                description: 'RegexPriority is a number used to choose which route
-                  resolves a given request when several routes match it using regexes
-                  simultaneously. Deprecated: use Ingress'' "konghq.com/regex-priority"
-                  annotation instead.'
                 type: integer
               request_buffering:
-                description: 'RequestBuffering sets whether to enable request body
-                  buffering or not. Deprecated: use Ingress'' "konghq.com/request-buffering"
-                  annotation instead.'
                 type: boolean
               response_buffering:
-                description: 'ResponseBuffering sets whether to enable response body
-                  buffering or not. Deprecated: use Ingress'' "konghq.com/response-buffering"
-                  annotation instead.'
                 type: boolean
               snis:
-                description: 'SNIs is a list of SNIs that match this Route when using
-                  stream routing. Deprecated: use Ingress'' "konghq.com/snis" annotation
-                  instead.'
                 items:
                   type: string
                 type: array
               strip_path:
-                description: 'StripPath sets When matching a Route via one of the
-                  paths strip the matching prefix from the upstream request URL. Deprecated:
-                  use Ingress'' "konghq.com/strip-path" annotation instead.'
                 type: boolean
             type: object
           upstream:
-            description: Upstream represents a virtual hostname and can be used to
-              loadbalance incoming requests over multiple targets (e.g. Kubernetes
-              `Services` can be a target, OR `Endpoints` can be targets).
+            description: KongIngressUpstream contains KongIngress upstream configuration
             properties:
               algorithm:
-                description: Algorithm is the load balancing algorithm to use.
                 enum:
                 - round-robin
                 - consistent-hashing
                 - least-connections
                 type: string
               hash_fallback:
-                description: 'HashFallback defines What to use as hashing input if
-                  the primary hash_on does not return a hash. Accepted values are:
-                  "none", "consumer", "ip", "header", "cookie".'
                 type: string
               hash_fallback_header:
-                description: HashFallbackHeader is the header name to take the value
-                  from as hash input. Only required when "hash_fallback" is set to
-                  "header".
-                type: string
-              hash_fallback_query_arg:
-                description: HashFallbackQueryArg is the "hash_fallback" version of
-                  HashOnQueryArg.
-                type: string
-              hash_fallback_uri_capture:
-                description: HashFallbackURICapture is the "hash_fallback" version
-                  of HashOnURICapture.
                 type: string
               hash_on:
-                description: 'HashOn defines what to use as hashing input. Accepted
-                  values are: "none", "consumer", "ip", "header", "cookie", "path",
-                  "query_arg", "uri_capture".'
                 type: string
               hash_on_cookie:
-                description: The cookie name to take the value from as hash input.
-                  Only required when "hash_on" or "hash_fallback" is set to "cookie".
                 type: string
               hash_on_cookie_path:
-                description: The cookie path to set in the response headers. Only
-                  required when "hash_on" or "hash_fallback" is set to "cookie".
                 type: string
               hash_on_header:
-                description: HashOnHeader defines the header name to take the value
-                  from as hash input. Only required when "hash_on" is set to "header".
-                type: string
-              hash_on_query_arg:
-                description: HashOnQueryArg is the query string parameter whose value
-                  is the hash input when "hash_on" is set to "query_arg".
-                type: string
-              hash_on_uri_capture:
-                description: HashOnURICapture is the name of the capture group whose
-                  value is the hash input when "hash_on" is set to "uri_capture".
                 type: string
               healthchecks:
-                description: Healthchecks defines the health check configurations
+                description: Healthcheck represents a health-check config of an upstream
                   in Kong.
                 properties:
                   active:
@@ -615,11 +437,8 @@ spec:
                     type: number
                 type: object
               host_header:
-                description: HostHeader is The hostname to be used as Host header
-                  when proxying requests through Kong.
                 type: string
               slots:
-                description: Slots is the number of slots in the load balancer algorithm.
                 minimum: 10
                 type: integer
             type: object
@@ -628,19 +447,23 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: kongplugins.configuration.konghq.com
 spec:
   group: configuration.konghq.com
   names:
-    categories:
-    - kong-ingress-controller
     kind: KongPlugin
     listKind: KongPluginList
     plural: kongplugins
@@ -671,7 +494,7 @@ spec:
     name: v1
     schema:
       openAPIV3Schema:
-        description: KongPlugin is the Schema for the kongplugins API.
+        description: KongPlugin is the Schema for the kongplugins API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -679,30 +502,21 @@ spec:
               internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           config:
-            description: Config contains the plugin configuration. It's a list of
-              keys and values required to configure the plugin. Please read the documentation
-              of the plugin being configured to set values in here. For any plugin
-              in Kong, anything that goes in the `config` JSON key in the Admin API
-              request, goes into this property. Only one of `config` or `configFrom`
-              may be used in a KongPlugin, not both at once.
+            description: Config contains the plugin configuration.
             type: object
             x-kubernetes-preserve-unknown-fields: true
           configFrom:
             description: ConfigFrom references a secret containing the plugin configuration.
-              This should be used when the plugin configuration contains sensitive
-              information, such as AWS credentials in the Lambda plugin or the client
-              secret in the OIDC plugin. Only one of `config` or `configFrom` may
-              be used in a KongPlugin, not both at once.
             properties:
               secretKeyRef:
-                description: Specifies a name and a key of a secret to refer to. The
-                  namespace is implicitly set to the one of referring object.
+                description: SecretValueFromSource represents the source of a secret
+                  value
                 properties:
                   key:
-                    description: The key containing the value.
+                    description: the key containing the value
                     type: string
                   name:
-                    description: The secret containing the key.
+                    description: the secret containing the key
                     type: string
                 required:
                 - key
@@ -710,10 +524,10 @@ spec:
                 type: object
             type: object
           consumerRef:
-            description: ConsumerRef is a reference to a particular consumer.
+            description: ConsumerRef is a reference to a particular consumer
             type: string
           disabled:
-            description: Disabled set if the plugin is disabled or not.
+            description: Disabled set if the plugin is disabled or not
             type: boolean
           kind:
             description: 'Kind is a string value representing the REST resource this
@@ -722,42 +536,14 @@ spec:
             type: string
           metadata:
             type: object
-          ordering:
-            description: 'Ordering overrides the normal plugin execution order. It''s
-              only available on Kong Enterprise. `<phase>` is a request processing
-              phase (for example, `access` or `body_filter`) and `<plugin>` is the
-              name of the plugin that will run before or after the KongPlugin. For
-              example, a KongPlugin with `plugin: rate-limiting` and `before.access:
-              ["key-auth"]` will create a rate limiting plugin that limits requests
-              _before_ they are authenticated.'
-            properties:
-              after:
-                additionalProperties:
-                  items:
-                    type: string
-                  type: array
-                description: PluginOrderingPhase indicates which plugins in a phase
-                  should affect the target plugin's order
-                type: object
-              before:
-                additionalProperties:
-                  items:
-                    type: string
-                  type: array
-                description: PluginOrderingPhase indicates which plugins in a phase
-                  should affect the target plugin's order
-                type: object
-            type: object
           plugin:
             description: PluginName is the name of the plugin to which to apply the
-              config.
+              config
             type: string
           protocols:
             description: Protocols configures plugin to run on requests received on
               specific protocols.
             items:
-              description: KongProtocol is a valid Kong protocol. This alias is necessary
-                to deal with https://github.com/kubernetes-sigs/controller-tools/issues/342
               enum:
               - http
               - https
@@ -783,19 +569,23 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: tcpingresses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
   names:
-    categories:
-    - kong-ingress-controller
     kind: TCPIngress
     listKind: TCPIngressList
     plural: tcpingresses
@@ -814,7 +604,7 @@ spec:
     name: v1beta1
     schema:
       openAPIV3Schema:
-        description: TCPIngress is the Schema for the tcpingresses API.
+        description: TCPIngress is the Schema for the tcpingresses API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -829,7 +619,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: Spec is the TCPIngress specification.
+            description: TCPIngressSpec defines the desired state of TCPIngress
             properties:
               rules:
                 description: A list of rules used to configure the Ingress.
@@ -844,7 +634,6 @@ spec:
                       properties:
                         serviceName:
                           description: Specifies the name of the referenced service.
-                          minLength: 1
                           type: string
                         servicePort:
                           description: Specifies the port of the referenced service.
@@ -858,12 +647,9 @@ spec:
                       type: object
                     host:
                       description: Host is the fully qualified domain name of a network
-                        host, as defined by RFC 3986. If a Host is not specified,
-                        then port-based TCP routing is performed. Kong doesn't care
-                        about the content of the TCP stream in this case. If a Host
-                        is specified, the protocol must be TLS over TCP. A plain-text
-                        TCP request cannot be routed based on Host. It can only be
-                        routed based on Port.
+                        host, as defined by RFC 3986. If a Host is specified, the
+                        protocol must be TLS over TCP. A plain-text TCP request cannot
+                        be routed based on Host. It can only be routed based on Port.
                       type: string
                     port:
                       description: Port is the port on which to accept TCP or TLS
@@ -876,7 +662,6 @@ spec:
                       type: integer
                   required:
                   - backend
-                  - port
                   type: object
                 type: array
               tls:
@@ -904,7 +689,7 @@ spec:
                 type: array
             type: object
           status:
-            description: TCPIngressStatus defines the observed state of TCPIngress.
+            description: TCPIngressStatus defines the observed state of TCPIngress
             properties:
               loadBalancer:
                 description: LoadBalancer contains the current status of the load-balancer.
@@ -937,8 +722,8 @@ spec:
                                   the service port The format of the error shall comply
                                   with the following rules: - built-in error values
                                   shall be specified in this file and those shall
-                                  use CamelCase names - cloud provider specific error
-                                  values must have names that comply with the format
+                                  use   CamelCase names - cloud provider specific
+                                  error values must have names that comply with the   format
                                   foo.example.com/CamelCase. --- The regex it matches
                                   is (dns1123SubdomainFmt/)?(qualifiedNameFmt)'
                                 maxLength: 316
@@ -970,19 +755,23 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: udpingresses.configuration.konghq.com
 spec:
   group: configuration.konghq.com
   names:
-    categories:
-    - kong-ingress-controller
     kind: UDPIngress
     listKind: UDPIngressList
     plural: udpingresses
@@ -1001,7 +790,7 @@ spec:
     name: v1beta1
     schema:
       openAPIV3Schema:
-        description: UDPIngress is the Schema for the udpingresses API.
+        description: UDPIngress is the Schema for the udpingresses API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -1016,7 +805,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: Spec is the UDPIngress specification.
+            description: UDPIngressSpec defines the desired state of UDPIngress
             properties:
               rules:
                 description: A list of rules used to configure the Ingress.
@@ -1031,7 +820,6 @@ spec:
                       properties:
                         serviceName:
                           description: Specifies the name of the referenced service.
-                          minLength: 1
                           type: string
                         servicePort:
                           description: Specifies the port of the referenced service.
@@ -1047,9 +835,6 @@ spec:
                       description: Port indicates the port for the Kong proxy to accept
                         incoming traffic on, which will then be routed to the service
                         Backend.
-                      format: int32
-                      maximum: 65535
-                      minimum: 1
                       type: integer
                   required:
                   - backend
@@ -1058,7 +843,7 @@ spec:
                 type: array
             type: object
           status:
-            description: UDPIngressStatus defines the observed state of UDPIngress.
+            description: UDPIngressStatus defines the observed state of UDPIngress
             properties:
               loadBalancer:
                 description: LoadBalancer contains the current status of the load-balancer.
@@ -1091,8 +876,8 @@ spec:
                                   the service port The format of the error shall comply
                                   with the following rules: - built-in error values
                                   shall be specified in this file and those shall
-                                  use CamelCase names - cloud provider specific error
-                                  values must have names that comply with the format
+                                  use   CamelCase names - cloud provider specific
+                                  error values must have names that comply with the   format
                                   foo.example.com/CamelCase. --- The regex it matches
                                   is (dns1123SubdomainFmt/)?(qualifiedNameFmt)'
                                 maxLength: 316
@@ -1124,6 +909,12 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -1233,14 +1024,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - configuration.konghq.com
-  resources:
-  - ingressclassparameterses
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - configuration.konghq.com
   resources:
@@ -1337,14 +1120,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - discovery.k8s.io
-  resources:
-  - endpointslices
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - extensions
   resources:
@@ -1362,15 +1137,7 @@ rules:
   - patch
   - update
 - apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingressclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - networking.k8s.io
+  - networking.internal.knative.dev
   resources:
   - ingresses
   verbs:
@@ -1378,22 +1145,15 @@ rules:
   - list
   - watch
 - apiGroups:
-  - networking.k8s.io
+  - networking.internal.knative.dev
   resources:
   - ingresses/status
   verbs:
   - get
   - patch
   - update
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  name: kong-ingress-gateway
-rules:
 - apiGroups:
-  - gateway.networking.k8s.io
+  - networking.k8s.io
   resources:
   - gatewayclasses
   verbs:
@@ -1401,46 +1161,27 @@ rules:
   - list
   - watch
 - apiGroups:
-  - gateway.networking.k8s.io
+  - networking.k8s.io
   resources:
   - gatewayclasses/status
   verbs:
   - get
-  - update
 - apiGroups:
-  - gateway.networking.k8s.io
+  - networking.k8s.io
   resources:
   - gateways
   verbs:
   - get
   - list
-  - update
   - watch
 - apiGroups:
-  - gateway.networking.k8s.io
+  - networking.k8s.io
   resources:
   - gateways/status
   verbs:
   - get
-  - update
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - grpcroutes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - grpcroutes/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
-  - gateway.networking.k8s.io
+  - networking.k8s.io
   resources:
   - httproutes
   verbs:
@@ -1448,80 +1189,13 @@ rules:
   - list
   - watch
 - apiGroups:
-  - gateway.networking.k8s.io
+  - networking.k8s.io
   resources:
   - httproutes/status
   verbs:
   - get
-  - update
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - referencegrants
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - referencegrants/status
-  verbs:
-  - get
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - tcproutes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - tcproutes/status
-  verbs:
-  - get
-  - update
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - tlsroutes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - tlsroutes/status
-  verbs:
-  - get
-  - update
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - udproutes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - udproutes/status
-  verbs:
-  - get
-  - update
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  name: kong-ingress-knative
-rules:
 - apiGroups:
-  - networking.internal.knative.dev
+  - networking.k8s.io
   resources:
   - ingresses
   verbs:
@@ -1529,7 +1203,7 @@ rules:
   - list
   - watch
 - apiGroups:
-  - networking.internal.knative.dev
+  - networking.k8s.io
   resources:
   - ingresses/status
   verbs:
@@ -1564,47 +1238,6 @@ subjects:
   name: kong-serviceaccount
   namespace: kong
 ---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: kong-ingress-gateway
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kong-ingress-gateway
-subjects:
-- kind: ServiceAccount
-  name: kong-serviceaccount
-  namespace: kong
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: kong-ingress-knative
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kong-ingress-knative
-subjects:
-- kind: ServiceAccount
-  name: kong-serviceaccount
-  namespace: kong
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: kong-admin
-  namespace: kong
-spec:
-  clusterIP: None
-  ports:
-  - name: admin
-    port: 8444
-    protocol: TCP
-    targetPort: 8444
-  selector:
-    app: proxy-kong
----
 apiVersion: v1
 kind: Service
 metadata:
@@ -1624,7 +1257,7 @@ spec:
     protocol: TCP
     targetPort: 8443
   selector:
-    app: proxy-kong
+    app: ingress-kong
   type: LoadBalancer
 ---
 apiVersion: v1
@@ -1657,115 +1290,18 @@ spec:
     metadata:
       annotations:
         kuma.io/gateway: enabled
-        kuma.io/service-account-token-volume: kong-serviceaccount-token
         traffic.sidecar.istio.io/includeInboundPorts: ""
       labels:
         app: ingress-kong
     spec:
-      automountServiceAccountToken: false
-      containers:
-      - env:
-        - name: CONTROLLER_KONG_ADMIN_SVC
-          value: kong/kong-admin
-        - name: CONTROLLER_KONG_ADMIN_TLS_SKIP_VERIFY
-          value: "true"
-        - name: CONTROLLER_PUBLISH_SERVICE
-          value: kong/kong-proxy
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.name
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{.CustomRegistries.KongIngress | default .ImageRepository | default .Registries.KongIngress}}{{.Images.KongIngress}}
-        imagePullPolicy: IfNotPresent
-        livenessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 5
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        name: ingress-controller
-        ports:
-        - containerPort: 8080
-          name: webhook
-          protocol: TCP
-        - containerPort: 10255
-          name: cmetrics
-          protocol: TCP
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /readyz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 5
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        volumeMounts:
-        - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
-          name: kong-serviceaccount-token
-          readOnly: true
-      serviceAccountName: kong-serviceaccount
-      volumes:
-      - name: kong-serviceaccount-token
-        projected:
-          sources:
-          - serviceAccountToken:
-              expirationSeconds: 3607
-              path: token
-          - configMap:
-              items:
-              - key: ca.crt
-                path: ca.crt
-              name: kube-root-ca.crt
-          - downwardAPI:
-              items:
-              - fieldRef:
-                  apiVersion: v1
-                  fieldPath: metadata.namespace
-                path: namespace
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: proxy-kong
-  name: proxy-kong
-  namespace: kong
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: proxy-kong
-  template:
-    metadata:
-      annotations:
-        kuma.io/gateway: enabled
-        kuma.io/service-account-token-volume: kong-serviceaccount-token
-        traffic.sidecar.istio.io/includeInboundPorts: ""
-      labels:
-        app: proxy-kong
-    spec:
-      automountServiceAccountToken: false
       containers:
       - env:
         - name: KONG_PROXY_LISTEN
-          value: 0.0.0.0:8000 reuseport backlog=16384, 0.0.0.0:8443 http2 ssl reuseport
-            backlog=16384
+          value: 0.0.0.0:8000, 0.0.0.0:8443 ssl http2
         - name: KONG_PORT_MAPS
           value: 80:8000, 443:8443
         - name: KONG_ADMIN_LISTEN
-          value: 0.0.0.0:8444 http2 ssl reuseport backlog=16384
+          value: 127.0.0.1:8444 ssl
         - name: KONG_STATUS_LISTEN
           value: 0.0.0.0:8100
         - name: KONG_DATABASE
@@ -1780,14 +1316,12 @@ spec:
           value: /dev/stderr
         - name: KONG_PROXY_ERROR_LOG
           value: /dev/stderr
-        - name: KONG_ROUTER_FLAVOR
-          value: traditional
-        image: {{.CustomRegistries.Kong | default .ImageRepository | default .Registries.Kong}}{{.Images.Kong}}               
+        image: {{.CustomRegistries.Kong | default .ImageRepository | default .Registries.Kong}}{{.Images.Kong}}
         lifecycle:
           preStop:
             exec:
               command:
-              - /bin/bash
+              - /bin/sh
               - -c
               - kong quit
         livenessProbe:
@@ -1821,29 +1355,51 @@ spec:
           periodSeconds: 10
           successThreshold: 1
           timeoutSeconds: 1
+      - env:
+        - name: CONTROLLER_KONG_ADMIN_URL
+          value: https://127.0.0.1:8444
+        - name: CONTROLLER_KONG_ADMIN_TLS_SKIP_VERIFY
+          value: "true"
+        - name: CONTROLLER_PUBLISH_SERVICE
+          value: kong/kong-proxy
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{.CustomRegistries.KongIngress | default .ImageRepository | default .Registries.KongIngress}}{{.Images.KongIngress}}
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /healthz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
+        name: ingress-controller
+        ports:
+        - containerPort: 8080
+          name: webhook
+          protocol: TCP
+        - containerPort: 10255
+          name: cmetrics
+          protocol: TCP
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /readyz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
       serviceAccountName: kong-serviceaccount
-      volumes:
-      - name: kong-serviceaccount-token
-        projected:
-          sources:
-          - serviceAccountToken:
-              expirationSeconds: 3607
-              path: token
-          - configMap:
-              items:
-              - key: ca.crt
-                path: ca.crt
-              name: kube-root-ca.crt
-          - downwardAPI:
-              items:
-              - fieldRef:
-                  apiVersion: v1
-                  fieldPath: metadata.namespace
-                path: namespace
----
-apiVersion: networking.k8s.io/v1
-kind: IngressClass
-metadata:
-  name: kong
-spec:
-  controller: ingress-controllers.konghq.com/kong
\ No newline at end of file
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash
index cfa30a64b..c162a05fb 100644
--- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash
@@ -2,4 +2,3 @@ sha256 0a834a749e86525e0eb16e7e80ce726e7c6a8e8d26fc5cc36c712305024da4e7  buildki
 sha256 27e974e2b07e087f66f0c9c2b43b6f3df6f7e1746a6252580f164427337d668c  buildkit-v0.10.3.linux-arm64.tar.gz
 sha256 8a8c2274852ea4bac6ccf1862a46679e93c013de8c5c0434a3040bab2e0a42a7  buildkit-v0.11.2.linux-arm64.tar.gz
 sha256 252408105ef1c2256980a105f727912603a831d6c57d3243b5d4cbb25fafb1b1  buildkit-v0.11.4.linux-arm64.tar.gz
-sha256 82b7452ffea166d3ef445597f9dbe3fa57c4d651e51ca7a9a581199116905524  buildkit-v0.11.6.linux-arm64.tar.gz
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk
index cb5ecc53f..01c4e6c9a 100644
--- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-BUILDKIT_BIN_AARCH64_VERSION = v0.11.6
-BUILDKIT_BIN_AARCH64_COMMIT = 2951a28cd7085eb18979b1f710678623d94ed578
+BUILDKIT_BIN_AARCH64_VERSION = v0.11.4
+BUILDKIT_BIN_AARCH64_COMMIT = 3abd1ef0c195cdc078d1657cb50f62a2cdc26f8f
 BUILDKIT_BIN_AARCH64_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_AARCH64_VERSION)
 BUILDKIT_BIN_AARCH64_SOURCE = buildkit-$(BUILDKIT_BIN_AARCH64_VERSION).linux-arm64.tar.gz
 
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash
index 667ef5e33..ac277ad96 100644
--- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash
@@ -6,4 +6,3 @@ sha256 1b307268735c8f8e68b55781a6f4c03af38acc1bc29ba39ebaec6d422bccfb25  buildki
 sha256 fbc9c433cf77c5c00db6f797155edc60b44463524ae59a4961699dca15bcee00  buildkit-v0.10.3.linux-amd64.tar.gz
 sha256 6d0fe3f1ec2dce4ed2a5c9baf05fb279225b3b0e3bbee4092304fe284ca7fc47  buildkit-v0.11.2.linux-amd64.tar.gz
 sha256 6de87c88b1da0b1e899371dd4c0b883581401e2ddfb21a065510eeb3a8ac8743  buildkit-v0.11.4.linux-amd64.tar.gz
-sha256 3f66f5bfbe509aadf1c21a26acfa472fe4c19046aa00a2d59b99733da867cd76  buildkit-v0.11.6.linux-amd64.tar.gz
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk
index 459bd10ab..337febf17 100644
--- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-BUILDKIT_BIN_VERSION = v0.11.6
-BUILDKIT_BIN_COMMIT = 2951a28cd7085eb18979b1f710678623d94ed578
+BUILDKIT_BIN_VERSION = v0.11.4
+BUILDKIT_BIN_COMMIT = 3abd1ef0c195cdc078d1657cb50f62a2cdc26f8f
 BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION)
 BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz
 
diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile
index b1891ab99..c9e090a1c 100644
--- a/deploy/kicbase/Dockerfile
+++ b/deploy/kicbase/Dockerfile
@@ -41,7 +41,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui
 # for a kubernetes node image, it doesn't contain much we don't need
 FROM ${UBUNTU_FOCAL_IMAGE} as kicbase
 
-ARG BUILDKIT_VERSION="v0.11.6"
+ARG BUILDKIT_VERSION="v0.11.4"
 ARG FUSE_OVERLAYFS_VERSION="v1.7.1"
 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="1.0.3"
 ARG CRIO_VERSION="1.24"
diff --git a/go.mod b/go.mod
index dd268900f..0bf0ac492 100644
--- a/go.mod
+++ b/go.mod
@@ -15,13 +15,13 @@ require (
 	github.com/cenkalti/backoff/v4 v4.2.1
 	github.com/cheggaaa/pb/v3 v3.1.2
 	github.com/cloudevents/sdk-go/v2 v2.14.0
-	github.com/docker/docker v23.0.6+incompatible
+	github.com/docker/docker v23.0.5+incompatible
 	github.com/docker/go-units v0.5.0
 	github.com/docker/machine v0.16.2
 	github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/google/go-cmp v0.5.9
-	github.com/google/go-containerregistry v0.15.1
+	github.com/google/go-containerregistry v0.15.0
 	github.com/google/slowjam v1.0.1
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-getter v1.7.1
@@ -84,7 +84,7 @@ require (
 require (
 	github.com/Xuanwo/go-locale v1.1.0
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/docker/cli v23.0.6+incompatible
+	github.com/docker/cli v23.0.5+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/google/go-github/v43 v43.0.0
 	github.com/juju/clock v1.0.3
diff --git a/go.sum b/go.sum
index 0bd5598cc..66d97056f 100644
--- a/go.sum
+++ b/go.sum
@@ -560,8 +560,8 @@ github.com/digitalocean/godo v1.78.0/go.mod h1:GBmu8MkjZmNARE7IXRPmkbbnocNN8+uBm
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli v23.0.6+incompatible h1:CScadyCJ2ZKUDpAMZta6vK8I+6/m60VIjGIV7Wg/Eu4=
-github.com/docker/cli v23.0.6+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v23.0.5+incompatible h1:ufWmAOuD3Vmr7JP2G5K3cyuNC4YZWiAsuDEvFVVDafE=
+github.com/docker/cli v23.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
@@ -572,8 +572,8 @@ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r
 github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v23.0.6+incompatible h1:aBD4np894vatVX99UTx/GyOUOK4uEcROwA3+bQhEcoU=
-github.com/docker/docker v23.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v23.0.5+incompatible h1:DaxtlTJjFSnLOXVNUBU1+6kXGz2lpDoEAH6QoxaSg8k=
+github.com/docker/docker v23.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
 github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
@@ -844,8 +844,8 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
-github.com/google/go-containerregistry v0.15.1 h1:RsJ9NbfxYWF8Wl4VmvkpN3zYATwuvlPq2j20zmcs63E=
-github.com/google/go-containerregistry v0.15.1/go.mod h1:wWK+LnOv4jXMM23IT/F1wdYftGWGr47Is8CG+pmHK1Q=
+github.com/google/go-containerregistry v0.15.0 h1:kZjY9l3HtwCsgCYWfHQqtkd1jlq8nhAn3eEobc0gee0=
+github.com/google/go-containerregistry v0.15.0/go.mod h1:wWK+LnOv4jXMM23IT/F1wdYftGWGr47Is8CG+pmHK1Q=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-github/v43 v43.0.0 h1:y+GL7LIsAIF2NZlJ46ZoC/D1W1ivZasT0lnWHMYPZ+U=
 github.com/google/go-github/v43 v43.0.0/go.mod h1:ZkTvvmCXBvsfPpTHXnH/d2hP9Y0cTbvN9kr5xqyXOIc=
diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index 0d6b8cd86..0a1161089 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -123,6 +123,7 @@ echo "driver:    ${DRIVER}"
 echo "runtime:   ${CONTAINER_RUNTIME}"
 echo "job:       ${JOB_NAME}"
 echo "test home: ${TEST_HOME}"
+echo "sudo:      ${SUDO_PREFIX}"
 echo "kernel:    $(uname -v)"
 echo "uptime:    $(uptime)"
 # Setting KUBECONFIG prevents the version check from erroring out due to permission issues
@@ -292,7 +293,7 @@ function cleanup_procs() {
   if [[ "${kprocs}" != "" ]]; then
     echo "error: killing hung kubectl processes ..."
     ps -f -p ${kprocs} || true
-    kill ${kprocs} || true
+    sudo -E kill ${kprocs} || true
   fi
 
 
@@ -302,10 +303,10 @@ function cleanup_procs() {
     echo "Found stale api servers listening on 8443 processes to kill: "
     for p in $none_procs
     do
-      echo "Killing stale none driver: $p"
-      ps -f -p $p || true
-      kill $p || true
-      kill -9 $p || true
+      echo "Kiling stale none driver:  $p"
+      sudo -E ps -f -p $p || true
+      sudo -E kill $p || true
+      sudo -E kill -9 $p || true
     done
   fi
 }
@@ -386,7 +387,7 @@ touch "${JSON_OUT}"
 
 gotestsum --jsonfile "${JSON_OUT}" -f standard-verbose --raw-command -- \
   go tool test2json -t \
-  ${E2E_BIN} \
+  ${SUDO_PREFIX}${E2E_BIN} \
     -minikube-start-args="--driver=${DRIVER} ${EXTRA_START_ARGS}" \
     -test.timeout=${TIMEOUT} -test.v \
     ${EXTRA_TEST_ARGS} \
@@ -483,16 +484,16 @@ else
 fi
 
 echo ">> Cleaning up after ourselves ..."
-timeout 3m ${MINIKUBE_BIN} tunnel --cleanup || true
-timeout 5m ${MINIKUBE_BIN} delete --all --purge >/dev/null 2>/dev/null || true
+timeout 3m ${SUDO_PREFIX}${MINIKUBE_BIN} tunnel --cleanup || true
+timeout 5m ${SUDO_PREFIX}${MINIKUBE_BIN} delete --all --purge >/dev/null 2>/dev/null || true
 cleanup_stale_routes || true
 
-rm -Rf "${MINIKUBE_HOME}" || true
-rm -f "${KUBECONFIG}" || true
-rm -f "${TEST_OUT}" || true
-rm -f "${JSON_OUT}" || true
-rm -f "${HTML_OUT}" || true
-rm -f "${SUMMARY_OUT}" || true
+${SUDO_PREFIX} rm -Rf "${MINIKUBE_HOME}" || true
+${SUDO_PREFIX} rm -f "${KUBECONFIG}" || true
+${SUDO_PREFIX} rm -f "${TEST_OUT}" || true
+${SUDO_PREFIX} rm -f "${JSON_OUT}" || true
+${SUDO_PREFIX} rm -f "${HTML_OUT}" || true
+${SUDO_PREFIX} rm -f "${SUMMARY_OUT}" || true
 
 rmdir "${TEST_HOME}" || true
 echo ">> ${TEST_HOME} completed at $(date)"
diff --git a/hack/update/get_version/get_version.go b/hack/update/get_version/get_version.go
index cc3c98ba1..d1c704311 100644
--- a/hack/update/get_version/get_version.go
+++ b/hack/update/get_version/get_version.go
@@ -41,7 +41,6 @@ var dependencies = map[string]dependency{
 	"hugo":           {"netlify.toml", `HUGO_VERSION = "(.*)"`},
 	"metrics-server": {"pkg/minikube/assets/addons.go", `metrics-server/metrics-server:(.*)@`},
 	"runc":           {"deploy/iso/minikube-iso/package/runc-master/runc-master.mk", `RUNC_MASTER_VERSION = (.*)`},
-	"ubuntu":         {"deploy/kicbase/Dockerfile", `UBUNTU_FOCAL_IMAGE="(.*)"`},
 }
 
 func main() {
diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml
index 7b46b2fcd..770b9d7b8 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml
index 0b14634f7..fe73efd4d 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml
index 0700426ea..1e83c282c 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml b/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml
index 8f06d0c9b..8a879c391 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
+  criSocket: unix:///var/run/crio/crio.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/hack/update/kubernetes_version/templates/v1beta3/crio.yaml b/hack/update/kubernetes_version/templates/v1beta3/crio.yaml
index 8e95541b6..a89c17f24 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/crio.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/crio.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
+  criSocket: unix:///var/run/crio/crio.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/hack/update/kubernetes_version/templates/v1beta3/default.yaml b/hack/update/kubernetes_version/templates/v1beta3/default.yaml
index 5c4ee61fb..a4868e094 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/default.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/default.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/hack/update/kubernetes_version/templates/v1beta3/dns.yaml b/hack/update/kubernetes_version/templates/v1beta3/dns.yaml
index 3387cb9a3..775c22b6d 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/dns.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/dns.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml b/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml
index df980fb54..1a5ee6a99 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/hack/update/kubernetes_version/templates/v1beta3/options.yaml b/hack/update/kubernetes_version/templates/v1beta3/options.yaml
index b60882289..08aae8c19 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/options.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/options.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go
index e92f728a0..3793589ae 100644
--- a/pkg/drivers/kic/types.go
+++ b/pkg/drivers/kic/types.go
@@ -24,10 +24,10 @@ import (
 
 const (
 	// Version is the current version of kic
-	Version = "v0.0.39-1683246328-16426"
+	Version = "v0.0.39-1683022590-16417"
 
 	// SHA of the kic base image
-	baseImageSHA = "c063371f0e8933096fec0d2952100c31c4e17f2898a91dfbf036ee0048f9ee72"
+	baseImageSHA = "8f1b46127412c0840a74bce90a38c80adf6a7ae539f7aa73e2b9e01e1b2ef80c"
 	// The name of the GCR kicbase repository
 	gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
 	// The name of the Dockerhub kicbase repository
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index 08d727fb1..eaafc08b0 100644
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -293,9 +293,9 @@ var Addons = map[string]*Addon{
 			vmpath.GuestAddonsDir,
 			"kong-ingress-controller.yaml",
 			"0640"),
-	}, false, "kong", "3rd party (Kong HQ)", "@gAmUssA", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{
-		"Kong":        "kong:3.2@sha256:f5f51af49fa1f5a7600e60bb51ebd760b16fd020bb16bba2b70d36a54f3d6ac8",
-		"KongIngress": "kong/kubernetes-ingress-controller:2.9.3@sha256:debe488e0f1ac0019f5f36d8185476526cdcec972486886a5e23e27e00960814",
+	}, false, "kong", "3rd party (Kong HQ)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{
+		"Kong":        "kong:2.7@sha256:4d3e93207305ace881fe9e95ac27717b6fbdd9e0ec1873c34e94908a4f4c9335",
+		"KongIngress": "kong/kubernetes-ingress-controller:2.1.1@sha256:60e4102ab2da7f61e9c478747f0762d06a6166b5f300526b237ed7354c3cb4c8",
 	}, map[string]string{
 		"Kong":        "docker.io",
 		"KongIngress": "docker.io",
@@ -729,11 +729,11 @@ var Addons = map[string]*Addon{
 		"Helm3": "docker.io",
 	}),
 	"headlamp": NewAddon([]*BinAsset{
-		MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-namespace.yaml", vmpath.GuestAddonsDir, "headlamp-namespace.yaml", "0640"),
-		MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-service.yaml", vmpath.GuestAddonsDir, "headlamp-service.yaml", "0640"),
-		MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-deployment.yaml.tmpl", vmpath.GuestAddonsDir, "headlamp-deployment.yaml", "0640"),
-		MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-serviceaccount.yaml", vmpath.GuestAddonsDir, "headlamp-serviceaccount.yaml", "0640"),
-		MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "headlamp-clusterrolebinding.yaml", "0640"),
+		MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-namespace.yaml", vmpath.GuestAddonsDir, "headlamp-namespace.yaml", "6040"),
+		MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-service.yaml", vmpath.GuestAddonsDir, "headlamp-service.yaml", "6040"),
+		MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-deployment.yaml.tmpl", vmpath.GuestAddonsDir, "headlamp-deployment.yaml", "6040"),
+		MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-serviceaccount.yaml", vmpath.GuestAddonsDir, "headlamp-serviceaccount.yaml", "6040"),
+		MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "headlamp-clusterrolebinding.yaml", "6040"),
 	}, false, "headlamp", "3rd party (kinvolk.io)", "yolossn", "https://minikube.sigs.k8s.io/docs/handbook/addons/headlamp/",
 		map[string]string{
 			"Headlamp": "headlamp-k8s/headlamp:v0.17.0@sha256:945b59342f792e90666d4eb3fb537c7f66c63e8e4ae661c9624136d2e8c37f78",
@@ -742,7 +742,7 @@ var Addons = map[string]*Addon{
 			"Headlamp": "ghcr.io",
 		}),
 	"cloud-spanner": NewAddon([]*BinAsset{
-		MustBinAsset(addons.CloudSpanner, "cloud-spanner/deployment.yaml", vmpath.GuestAddonsDir, "deployment.yaml", "0640"),
+		MustBinAsset(addons.CloudSpanner, "cloud-spanner/deployment.yaml", vmpath.GuestAddonsDir, "deployment.yaml", "6040"),
 	}, false, "cloud-spanner", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/cloud-spanner/", map[string]string{
 		"CloudSpanner": "cloud-spanner-emulator/emulator:1.5.4@sha256:026cec4d30c4b75ab49e01b1f7b43c4b97485b1df9f79b8a0be3ab156fb6bb68",
 	}, map[string]string{
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go
index c2b73c635..26de90f42 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go
@@ -34,7 +34,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: {{if .CRISocket}}{{.CRISocket}}{{else}}/var/run/dockershim.sock{{end}}
+  criSocket: {{if .CRISocket}}{{if .PrependCriSocketUnix}}unix://{{end}}{{.CRISocket}}{{else}}{{if .PrependCriSocketUnix}}unix://{{end}}/var/run/dockershim.sock{{end}}
   name: "{{.NodeName}}"
   kubeletExtraArgs:
     node-ip: {{.NodeIP}}
diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
index decd753fa..d6b960aca 100644
--- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go
+++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -124,6 +124,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 		KubeProxyOptions           map[string]string
 		ResolvConfSearchRegression bool
 		KubeletConfigOpts          map[string]string
+		PrependCriSocketUnix       bool
 	}{
 		CertDir:           vmpath.GuestKubernetesCertsDir,
 		ServiceCIDR:       constants.DefaultServiceCIDR,
@@ -169,6 +170,9 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 	if version.GTE(semver.MustParse("1.23.0")) {
 		configTmpl = ktmpl.V1Beta3
 	}
+	if version.GTE(semver.MustParse("1.24.0-alpha.2")) {
+		opts.PrependCriSocketUnix = true
+	}
 	klog.Infof("kubeadm options: %+v", opts)
 	b := bytes.Buffer{}
 	if err := configTmpl.Execute(&b, opts); err != nil {
diff --git a/pkg/minikube/command/command_runner.go b/pkg/minikube/command/command_runner.go
index 672ff711d..88b6d5ad3 100644
--- a/pkg/minikube/command/command_runner.go
+++ b/pkg/minikube/command/command_runner.go
@@ -209,10 +209,5 @@ func writeFile(dst string, f assets.CopyableFile, perms os.FileMode) error {
 	if n != int64(f.GetLength()) {
 		return fmt.Errorf("%s: expected to write %d bytes, but wrote %d instead", dst, f.GetLength(), n)
 	}
-
-	if err := w.Chmod(perms); err != nil {
-		return errors.Wrap(err, "chmod")
-	}
-
 	return w.Close()
 }
diff --git a/pkg/minikube/command/exec_runner.go b/pkg/minikube/command/exec_runner.go
index ac0e8e7d9..f9bcdf516 100644
--- a/pkg/minikube/command/exec_runner.go
+++ b/pkg/minikube/command/exec_runner.go
@@ -162,19 +162,23 @@ func (e *execRunner) Copy(f assets.CopyableFile) error {
 		// write to temp location ...
 		tmpfile, err := os.CreateTemp("", "minikube")
 		if err != nil {
-			return errors.Wrap(err, "error creating tempfile")
+			return errors.Wrapf(err, "error creating tempfile")
 		}
 		defer os.Remove(tmpfile.Name())
-
-		if err := writeFile(tmpfile.Name(), f, os.FileMode(perms)); err != nil {
+		err = writeFile(tmpfile.Name(), f, os.FileMode(perms))
+		if err != nil {
 			return errors.Wrapf(err, "error writing to tempfile %s", tmpfile.Name())
 		}
 
-		// ... then use sudo to move to target
-		if _, err := e.RunCmd(exec.Command("sudo", "cp", "-a", tmpfile.Name(), dst)); err != nil {
+		// ... then use sudo to move to target ...
+		_, err = e.RunCmd(exec.Command("sudo", "cp", "-a", tmpfile.Name(), dst))
+		if err != nil {
 			return errors.Wrapf(err, "error copying tempfile %s to dst %s", tmpfile.Name(), dst)
 		}
-		return nil
+
+		// ... then fix file permission that should have been fine because of "cp -a"
+		err = os.Chmod(dst, os.FileMode(perms))
+		return err
 	}
 	return writeFile(dst, f, os.FileMode(perms))
 }
diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go
index 1d6cd4ca4..b27764041 100644
--- a/pkg/minikube/download/iso.go
+++ b/pkg/minikube/download/iso.go
@@ -41,7 +41,7 @@ const fileScheme = "file"
 // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
 func DefaultISOURLs() []string {
 	v := version.GetISOVersion()
-	isoBucket := "minikube-builds/iso/16426"
+	isoBucket := "minikube-builds/iso/16417"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
index 9deb00400..742a00e50 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/node/cache.go
@@ -87,9 +87,7 @@ func handleDownloadOnly(cacheGroup, kicGroup *errgroup.Group, k8sVersion, contai
 		exit.Error(reason.InetCacheKubectl, "Failed to cache kubectl", err)
 	}
 	waitCacheRequiredImages(cacheGroup)
-	if driver.IsKIC(driverName) {
-		waitDownloadKicBaseImage(kicGroup)
-	}
+	waitDownloadKicBaseImage(kicGroup)
 	if err := saveImagesToTarFromConfig(); err != nil {
 		exit.Error(reason.InetCacheTar, "Failed to cache images to tar", err)
 	}
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 273a59a2a..1e854543d 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -28,6 +28,7 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/minikube/pkg/kapi"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/machine"
 )
 
@@ -155,6 +156,10 @@ func Delete(cc config.ClusterConfig, name string) (*config.Node, error) {
 
 // Retrieve finds the node by name in the given cluster
 func Retrieve(cc config.ClusterConfig, name string) (*config.Node, int, error) {
+	if driver.BareMetal(cc.Driver) {
+		name = "m01"
+	}
+
 	for i, n := range cc.Nodes {
 		if n.Name == name {
 			return &n, i, nil
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
index 45a512dfc..ef59d448e 100644
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -26,7 +26,7 @@ minikube start [flags]
       --apiserver-names strings           A set of apiserver names which are used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine
       --apiserver-port int                The apiserver listening port (default 8443)
       --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
-      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.39-1683246328-16426@sha256:c063371f0e8933096fec0d2952100c31c4e17f2898a91dfbf036ee0048f9ee72")
+      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.39-1683022590-16417@sha256:8f1b46127412c0840a74bce90a38c80adf6a7ae539f7aa73e2b9e01e1b2ef80c")
       --binary-mirror string              Location to fetch kubectl, kubelet, & kubeadm binaries from.
       --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
       --cert-expiration duration          Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)
diff --git a/site/content/en/docs/drivers/includes/none_usage.inc b/site/content/en/docs/drivers/includes/none_usage.inc
index 452612e48..0d62547fa 100644
--- a/site/content/en/docs/drivers/includes/none_usage.inc
+++ b/site/content/en/docs/drivers/includes/none_usage.inc
@@ -4,8 +4,10 @@ A Linux VM with the following:
 
 * systemd or OpenRC
 * a Container Runtime Interface (CRI), such as Docker or CRI-O
-* [containernetworking-plugins]({{<ref "/docs/faq/#how-do-i-install-containernetworking-plugins-for-none-driver" >}})
-* [cri-dockerd](https://github.com/Mirantis/cri-dockerd) (Only if using Docker CRI)
+
+If using Kubernetes v1.24+ & Docker CRI you will also need the following:
+* [cri-dockerd](https://github.com/Mirantis/cri-dockerd)
+* [containernetworking-plugins](https://github.com/containernetworking/plugins)
 
 This VM must also meet the [kubeadm requirements](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/), such as:
 
@@ -19,8 +21,10 @@ This VM must also meet the [kubeadm requirements](https://kubernetes.io/docs/set
 
 ## Usage
 
+The none driver requires minikube to be run as root, until [#3760](https://github.com/kubernetes/minikube/issues/3760) can be addressed.
+
 ```shell
-minikube start --driver=none
+sudo -E minikube start --driver=none
 ```
 
 To make `none` the default driver:
diff --git a/site/content/en/docs/drivers/none.md b/site/content/en/docs/drivers/none.md
index be3b44195..42e35efbd 100644
--- a/site/content/en/docs/drivers/none.md
+++ b/site/content/en/docs/drivers/none.md
@@ -68,7 +68,7 @@ As Kubernetes has full access to both your filesystem as well as your docker ima
 * Many `minikube` commands are not supported, such as: `dashboard`, `mount`, `ssh`
 * minikube with the `none` driver has a confusing permissions model, as some commands need to be run as root ("start"), and others by a regular user ("dashboard")
 * CoreDNS detects resolver loop, goes into CrashLoopBackOff - [#3511](https://github.com/kubernetes/minikube/issues/3511)
-* Some versions of Linux have a version of docker that is newer than what Kubernetes expects. To overwrite this, run minikube with the following parameters: `minikube start --driver=none --kubernetes-version v1.11.8 --extra-config kubeadm.ignore-preflight-errors=SystemVerification`
+* Some versions of Linux have a version of docker that is newer than what Kubernetes expects. To overwrite this, run minikube with the following parameters: `sudo -E minikube start --driver=none --kubernetes-version v1.11.8 --extra-config kubeadm.ignore-preflight-errors=SystemVerification`
 
 * [Full list of open 'none' driver issues](https://github.com/kubernetes/minikube/labels/co%2Fnone-driver)
 
diff --git a/site/content/en/docs/faq/_index.md b/site/content/en/docs/faq/_index.md
index 13677ad58..d75c9c98e 100644
--- a/site/content/en/docs/faq/_index.md
+++ b/site/content/en/docs/faq/_index.md
@@ -188,18 +188,5 @@ Minikube is an open community and we are always willing to help users from any c
   
 3. Use a proxy server/VPN, if you have one. <br/> *Note: please obey the local laws. In some area, using an unauthorized proxy server/VPN is ILLEGAL* 
 
-## How do I install containernetworking-plugins for none driver?
 
-Go to [containernetworking-plugins](https://github.com/containernetworking/plugins/releases) to find the latest version.
 
-Then execute the following:
-```shell
-CNI_PLUGIN_VERSION="<version_here>"
-CNI_PLUGIN_TAR="cni-plugins-linux-amd64-$CNI_PLUGIN_VERSION.tgz" # change arch if not on amd64
-CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin"
-
-curl -LO "https://github.com/containernetworking/plugins/releases/download/$CNI_PLUGIN_VERSION/$CNI_PLUGIN_TAR"
-sudo mkdir -p "$CNI_PLUGIN_INSTALL_DIR"
-sudo tar -xf "$CNI_PLUGIN_TAR" -C "$CNI_PLUGIN_INSTALL_DIR"
-rm "$CNI_PLUGIN_TAR"
-```
diff --git a/site/content/en/docs/handbook/addons/kong-ingress.md b/site/content/en/docs/handbook/addons/kong-ingress.md
index f197d073b..75ee7e76e 100644
--- a/site/content/en/docs/handbook/addons/kong-ingress.md
+++ b/site/content/en/docs/handbook/addons/kong-ingress.md
@@ -61,17 +61,17 @@ $ curl -v localhost
 * Connected to localhost (127.0.0.1) port 80 (#0)
 > GET / HTTP/1.1
 > Host: localhost
-> User-Agent: curl/7.86.0
+> User-Agent: curl/7.77.0
 > Accept: */*
 >
 * Mark bundle as not supporting multiuse
 < HTTP/1.1 404 Not Found
-< Date: Wed, 03 May 2023 01:34:31 GMT
+< Date: Tue, 25 Jan 2022 22:35:27 GMT
 < Content-Type: application/json; charset=utf-8
 < Connection: keep-alive
 < Content-Length: 48
 < X-Kong-Response-Latency: 0
-< Server: kong/3.2.2
+< Server: kong/2.7.0
 <
 * Connection #0 to host localhost left intact
 {"message":"no Route matched with those values"}%
@@ -79,125 +79,70 @@ $ curl -v localhost
 
 ## Creating Ingress object
 
-To proxy requests, you need an upstream application to proxy to. 
-Deploying this echo server provides a simple application that returns information about the Pod it’s running in:
+Let's create a service.
+As an example, we use `type=ExternalName` to point to https://httpbin.org
 
 ```bash
 echo "
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    app: echo
-  name: echo
+  name: proxy-to-httpbin
 spec:
   ports:
-  - port: 1025
-    name: tcp
-    protocol: TCP
-    targetPort: 1025
-  - port: 1026
-    name: udp
-    protocol: TCP
-    targetPort: 1026
-  - port: 1027
-    name: http
-    protocol: TCP
-    targetPort: 1027
-  selector:
-    app: echo
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: echo
-  name: echo
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: echo
-  strategy: {}
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        app: echo
-    spec:
-      containers:
-      - image: kong/go-echo:latest
-        name: echo
-        ports:
-        - containerPort: 1027
-        env:
-          - name: NODE_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.nodeName
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: POD_IP
-            valueFrom:
-              fieldRef:
-                fieldPath: status.podIP
-        resources: {}
-" | kubectl apply -f -
+  - protocol: TCP
+    port: 80
+  type: ExternalName
+  externalName: httpbin.org
+" | kubectl create -f -
 ```
 
-Next, we will create routing configuration to proxy `/echo` requests to the echo server:
+Next, we will create the ingress object points to httpbin service.
 
 ```bash
-echo "
+echo '
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: echo
+  name: proxy-from-k8s-to-httpbin
   annotations:
-    konghq.com/strip-path: 'true'
+    konghq.com/strip-path: "true"
 spec:
   ingressClassName: kong
   rules:
-  - host: kong.example
-    http:
+  - http:
       paths:
-      - path: /echo
+      - path: /foo
         pathType: ImplementationSpecific
         backend:
           service:
-            name: echo
+            name: proxy-to-httpbin
             port:
-              number: 1027
-" | kubectl apply -f -
+              number: 80
+' | kubectl create -f -
 ```
 
 Let's test our ingress object.
 
 ```bash
-$ curl -i localhost/echo -H "Host: kong.example"
+$ curl -i localhost/foo -H "Host: httpbin.org"
+
 
 HTTP/1.1 200 OK
 Content-Type: text/plain; charset=utf-8
-Content-Length: 133
+Content-Length: 4
 Connection: keep-alive
-Date: Wed, 03 May 2023 01:59:25 GMT
+X-App-Name:
+X-App-Version: 0.2.4
+Date: Tue, 25 Jan 2022 22:44:57 GMT
 X-Kong-Upstream-Latency: 1
 X-Kong-Proxy-Latency: 1
-Via: kong/3.2.2
+Via: kong/2.7.0
 
-Welcome, you are connected to node minikube.
-Running on Pod echo-f4fdf987c-qdv7s.
-In namespace default.
-With IP address 10.244.0.6.
+foo
 ```
 
 ## Next
 
 **Note:** Read more about KIC and different use cases in official
-[documentation](https://docs.konghq.com/kubernetes-ingress-controller/latest/guides/overview/).
+[documentation](https://docs.konghq.com/kubernetes-ingress-controller/2.1.x/guides/overview/).
diff --git a/site/content/en/docs/presentations/_index.md b/site/content/en/docs/presentations/_index.md
index 941d16916..7ca24c149 100644
--- a/site/content/en/docs/presentations/_index.md
+++ b/site/content/en/docs/presentations/_index.md
@@ -9,11 +9,6 @@ Presentations about the minikube project, mostly from the Kubernetes blog and th
 
 ## Conferences
 
-### KubeCon EU 2023 (Amsterdam, Netherlands)
-
-* [Minikube from CLI to GUI! - YouTube](https://youtu.be/74X1RmqfUzs) (38:35)
-  * Medya Ghazizadeh, Google
-
 ### KubeCon EU 2022 (Valencia, Spain)
 
 * [Deep Dive into Minikube - YouTube](https://youtu.be/Iyq_MlSku-I) (38:37)
diff --git a/site/content/en/docs/tutorials/kubernetes_101/_index.md b/site/content/en/docs/tutorials/kubernetes_101/_index.md
deleted file mode 100644
index 0e626323c..000000000
--- a/site/content/en/docs/tutorials/kubernetes_101/_index.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: "Kubernetes 101"
-weight: -1
-description: >     
-  Tutorial showing how to deploy, explore, expose, scale, and update your applications
---- 
diff --git a/site/content/en/docs/tutorials/kubernetes_101/module1.md b/site/content/en/docs/tutorials/kubernetes_101/module1.md
deleted file mode 100644
index fdcf12e5a..000000000
--- a/site/content/en/docs/tutorials/kubernetes_101/module1.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: "Module 1 - Create a Kubernetes Cluster"
-weight: 1
---- 
-
-**Difficulty**: Beginner
-**Estimated Time:** 10 minutes
-
-The goal of this scenario is to deploy a local development Kubernetes cluster using minikube
-
-## Step 1 - Cluster up and running
-
-If you haven't already, first [install minikube]({{< ref "/docs/start" >}}). Check that it is properly installed, by running the *minikube version* command:
-
-```shell
-minikube version
-```
-
-Once minikube is installed, start the cluster, by running the *minikube start* command:
-
-```shell
-minikube start
-```
-
-Great! You now have a runnning Kubernetes cluster in your terminal. minikube started a virtual environment for you, and a Kubernetes cluster is now running in that environment.
-
-## Step 2 - Cluster version
-
-To interact with Kubernetes during this bootcamp we'll use the command line interface, kubectl. We'll explain kubectl in detail in the next modules, but for now, we're just going to look at some cluster information. To check if kubectl is installed you can run the *kubectl version* command:
-
-```shell
-kubectl version
-```
-
-OK, kubectl is configured and we can see both the version of the client and as well as the server. The client version is the kubectl version; the server version is the Kubernetes version installed on the master. You can also see details about the build.
-
-## Step 3 - Cluster details
-
-Let's view the cluster details. We'll do that by running *kubectl cluster-info*:
-
-```shell
-kubectl cluster-info
-```
-
-During this tutorial, we'll be focusing on the command line for deploying and exploring our application. To view the nodes in the cluster, run the *kubectl get nodes* command:
-
-```shell
-kubectl get nodes
-```
-
-This command shows all nodes that can be used to host our applications. Now we have only one node, and we can see that its status it ready (it is ready to accept applications for deployment).
-
-{{% button link="/docs/tutorials/kubernetes_101/module2" %}}
diff --git a/site/content/en/docs/tutorials/kubernetes_101/module2.md b/site/content/en/docs/tutorials/kubernetes_101/module2.md
deleted file mode 100644
index a3bda9c5c..000000000
--- a/site/content/en/docs/tutorials/kubernetes_101/module2.md
+++ /dev/null
@@ -1,93 +0,0 @@
----
-title: "Module 2 - Deploy an app"                  
-weight: 2
---- 
-
-**Difficulty**: Beginner
-**Estimated Time:** 10 minutes
-
-The goal of this scenario is to help you deploy your first app on Kubernetes using kubectl. You will learn the basics about kubectl cli and how to interact with your application.
-
-## Step 1 - kubectl basics
-
-Type kubectl in the terminal to see its usage. The common format of a kubectl command is: kubectl action resource. This performs the specified action (like create, describe) on the specified resource (like node, container). You can use `--help` after the command to get additional info about possible parameters (`kubectl get nodes --help`).
-
-Check the kubectl is configured to talk to your cluster, by running the `kubectl version` command:
-
-```shell
-kubectl version
-```
-
-OK, kubectl is installed and you can see both the client and the server versions.
-
-To view the nodes in the cluster, run the `kubectl get nodes` command:
-
-```shell
-kubectl get nodes
-```
-
-Here we see the available nodes (1 in our case). Kubernetes will choose where to deploy our application based on Node available resources.
-
-## Step 2 - Deploy our app
-
-Let's deploy our first app on Kubernetes with the `kubectl create deployment` command. We need to provide the deployment name and app image location (include the full repository url for images hosted outside Docker Hub).
-
-```shell
-kubectl create deployment kubernetes-bootcamp --image=gcr.io/google-samples/kubernetes-bootcamp:v1
-```
-
-Great! You just deployed your first application by creating a deployment. This performed a few things for you:
-
-- searched for a suitable node where an instance of the application could be run (we have only 1 available node)
-- scheduled the application to run on that Node
-- configured the cluster to reschedule the instance on a new Node when needed
-
-To list your deployments use the `get deployments` command:
-
-```shell
-kubectl get deployments
-```
-
-We see that there is 1 deployment running a single instance of your app. The instance is running inside a Docker container on your node.
-
-## Step 3 - View our app
-
-Pods that are running inside Kubernetes are running on a private, isolated network. By default they are visible from other pods and services within the same Kubernetes cluster, but not outside that network. When we use `kubectl`, we're interacting through an API endpoint to communicate with our application.
-
-We will cover other options on how to expose your application outside the Kubernetes cluster in Module 4.
-
-The `kubectl` command can create a proxy that will forward communications into the cluster-wide, private network. The proxy can be terminiated by pressing control-C and won't show any output while its running.
-
-We will open a second terminal window to run the proxy.
-
-```shell
-echo -e "Starting Proxy. After starting it will not output a response. Please return to your original terminal window\n"; kubectl proxy
-```
-
-We now have a connection between our host (the online terminal) and the Kubernetes cluster. The proxy enabled direct access to the API from these terminals.
-
-You can see all those APIs hosted through the proxy endpoint. For example, we can query the version directly through the API using the `curl` command:
-```shell
-curl http://localhost:8001/version
-```
-
-*Note: The proxy was run in a new tab, and the recent commands were executed in the original tab. The proxy still runs in the second tab, and this allowed our curl command to work using `localhost:8001`.*
-
-**If Port 8001 is not accessible, ensure that the `kubectl proxy` started above is running.**
-
-The API server will automatically create an endpoint for each pod, based on the pod name, that is also accessible through the proxy.
-
-First we need to get the Pod name, and we'll store in the environment variable POD_NAME:
-```shell
-export POD_NAME=$(kubectl get pods -o go-template --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
-echo Name of the Pod: $POD_NAME
-```
-
-You can access the Pod through the API by running:
-```shell
-curl http://localhost:8001/api/v1/namespaces/default/pods/$PODNAME
-```
-
-In order for the new deployment to be accessible without using the Proxy, a Service is required which will be explained in the next modules.
-
-{{% button link="/docs/tutorials/kubernetes_101/module3" %}}
diff --git a/site/content/en/docs/tutorials/kubernetes_101/module3.md b/site/content/en/docs/tutorials/kubernetes_101/module3.md
deleted file mode 100644
index 794d00183..000000000
--- a/site/content/en/docs/tutorials/kubernetes_101/module3.md
+++ /dev/null
@@ -1,96 +0,0 @@
----
-title: "Module 3 - Explore your app"                                
-weight: 3
---- 
-
-**Difficulty**: Beginner
-**Estimated Time:** 10 minutes
-
-In this scenario you will learn how to troubleshoot Kubernetes applications using the kubectl get, describe, logs and exec commands.
-
-## Step 1 - Check application configuration
-
-Let's verify that the application we deployed in the previous scenario is running. We'll use the `kubectl get` command and look for existing Pods:
-
-```shell
-kubectl get pods
-```
-
-Next, to view what containers are inside that Pod and what images are used to build those containers we run the `describe pods` command:
-
-```shell
-kubectl describe pods
-```
-
-We see here details about the Pod's container: IP address, the ports used and a list of events related to the lifecycle of the Pod.
-
-The output of the `describe` command is extensive and covers some concepts that we didn't explain yet, but don't worry, they will become familiar by the end of this bootcamp.
-
-*Note: the describe command can be used to get detailed information about most of the Kubernetes primitives: node, pods, deployments. The describe output is designed to be human readable, not to be scripted against.*
-
-## Step 2 - Show the app in the terminal
-
-Recall that Pods are running in an isolated, private network - so we need to proxy access to them so we can debug and interact with them. To do this, we'll use the `kubectl proxy` command to run a proxy in a second terminal window. Run the command below in a new terminal window to run the proxy:
-
-```shell
-echo -e "Starting Proxy. After starting it will not output a response. Please return to your original terminal window\n"; kubectl proxy
-```
-
-Now again, we'll get the Pod name and query that pod directly through the proxy. To get the Pod name and store it in the POD_NAME ennvironment variable:
-
-```shell
-export POD_NAME=$(kubectl get pods -o go-template --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
-echo Name of the Pod: $POD_NAME
-```
-
-To see the output of our application, run a `curl` request.
-
-```shell
-curl http://localhost:8001/api/v1/namespaces/default/pods/$POD_NAME
-```
-
-The url is the route to the API of the Pod.
-
-## Step 3 - View the container logs
-
-Anything that the application would normally send to `STDOUT` becomes logs for the container within the Pod. We can retrieve these logs using the `kubectl logs` command:
-
-```shell
-kubectl logs $POD_NAME
-```
-
-*Note: We don't need to specify the container name, because we only have one container inside the pod.
-
-## Step 4 - Executing command on the container
-
-We can execute commands directly on the container once the Pod is up and running. For this, we use the `exec` command and use the name of the Pod as a paramater. Let's list the environment variables:
-
-```shell
-kubectl exec $POD_NAME -- env
-```
-
-Again, worth mentioning that the name of the container itself can be omitted since we only have a single container in the Pod.
-
-Next let's start a bash session in the Pod's container:
-
-```shell
-kubectl exec -ti $POD_NAME -- bash
-```
-
-We have now an open console on the container where we run our NodeJS application. The source code of the app is in the server.js file:
-
-```shell
-cat server.js
-```
-
-You can check that the application is up by running a curl command:
-
-```shell
-curl localhost:8080
-```
-
-*Note: here we used localhost because we executed the command inside the NodeJS Pod. If you cannot connect to localhost:8080, check to make sure you have run the kubectl exec command and are launching the command from within the Pod*
-
-To close your container connection type `exit`.
-
-{{% button link="/docs/tutorials/kubernetes_101/module4" %}}
diff --git a/site/content/en/docs/tutorials/kubernetes_101/module4.md b/site/content/en/docs/tutorials/kubernetes_101/module4.md
deleted file mode 100644
index 3561655af..000000000
--- a/site/content/en/docs/tutorials/kubernetes_101/module4.md
+++ /dev/null
@@ -1,137 +0,0 @@
----
-title: "Module 4 - Expose your app publicly"                                
-weight: 4
---- 
-
-**Difficulty**: Beginner
-**Estimated Time:** 10 minutes
-
-In this scenario you will learn how to expose Kubernetes applications outside the cluster using the kubectl expose command. You will also learn how to view and apply labels to objects with the kubectl label command.
-
-## Step 1 - Create a new service
-
-Let's verify that our application is running. We'll use the `kubectl get` command and look for existing Pods:
-
-```shell
-kubectl get pods
-```
-
-Next, let's list the current Services from our cluster:
-
-```shell
-kubectl get services
-```
-
-We have a Service called Kubernetes that is created by default when minikube starts the cluster. To create a new service and expose it to external traffic we'll use the expose command with NodePort as parameter.
-
-```shell
-kubectl expose deployment/kubernetes-bootcamp --type="NodePort" --port 8080
-```
-
-Let's run again the `get services` command:
-
-```shell
-kubectl get services
-```
-
-**Note for Docker Desktop users:** Due to Docker Desktop networking limitations, by default you're unable to access pods directly from the host. Run `minikube service kubernetes-bootcamp`, this will create a SSH tunnel from the pod to your host and open a window in your default browser that's connected to the service. The tunnel can be terminated by pressing control-C, then continue on to Step 2.
-
-We have now a running Service called kubernetes-bootcamp. Here we see that the Service received a unique cluster-IP, an internal port and an external-IP (the IP of the Node).
-
-To find out what port was opened externally (by the NodePort option) we'll run the `describe service` command:
-
-```shell
-kubectl describe services/kubernetes-bootcamp
-```
-
-Create an environment variable called NODE_PORT that has the value of the Node port assigned:
-
-```shell
-export NODE_PORT=$(kubectl get services/kubernetes-bootcamp -o go-template='{{(index .spec.ports 0).nodePort}}')
-echo NODE_PORT=$NODE_PORT
-```
-
-Now we can test that the app is exposed outside of the cluster using `curl`, the IP of the Node and the externally exposed port:
-
-```shell
-curl $(minikube ip):$NODE_PORT
-```
-
-And we get a response from the server. The Service is exposed.
-
-## Step 2 - Using labels
-
-The Deployment created automatically a label for our Pod. With `describe deployment` command you can see the name of the label:
-
-```shell
-kubectl describe deployment
-```
-
-Let's use this label to query our list of Pods. We'll use the `kubectl get pods` command with `-l` as a parameter, followed by the label values:
-
-```shell
-kubectl get pods -l app=kubernetes-bootcamp
-```
-
-You can do the same to list the existing services:
-
-```shell
-kubectl get services -l app=kubernetes-bootcamp
-```
-
-Get the name of the Pod and store it in the POD_NAME environment variable:
-
-```shell
-export POD_NAME=$(kubectl get pods -o go-template --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
-echo Name of the Pod: $POD_NAME
-```
-
-To apply a new label we use the label command followed by the object type, object name and the new label:
-
-```shell
-kubectl label pods $POD_NAME version=v1
-```
-
-This will apply a new label to our Pod (we pinned the application version to the Pod), and we can check it with the describe pod command:
-
-```shell
-kubectl describe pods $POD_NAME
-```
-
-We see here that the label is attached new to our Pod. And we can query now the list of pods using the new label:
-
-```shell
-kubectl get pods -l version=v1
-```
-
-And we see the Pod.
-
-## Step 3 - Deleting a service
-
-To delete Services you can use the `delete service` command. Labels can be used also here:
-
-```shell
-kubectl delete service -l app=kubernetes-bootcamp
-```
-
-Confirm that the service is gone:
-
-```shell
-kubectl get services
-```
-
-This confirms that our Service was removed. To confirm that route is not exposed anymore you can `curl` the previously exposed IP and port:
-
-```shell
-curl $(minikube ip):$NODE_PORT
-```
-
-This proces that the app is not reachable anymore from outside of the cluster. You can confirm that the app is still running with a curl inside the pod:
-
-```shell
-kubectl exec -ti $POD_NAME -- curl localhost:8080
-```
-
-We see here that the application is up. This is because the Deployment is managing the application. To shut down the application, you would need to delete the Deployment as well.
-
-{{% button link="/docs/tutorials/kubernetes_101/module5" %}}
diff --git a/site/content/en/docs/tutorials/kubernetes_101/module5.md b/site/content/en/docs/tutorials/kubernetes_101/module5.md
deleted file mode 100644
index a149bbf8b..000000000
--- a/site/content/en/docs/tutorials/kubernetes_101/module5.md
+++ /dev/null
@@ -1,126 +0,0 @@
----
-title: "Module 5 - Scale up your app"
-weight: 5
----
-
-**Difficulty**: Beginner
-**Estimated Time:** 10 minutes
-
-The goal of this scenario is to scale a deployment with kubectl scale and to see the load balancing in action
-
-## Step 1 - Scaling a deployment
-
-First, let's recreate the Deployment we deleted in the previous module:
-
-```shell
-kubectl expose deployment/kubernetes-bootcamp --type="NodePort" --port 8080
-```
-
-To list your deployments use the `get deployment` command:
-
-```shell
-kubectl get deployments
-```
-
-The output should be similar to:
-
-```shell
-NAME                  READY   UP-TO_DATE   AVAILABLE   AGE
-kubernetes-bootcamp   1/1     1            1           11m
-```
-
-We should have 1 Pod. If not, run the command again. This shows:
-
-- *NAME* lists the names of the Deployments in the cluster.
-- *READY* shows the ratio of CURRENT/DESIRED replicas
-- *UP-TO-DATE* displays the number of replicas that have been updated to achieve the desired state.
-- *AVAILABLE* displays how many replicas of the application are available to your users.
-- *AGE* displays the amount of time that the application has been running.
-
-To see the ReplicaSet created by the Deployment, run:
-
-```shell
-kubectl get rs
-```
-
-Notice that the name of the ReplicaSet is always formatted as `[DEPLOYMENT-NAME]-[RANDOM-STRING]`. The random string is randomly generated and uses the pod-template-hash as a seed.
-
-Two important columns of this command are:
-
-- *DESIRED* displays the desired number of replicas of the application, which you define when you create the Deployment. This is the desired state.
-- *CURRENT* displays how many replicas are currently running.
-
-Next, let's scan the Deployment to 4 replicas. We'll use the `kubectl scale` command, following by the deployment type, name and desired number of instances:
-
-```shell
-kubectl scale deployments/kubernetes-bootcamp --replicas=4
-```
-
-To list your Deployments once again, use `get deployments`:
-
-```shell
-kubectl get deployments
-```
-
-The change was applied, and we have 4 instances of the application available. Next, let's check if the number of Pods changed:
-
-```shell
-kubectl get pods -o wide
-```
-
-There are 4 Pods now, with different IP addresses. The change was registered in the Deployment events log. The check that, use the describe command:
-
-```shell
-kubectl describe deployments/kubernetes-bootcamp
-```
-
-You can also view in the output of this command that there are 4 replicas now.
-
-## Step 2 - Load Balancing
-
-Let's check that the Service is load-balancing the traffic. To find out the exposed IP and Port we can use the describe service as we learned in the previous Module:
-
-```shell
-kubectl describe services/kubernetes-bootcamp
-```
-
-**Note for Docker Desktop users:** Due to Docker Desktop networking limitations, by default you're unable to access pods directly from the host. Run `minikube service kubernetes-bootcamp`, this will create a SSH tunnel from the pod to your host and open a window in your default browser that's connected to the service. Refresh the browser page to see the load-balancing working. The tunnel can be terminated by pressing control-C, then continue on to Step 3.
-
-Create an environment variable called NODE_PORT that has a value as the Node port:
-
-```shell
-export NODE_PORT=$(kubectl get services/kubernetes-bootcamp -o go-template='{{(index .spec.ports 0).nodePort}}')
-echo NODE_PORT=$NODE_PORT
-```
-
-Next, we'll do a `curl` to the exposed IP and port. Execute the command mulitple times:
-
-```shell
-curl $(minikube ip):$NODE_PORT
-```
-
-We hit a different Pod with every request. This demonstrates that the load-balancing is working.
-
-## Step 3 - Scale Down
-
-To scale down the Service to 2 replicas, run again the `scale` command:
-
-```shell
-kubectl scale deployments/kubernetes-bootcamp --replicas=2
-```
-
-List the Deployments to check if the change was applied with the `get deployments` command:
-
-```shell
-kubectl get deployments
-```
-
-The number of replicas decreased to 2. List the number of Pods, with `get pods`:
-
-```shell
-kubectl get pods -o wide
-```
-
-This confirms that 2 Pods were terminated.
-
-{{% button link="/docs/tutorials/kubernetes_101/module6" %}}
diff --git a/site/content/en/docs/tutorials/kubernetes_101/module6.md b/site/content/en/docs/tutorials/kubernetes_101/module6.md
deleted file mode 100644
index 37f6ddee0..000000000
--- a/site/content/en/docs/tutorials/kubernetes_101/module6.md
+++ /dev/null
@@ -1,133 +0,0 @@
----
-title: "Module 6 - Update your app"
-weight: 6
----
-
-**Difficulty:** Beginner
-**Estimated Time:** 10 minutes
-
-The goal of this scenario is to update a deployed application with kubectl set image and to rollback with the rollout undo command.
-
-## Step 1 - Update the version of the app
-
-To list your deployments, run the `get deployments` command:
-
-```shell
-kubectl get deployments
-```
-
-To list the running Pods, run the `get pods` command:
-
-```shell
-kubectl get pods
-```
-
-To view the current image version of the app, run the `describe pods` command and look for the `Image` field:
-
-```shell
-kubectl describe pods
-```
-
-To update the image of the application to version 2, use the `set image` command, followed by the deployment name and the new image version:
-
-```shell
-kubectl set image deployments/kubernetes-bootcamp kubernetes-bootcamp=jocatalin/kubernetes-bootcamp:v2
-```
-
-The command notified the Deployment to use a different image for your app and initiated a rolling update. Check the status of the new Pods, and view the old one terminating with the `get pods` command:
-
-```shell
-kubectl get pods
-```
-
-## Step 2 - Verify an update
-
-First, check that the app is running. To find the exposed IP and Port, run the `describe service` command:
-
-```shell
-kubectl describe services/kubernetes-bootcamp
-```
-
-**Note for Docker Desktop users:** Due to Docker Desktop networking limitations, by default you're unable to access pods directly from the host. Run `minikube service kubernetes-bootcamp`, this will create a SSH tunnel from the pod to your host and open a window in your default browser that's connected to the service. The tunnel can be terminated by pressing control-C, then continue the tutorial after the `curl $(minikube ip):$NODE_PORT` command.
-
-Create an environment variable called `NODE_PORT` that has the value of the Node port assigned:
-
-```shell
-export NODE_PORT=$(kubectl get services/kubernetes-bootcamp -o go-template='{{(index .spec.ports 0).nodePort}}')
-echo NODE_PORT=$NODE_PORT
-```
-
-Next, do a `curl` to the exposed IP and port:
-
-```shell
-curl $(minikube ip):$NODE_PORT
-```
-
-Every time you run the `curl` command, you will hit a different Pod. Notice that all Pods are running the latest version (v2).
-
-You can also confirm the update by running the `rollout status` command:
-
-```shell
-kubectl rollout status deployments/kubernetes-bootcamp
-```
-
-To view the current image version of the app, run the `describe pods` command:
-
-```shell
-kubectl describe pods
-```
-
-In the `Image` field of the output, verify that you are running the latest image version (v2).
-
-
-## Step 3 - Rollback an update
-
-Let's perform another update, and deploy an image tagged with `v10`:
-
-```shell
-kubectl set image deployments/kubernetes-bootcamp kubernetes-bootcamp=gcr.io/google-samples/kubernetes-bootcamp:v10
-```
-
-Use `get deployments` to see the status of the deployment:
-
-```shell
-kubectl get deployments
-```
-
-Notice that the output doesn't list the desired number of available Pods. Run the `get pods` command to list all Pods:
-
-```shell
-kubectl get pods
-```
-
-Notice that some of the Pods have a status of `ImagePullBackOff`.
-
-To get more insight into the problem, run the `describe pods` command:
-
-```shell
-kubectl describe pods
-```
-
-In the `Events` section of the output for the affected Pods, notice that the `v10` image version did not exist in the repository.
-
-To roll back the deployment to your last working version, use the `rollout undo` command:
-
-```shell
-kubectl rollout undo deployments/kubernetes-bootcamp
-```
-
-The `rollout undo` command reverts the deployment to the previous known state (v2 of the image). Updates are versioned and you can revert to any previously known state of a deployment.
-
-Use the `get pods` commands to list the Pods again:
-
-```shell
-kubectl get pods
-```
-
-Four Pods are running. To check the image deployed on these Pods, use the `describe pods` command:
-
-```shell
-kubectl describe pods
-```
-
-The deployment is once again using a stable version of the app (v2). The rollback was successful.
diff --git a/site/layouts/partials/hooks/head-end.html b/site/layouts/partials/hooks/head-end.html
index 55c9fedf8..3561d7343 100644
--- a/site/layouts/partials/hooks/head-end.html
+++ b/site/layouts/partials/hooks/head-end.html
@@ -1,7 +1,6 @@
 <!-- start: minikube override head-end partial -->
 <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&family=Open+Sans:wght@600;700&display=swap" rel="stylesheet">
 <link href="/css/tabs.css" rel="stylesheet">
-<link href="/css/button.css" rel="stylesheet">
 <script src="/js/tabs.js"></script>
 <script src="/js/quiz.js"></script>
 <!-- end: minikube override head-end partial -->
diff --git a/site/layouts/shortcodes/button.html b/site/layouts/shortcodes/button.html
deleted file mode 100644
index 095e30b37..000000000
--- a/site/layouts/shortcodes/button.html
+++ /dev/null
@@ -1,1 +0,0 @@
-<a href="{{ .Get "link" }}"><button type="button" class="module-button">Next Module ➔</button></a>
diff --git a/site/static/css/button.css b/site/static/css/button.css
deleted file mode 100644
index 5b1a0ea4a..000000000
--- a/site/static/css/button.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.module-button {
-  color: #fff;
-  background: #306EE5;
-  border-radius: 0.5rem;
-  font-size: 2rem;
-  border: none;
-  padding: 0.5rem 1rem;
-  margin: 2rem 0;
-}
-
-.module-button:hover {
-  background: #164cb2;
-}


Test patch:
diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh
index 15c46a92d..dedb14fae 100755
--- a/hack/jenkins/linux_integration_tests_none.sh
+++ b/hack/jenkins/linux_integration_tests_none.sh
@@ -31,8 +31,8 @@ DRIVER="none"
 JOB_NAME="none_Linux"
 EXTRA_START_ARGS="--bootstrapper=kubeadm"
 
-# add install location of iptables and conntrack to PATH
-PATH="/usr/sbin:$PATH"
+SUDO_PREFIX="sudo -E "
+export KUBECONFIG="/root/.kube/config"
 
 if ! kubeadm &>/dev/null; then
   echo "WARNING: kubeadm is not installed. will try to install."
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
index 9c1f32e2e..4f6947f3a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml
index b91a26053..0e84a43cd 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
index 9df6aaa44..8b3a2e10e 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml
index d11d3e77a..2c22716e3 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
+  criSocket: unix:///var/run/crio/crio.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml
index bb4fe9c47..4cdca1f1a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
+  criSocket: unix:///var/run/crio/crio.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml
index 357b86a2e..43f1bf3e7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml
index b589145b1..d56410344 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml
index 660efe824..96ba9bc21 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml
index 1e824985e..86c765506 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml
index cd57de3e0..2fd841089 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml
index 744eb4a75..32a46aa3c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml
index 9ef1d535b..2597d612c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml
index a7c48c449..a6acea944 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
+  criSocket: unix:///var/run/crio/crio.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml
index 7915ee535..1a8dfb67f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
+  criSocket: unix:///var/run/crio/crio.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml
index b3463c08f..dd117b8f3 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml
index 84ca57799..421ffa202 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml
index b6fe947d0..7bea32789 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml
index e75fc3e18..56da4d067 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml
index 84efceb9d..f012b8f74 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml
index d5ef4eb62..398ebc50f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml
index e72a72f87..7a76d3c25 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml
index 8e9975975..643e3f65f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
+  criSocket: unix:///var/run/crio/crio.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml
index 5ce85a9ed..9b0e9bc68 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
+  criSocket: unix:///var/run/crio/crio.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml
index 0a8c6e175..b0c7d964d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml
index 134490b4e..86ad2570a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml
index 7a2d52fb0..73ddfb53a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml
index 9e49d17d0..9f9ec309f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml
index 9c66e8115..042cefc67 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml
index fa6f78d2f..1c9e6895b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml
index f7b988d9c..85a483cf6 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml
index 3c314f68c..887c8e001 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
+  criSocket: unix:///var/run/crio/crio.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml
index 92cc612d9..40719ae98 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
+  criSocket: unix:///var/run/crio/crio.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml
index f4cd34ba3..cd67c01b5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml
index a527103e4..03d274dec 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml
index 3ffc93e85..27b115137 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml
index 57bf6a75d..7c7c5fe29 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml
@@ -11,7 +11,7 @@ bootstrapTokens:
       - signing
       - authentication
 nodeRegistration:
-  criSocket: /var/run/dockershim.sock
+  criSocket: unix:///var/run/dockershim.sock
   name: "mk"
   kubeletExtraArgs:
     node-ip: 1.1.1.1
diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md
index bdf6c26f5..1d3ff3407 100644
--- a/site/content/en/docs/contrib/tests.en.md
+++ b/site/content/en/docs/contrib/tests.en.md
@@ -615,7 +615,7 @@ validates that profile list works with --no-kubernetes
 validates that minikube start with no args works.
 
 ## TestChangeNoneUser
-tests to make sure the CHANGE_MINIKUBE_NONE_USER environment variable is respected
+tests to make sure the CHANGE_MINIKUBE_NONE_USER environemt variable is respected
 and changes the minikube file permissions from root to the correct user.
 
 ## TestPause
diff --git a/test/integration/none_test.go b/test/integration/none_test.go
index e1fa72cc3..c9270169f 100644
--- a/test/integration/none_test.go
+++ b/test/integration/none_test.go
@@ -31,11 +31,11 @@ import (
 	"k8s.io/minikube/pkg/minikube/localpath"
 )
 
-// TestChangeNoneUser tests to make sure the CHANGE_MINIKUBE_NONE_USER environment variable is respected
+// TestChangeNoneUser tests to make sure the CHANGE_MINIKUBE_NONE_USER environemt variable is respected
 // and changes the minikube file permissions from root to the correct user.
 func TestChangeNoneUser(t *testing.T) {
-	if !NoneDriver() || os.Getenv("SUDO_USER") == "" {
-		t.Skip("Test requires none driver and SUDO_USER env to not be empty")
+	if !NoneDriver() {
+		t.Skip("Only test none driver.")
 	}
 	MaybeParallel(t)
 
@@ -64,7 +64,11 @@ func TestChangeNoneUser(t *testing.T) {
 		t.Errorf("%s failed: %v", rr.Command(), err)
 	}
 
-	u, err := user.Lookup(os.Getenv("SUDO_USER"))
+	username := os.Getenv("SUDO_USER")
+	if username == "" {
+		t.Fatal("Expected $SUDO_USER env to not be empty")
+	}
+	u, err := user.Lookup(username)
 	if err != nil {
 		t.Fatalf("Getting user failed: %v", err)
 	}
diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go
index dac96d4cc..079e0eb77 100644
--- a/test/integration/version_upgrade_test.go
+++ b/test/integration/version_upgrade_test.go
@@ -69,10 +69,6 @@ func legacyVersion() string {
 			version = "v1.9.0"
 		}
 	}
-	if NoneDriver() {
-		// oldest version where none driver doesn't have to be run as root
-		version = "v1.16.0"
-	}
 	// the version containerd in ISO was upgraded to 1.4.2
 	// we need it to use runc.v2 plugin
 	// note: Test*BinaryUpgrade require minikube v1.22+ to satisfy newer containerd config structure