diff --git a/hack/jenkins/build/minikube_build_upload_latest.sh b/hack/jenkins/build/minikube_build_upload_latest.sh
index b6b50cc86c..91ec72589b 100755
--- a/hack/jenkins/build/minikube_build_upload_latest.sh
+++ b/hack/jenkins/build/minikube_build_upload_latest.sh
@@ -22,8 +22,7 @@ set -eux -o pipefail
 readonly bucket="minikube/latest"
 
 # Make sure the right golang version is installed based on Makefile
-WANT_GOLANG_VERSION=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }')
-./hack/jenkins/installers/check_install_golang.sh $WANT_GOLANG_VERSION /usr/local
+./hack/jenkins/installers/check_install_golang.sh /usr/local
 
 
 declare -rx GOPATH=/var/lib/jenkins/go
diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index d1e1d9929c..600e51ece0 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -91,7 +91,7 @@ else
 fi
 
 # installing golang so we could do go get for gopogh
-./installers/check_install_golang.sh "1.17" "/usr/local" || true
+./installers/check_install_golang.sh "/usr/local" || true
 
 # install docker and kubectl if not present
 sudo ARCH="$ARCH" ./installers/check_install_docker.sh || true
diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh
index 4ee97d5b1c..e47055364b 100755
--- a/hack/jenkins/installers/check_install_golang.sh
+++ b/hack/jenkins/installers/check_install_golang.sh
@@ -16,14 +16,14 @@
 
 set -eux -o pipefail
 
-if (($# < 2)); then
-  echo "ERROR: given ! ($#) number of parameters but expect 2."
-  echo "USAGE: ./check_install_golang.sh VERSION_TO_INSTALL INSTALL_PATH"
+if (($# < 1)); then
+  echo "ERROR: given ! ($#) parameters but expected 1."
+  echo "USAGE: ./check_install_golang.sh INSTALL_PATH"
   exit 1
 fi
 
-VERSION_TO_INSTALL=${1}
-INSTALL_PATH=${2}
+VERSION_TO_INSTALL=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }')
+INSTALL_PATH=${1}
 
 function current_arch() {
   case $(arch) in
@@ -51,7 +51,7 @@ function check_and_install_golang() {
   fi
 
   # golang has been installed and check its version
-  if [[ $(go version) =~ (([0-9]+)\.([0-9]+).([0-9]+).([\.0-9]*)) ]]; then
+  if [[ $(go version | cut -d' ' -f 3) =~ go(([0-9]+)\.([0-9]+).([0-9]+)*) ]]; then
     HOST_VERSION=${BASH_REMATCH[1]}
     if [ $HOST_VERSION = $VERSION_TO_INSTALL ]; then
       echo "go version on the host looks good : $HOST_VERSION"
diff --git a/hack/jenkins/kicbase_auto_build.sh b/hack/jenkins/kicbase_auto_build.sh
index 4a05018dfc..57536132a1 100755
--- a/hack/jenkins/kicbase_auto_build.sh
+++ b/hack/jenkins/kicbase_auto_build.sh
@@ -24,6 +24,9 @@ docker login -u ${DOCKERHUB_USER} -p ${DOCKERHUB_PASS}
 # Make sure gh is installed and configured
 ./hack/jenkins/installers/check_install_gh.sh
 
+# Make sure golang is installed and configured
+./hack/jenkins/installers/check_install_golang.sh "/usr/local" || true
+
 # Let's make sure we have the newest kicbase reference
 curl -L https://github.com/kubernetes/minikube/raw/master/pkg/drivers/kic/types.go --output types-head.go
 # kicbase tags are of the form VERSION-TIMESTAMP-PR, so this grep finds that TIMESTAMP in the middle
diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 94750f6996..81381734a1 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -26,8 +26,7 @@ set -eux -o pipefail
 readonly bucket="minikube-builds"
 
 # Make sure the right golang version is installed based on Makefile
-WANT_GOLANG_VERSION=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }')
-./hack/jenkins/installers/check_install_golang.sh $WANT_GOLANG_VERSION /usr/local
+./hack/jenkins/installers/check_install_golang.sh /usr/local
 
 
 declare -rx BUILD_IN_DOCKER=y
diff --git a/hack/jenkins/prbot.sh b/hack/jenkins/prbot.sh
index 0f68772e9b..b88b9878eb 100644
--- a/hack/jenkins/prbot.sh
+++ b/hack/jenkins/prbot.sh
@@ -27,7 +27,7 @@ fi
 ./installers/check_install_gh.sh 
 
 # Make sure go is installed and configured                                            
-./installers/check_install_golang.sh "1.16" "/usr/local" || true
+./installers/check_install_golang.sh "/usr/local" || true
 
 # Grab latest code                                                                    
 git clone https://github.com/kubernetes/minikube.git                                  
diff --git a/hack/jenkins/preload_generation.sh b/hack/jenkins/preload_generation.sh
index 66e2ba1125..b019d6f6e1 100644
--- a/hack/jenkins/preload_generation.sh
+++ b/hack/jenkins/preload_generation.sh
@@ -21,8 +21,7 @@
 set -eux -o pipefail
 
 # Make sure the right golang version is installed based on Makefile
-WANT_GOLANG_VERSION=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }')
-./hack/jenkins/installers/check_install_golang.sh $WANT_GOLANG_VERSION /usr/local
+./hack/jenkins/installers/check_install_golang.sh /usr/local
 
 make upload-preloaded-images-tar
 make clean
diff --git a/hack/update/golang_version/update_golang_version.go b/hack/update/golang_version/update_golang_version.go
index 245c801db1..d60ecf2f25 100644
--- a/hack/update/golang_version/update_golang_version.go
+++ b/hack/update/golang_version/update_golang_version.go
@@ -111,11 +111,6 @@ var (
 				`(?m)^go .*`: `go {{.StableVersionMM}}`,
 			},
 		},
-		"hack/jenkins/common.sh": {
-			Replace: map[string]string{
-				`\.\/installers\/check_install_golang\.sh \".*\" \"\/usr\/local\" .*`: `./installers/check_install_golang.sh "{{.StableVersion}}" "/usr/local" || true`,
-			},
-		},
 		"Makefile": {
 			Replace: map[string]string{
 				// searching for 1.* so it does NOT match "KVM_GO_VERSION ?= $(GO_VERSION:.0=)" in the Makefile