diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 8c0ad56a..a6d838ca 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -57,9 +57,10 @@ jobs:
       if: steps.list-changed.outputs.changed
 
     - name: Create kind cluster
-      uses: helm/kind-action@v1.4.0
+      uses: helm/kind-action@v1.7.0
       with:
-        node_image: kindest/node:v1.21.10
+        node_image: kindest/node:v1.27.3
+        config: chart-testing/kind-config.yaml
       if: steps.list-changed.outputs.changed
 
     - name: Replace secrets in Helm charts
diff --git a/chart-testing/kind-config.yaml b/chart-testing/kind-config.yaml
new file mode 100644
index 00000000..f7f7da16
--- /dev/null
+++ b/chart-testing/kind-config.yaml
@@ -0,0 +1,5 @@
+# https://kind.sigs.k8s.io/docs/user/configuration/
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+featureGates:
+  StatefulSetAutoDeletePVC: true
diff --git a/charts/node/ci/kind-values.yaml b/charts/node/ci/kind-values.yaml
index 618b4b8e..28c0bdff 100644
--- a/charts/node/ci/kind-values.yaml
+++ b/charts/node/ci/kind-values.yaml
@@ -9,5 +9,9 @@ node:
     storageClass: standard
   chainKeystore:
     storageClass: standard
+  podManagementPolicy: Parallel
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: Delete
+    whenScaled: Delete
 image:
   tag: v0.9.43