diff --git a/.github/workflows/minikube-olm.yaml b/.github/workflows/minikube-olm.yaml
index ec51441c6..08017ac55 100644
--- a/.github/workflows/minikube-olm.yaml
+++ b/.github/workflows/minikube-olm.yaml
@@ -22,6 +22,8 @@ jobs:
       run: sudo pip install yq
     - name: Provision Minikube cluster
       run: |
+        curl -LO https://storage.googleapis.com/minikube/releases/v1.18.1/minikube-linux-amd64
+        sudo install minikube-linux-amd64 /usr/local/bin/minikube
         minikube start --memory=6000mb
     - name: Enable minikube addons
       run: |
diff --git a/.github/workflows/minikube-operator-singlehost.yaml b/.github/workflows/minikube-operator-singlehost.yaml
index 08bbb8db5..d10e27dfc 100644
--- a/.github/workflows/minikube-operator-singlehost.yaml
+++ b/.github/workflows/minikube-operator-singlehost.yaml
@@ -21,6 +21,8 @@ jobs:
       run: sudo pip install yq
     - name: Provision Minikube cluster
       run: |
+        curl -LO https://storage.googleapis.com/minikube/releases/v1.18.1/minikube-linux-amd64
+        sudo install minikube-linux-amd64 /usr/local/bin/minikube
         minikube start --memory=6000mb
     - name: Enable minikube addons
       run: |
@@ -47,6 +49,8 @@ jobs:
       run: sudo pip install yq
     - name: Provision Minikube cluster
       run: |
+        curl -LO https://storage.googleapis.com/minikube/releases/v1.18.1/minikube-linux-amd64
+        sudo install minikube-linux-amd64 /usr/local/bin/minikube
         minikube start --memory=6000mb
     - name: Enable minikube addons
       run: |
diff --git a/.github/workflows/minikube-operator-update.yaml b/.github/workflows/minikube-operator-update.yaml
index 8d3746f56..bc0f07d08 100644
--- a/.github/workflows/minikube-operator-update.yaml
+++ b/.github/workflows/minikube-operator-update.yaml
@@ -25,6 +25,8 @@ jobs:
       run: sudo pip install yq
     - name: Provision Minikube cluster
       run: |
+        curl -LO https://storage.googleapis.com/minikube/releases/v1.18.1/minikube-linux-amd64
+        sudo install minikube-linux-amd64 /usr/local/bin/minikube
         minikube start --memory=6000mb
     - name: Enable minikube addons
       run: |
diff --git a/.github/workflows/minikube-stable-olm-update.yaml b/.github/workflows/minikube-stable-olm-update.yaml
index 063792475..cdde674a8 100644
--- a/.github/workflows/minikube-stable-olm-update.yaml
+++ b/.github/workflows/minikube-stable-olm-update.yaml
@@ -25,6 +25,8 @@ jobs:
       run: sudo pip install yq
     - name: Provision Minikube cluster
       run: |
+        curl -LO https://storage.googleapis.com/minikube/releases/v1.18.1/minikube-linux-amd64
+        sudo install minikube-linux-amd64 /usr/local/bin/minikube
         minikube start --memory=6000mb
     - name: Enable minikube addons
       run: |
diff --git a/olm/olm.sh b/olm/olm.sh
index 36079ef50..9ed5d43c5 100755
--- a/olm/olm.sh
+++ b/olm/olm.sh
@@ -534,7 +534,7 @@ getBundleListFromCatalogSource() {
   CATALOG_IP=$(echo "${CATALOG_SERVICE}" | yq -r ".spec.clusterIP")
   CATALOG_PORT=$(echo "${CATALOG_SERVICE}" | yq -r ".spec.ports[0].targetPort")
 
-  LIST_BUNDLES=$(kubectl run --generator=run-pod/v1 grpcurl-query -n "${namespace}" \
+  LIST_BUNDLES=$(kubectl run grpcurl-query -n "${namespace}" \
   --rm=true \
   --restart=Never \
   --attach=true \