diff --git a/.github/workflows/e2e-master.yaml b/.github/workflows/e2e-master.yaml
index b49ad48140..c110f21974 100644
--- a/.github/workflows/e2e-master.yaml
+++ b/.github/workflows/e2e-master.yaml
@@ -13,22 +13,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Create Kind Cluster
-      uses: helm/kind-action@v1.4.0
+      uses: helm/kind-action@v1.5.0
       with:
         cluster_name: kubernetes-python-e2e-master-${{ matrix.python-version }}
         # The kind version to be used to spin the cluster up
         # this needs to be updated whenever a new Kind version is released
-        version: v0.11.1
+        version: v0.17.0
         # Update the config here whenever a new client snapshot is performed
         # This would eventually point to cluster with the latest Kubernetes version
         # as we sync with Kubernetes upstream
-        config: .github/workflows/kind-configs/cluster-1.18.yaml
+        config: .github/workflows/kind-configs/cluster-1.25.yaml
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
diff --git a/.github/workflows/kind-configs/cluster-1.25.yaml b/.github/workflows/kind-configs/cluster-1.25.yaml
new file mode 100644
index 0000000000..ac924b8134
--- /dev/null
+++ b/.github/workflows/kind-configs/cluster-1.25.yaml
@@ -0,0 +1,7 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+- role: control-plane
+  image: kindest/node:v1.25.3@sha256:f1de3b0670462f43280114eccceab8bf1b9576d2afe0582f8f74529da6fd0365
+- role: worker
+  image: kindest/node:v1.25.3@sha256:f1de3b0670462f43280114eccceab8bf1b9576d2afe0582f8f74529da6fd0365