diff --git a/.github/workflows/chainsaw-e2e-test-1.28.yaml b/.github/workflows/chainsaw-e2e-test-1.28.yaml
index 8f079c7e..8b2c7673 100644
--- a/.github/workflows/chainsaw-e2e-test-1.28.yaml
+++ b/.github/workflows/chainsaw-e2e-test-1.28.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.23'
 
       - name: Vendor Dependencies
         run: make vendor vendor.check
diff --git a/.github/workflows/chainsaw-e2e-test-1.29.yaml b/.github/workflows/chainsaw-e2e-test-1.29.yaml
index b1e077cd..23ecd4fd 100644
--- a/.github/workflows/chainsaw-e2e-test-1.29.yaml
+++ b/.github/workflows/chainsaw-e2e-test-1.29.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.23'
 
       - name: Vendor Dependencies
         run: make vendor vendor.check
diff --git a/.github/workflows/chainsaw-e2e-test-1.30.yaml b/.github/workflows/chainsaw-e2e-test-1.30.yaml
new file mode 100644
index 00000000..968a5648
--- /dev/null
+++ b/.github/workflows/chainsaw-e2e-test-1.30.yaml
@@ -0,0 +1,43 @@
+# This file was auto-generated by hack/generate-tests.sh
+name: chainsaw e2e test 1.30
+on: [push]
+concurrency:
+  group: chainsaw-1.30-${{ github.ref }}-1
+  cancel-in-progress: true
+permissions:
+  contents: read
+jobs:
+  test:
+    name: chainsaw e2e test 1.30
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+
+      - name: Vendor Dependencies
+        run: make vendor vendor.check
+
+      - name: Docker cache
+        uses: ScribeMD/docker-cache@0.3.7
+        with:
+          key: docker-${{ runner.os }}-${{ hashFiles('go.sum') }}}
+
+      - name: Run chainsaw tests 1.30
+        run: make chainsaw
+        env:
+          LATEST_KUBE_VERSION: '1.30'
+          AWS_ACCESS_KEY_ID: 'Dummy'
+          AWS_SECRET_ACCESS_KEY: 'Dummy'
+          AWS_DEFAULT_REGION: 'us-east-1'
diff --git a/.github/workflows/chainsaw-e2e-test-1.31.yaml b/.github/workflows/chainsaw-e2e-test-1.31.yaml
new file mode 100644
index 00000000..6248ce71
--- /dev/null
+++ b/.github/workflows/chainsaw-e2e-test-1.31.yaml
@@ -0,0 +1,43 @@
+# This file was auto-generated by hack/generate-tests.sh
+name: chainsaw e2e test 1.31
+on: [push]
+concurrency:
+  group: chainsaw-1.31-${{ github.ref }}-1
+  cancel-in-progress: true
+permissions:
+  contents: read
+jobs:
+  test:
+    name: chainsaw e2e test 1.31
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+
+      - name: Vendor Dependencies
+        run: make vendor vendor.check
+
+      - name: Docker cache
+        uses: ScribeMD/docker-cache@0.3.7
+        with:
+          key: docker-${{ runner.os }}-${{ hashFiles('go.sum') }}}
+
+      - name: Run chainsaw tests 1.31
+        run: make chainsaw
+        env:
+          LATEST_KUBE_VERSION: '1.31'
+          AWS_ACCESS_KEY_ID: 'Dummy'
+          AWS_SECRET_ACCESS_KEY: 'Dummy'
+          AWS_DEFAULT_REGION: 'us-east-1'
diff --git a/Makefile b/Makefile
index f67dfc8f..187e7e19 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,10 @@ PLATFORMS ?= linux_amd64 linux_arm64
 # Generate chainsaw e2e tests for the following kind node versions
 # TEST_KIND_NODES is not intended to be updated manually.
 # Please edit LATEST_KIND_NODE instead and run 'make update-kind-nodes'.
-TEST_KIND_NODES ?= 1.26.14,1.27.11,1.28.7,1.29.2
+TEST_KIND_NODES ?= 1.28.7,1.29.2,1.30.8,1.31.4
 
-LATEST_KUBE_VERSION ?= 1.29
-LATEST_KIND_NODE ?= 1.29.2
+LATEST_KUBE_VERSION ?= 1.31
+LATEST_KIND_NODE ?= 1.31.4
 REPO ?= provider-ceph
 
 CROSSPLANE_VERSION ?= 1.18.0
diff --git a/e2e/kind/kind-config-1.26.yaml b/e2e/kind/kind-config-1.30.yaml
similarity index 93%
rename from e2e/kind/kind-config-1.26.yaml
rename to e2e/kind/kind-config-1.30.yaml
index 7b766cd2..04f92b2c 100644
--- a/e2e/kind/kind-config-1.26.yaml
+++ b/e2e/kind/kind-config-1.30.yaml
@@ -3,7 +3,7 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: kindest/node:v1.26.14
+  image: kindest/node:v1.30.8
   extraPortMappings:
   - containerPort: 32566
     hostPort: 32566
diff --git a/e2e/kind/kind-config-1.27.yaml b/e2e/kind/kind-config-1.31.yaml
similarity index 93%
rename from e2e/kind/kind-config-1.27.yaml
rename to e2e/kind/kind-config-1.31.yaml
index 1a3d66b8..daec3e48 100644
--- a/e2e/kind/kind-config-1.27.yaml
+++ b/e2e/kind/kind-config-1.31.yaml
@@ -3,7 +3,7 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: kindest/node:v1.27.11
+  image: kindest/node:v1.31.4
   extraPortMappings:
   - containerPort: 32566
     hostPort: 32566
diff --git a/hack/generate-tests.sh b/hack/generate-tests.sh
index 404984fc..de402f14 100755
--- a/hack/generate-tests.sh
+++ b/hack/generate-tests.sh
@@ -76,7 +76,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.23'
 
       - name: Vendor Dependencies
         run: make vendor vendor.check