diff --git a/.github/workflows/go-test.yaml b/.github/workflows/go-test.yaml
index d4792b6c8..3e8e2b1c5 100644
--- a/.github/workflows/go-test.yaml
+++ b/.github/workflows/go-test.yaml
@@ -39,28 +39,40 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        k8s:
-          - v1.16.15
-          - v1.18.20
-          - v1.22.17
-          - v1.24.17
-          - v1.25.16
-          - v1.26.15
-          - v1.27.16
-          - v1.28.13
-          - v1.29.9
-          - v1.30.4
-          - v1.31.1
+        versions:
+          - k8s: v1.16.15
+            kind: v0.15.0
+          - k8s: v1.18.20
+            kind: v0.17.0
+          - k8s: v1.22.17
+            kind: v0.22.0
+          - k8s: v1.24.17
+            kind: v0.22.0
+          - k8s: v1.25.16
+            kind: v0.22.0
+          - k8s: v1.26.15
+            kind: v0.22.0
+          - k8s: v1.27.16
+            kind: v0.22.0
+          - k8s: v1.28.13
+            kind: v0.22.0
+          - k8s: v1.29.8
+            kind: v0.22.0
+          - k8s: v1.30.4
+            kind: v0.22.0
+          - k8s: v1.31.1
+            kind: v0.22.0
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Create kind ${{ matrix.k8s }} cluster
+      - name: Create K8s ${{ matrix.versions.k8s }} cluster with kind version ${{ matrix.versions.kind }}
         uses: helm/kind-action@v1.10.0
         with:
-          node_image: kindest/node:${{ matrix.k8s }}
-          cluster_name: operator-ci-${{ matrix.k8s }}
+          version: ${{ matrix.versions.kind }}
+          node_image: kindest/node:${{ matrix.versions.k8s }}
+          cluster_name: operator-ci-${{ matrix.versions.k8s }}
           config: .github/kind_config.yaml
       - name: Add Cert Manager Helm repo
         run: helm repo add jetstack https://charts.jetstack.io && helm repo update
@@ -70,8 +82,8 @@ jobs:
         env:
           API_KEY: ${{ secrets.GO_INTEG_TEST_API_KEY }}
           APP_KEY: ${{ secrets.GO_INTEG_TEST_APP_KEY }}
-          CLUSTER_NAME: operator-ci-${{ matrix.k8s }}
-          K8S_VERSION: ${{ matrix.k8s }}
+          CLUSTER_NAME: operator-ci-${{ matrix.versions.k8s }}
+          K8S_VERSION: ${{ matrix.versions.k8s }}
         run: |
           kubectl cluster-info
           kubectl get nodes