diff --git a/.github/workflows/pr-chart-lint-and-test.yml b/.github/workflows/pr-chart-lint-and-test.yml
index c6e9db9..b014a20 100644
--- a/.github/workflows/pr-chart-lint-and-test.yml
+++ b/.github/workflows/pr-chart-lint-and-test.yml
@@ -44,13 +44,12 @@ jobs:
             echo "matrix<<EOF"
             echo '{ "include": ['
             [[ "${{ steps.changed-files.outputs.any_changed }}" == 'false' ]] && echo '{ "name": "lint" },'
-            echo '{ "name": "k8s-1.31", "kindest_image": "kindest/node:v1.31.1"  },'
-            echo '{ "name": "k8s-1.30", "kindest_image": "kindest/node:v1.30.4"  },'
-            echo '{ "name": "k8s-1.29", "kindest_image": "kindest/node:v1.29.8"  },'
-            echo '{ "name": "k8s-1.28", "kindest_image": "kindest/node:v1.28.13"  },'
+            echo '{ "name": "k8s-1.31", "kindest_image": "kindest/node:v1.31.2"  },'
+            echo '{ "name": "k8s-1.30", "kindest_image": "kindest/node:v1.30.6"  },'
+            echo '{ "name": "k8s-1.29", "kindest_image": "kindest/node:v1.29.10" },'
+            echo '{ "name": "k8s-1.28", "kindest_image": "kindest/node:v1.28.15" },'
             echo '{ "name": "k8s-1.27", "kindest_image": "kindest/node:v1.27.16" },'
-            echo '{ "name": "k8s-1.26", "kindest_image": "kindest/node:v1.26.15" },'
-            echo '{ "name": "k8s-1.25", "kindest_image": "kindest/node:v1.25.16" }'
+            echo '{ "name": "k8s-1.26", "kindest_image": "kindest/node:v1.26.15" }'
             echo '] }'
             echo "EOF"
           } >> "$GITHUB_OUTPUT"
@@ -61,8 +60,9 @@ jobs:
     needs: prep_job
     if: ${{ needs.prep_job.outputs.has_changes == 'true' }}
     env:
-      # see https://github.com/kubernetes-sigs/kind/releases
-      kind_version: v0.24.0
+      # See https://github.com/kubernetes-sigs/kind/releases
+      # Check and update the image versions in the prep_job as well when updating this version.
+      kind_version: v0.25.0
     strategy:
       matrix: ${{ fromJson(needs.prep_job.outputs.matrix) }}
     name: ${{ matrix.name }}