diff --git a/.github/workflows/e2e-test-release.yml b/.github/workflows/e2e-test-release.yml
index 9255a9a15..365f24ebe 100644
--- a/.github/workflows/e2e-test-release.yml
+++ b/.github/workflows/e2e-test-release.yml
@@ -39,11 +39,25 @@ jobs:
       fail-fast: false
       max-parallel: 9
       matrix:
-        include:
-          #
-          # Tests on ubuntu runner
-          #
+        test:
+          - "sonobuoy full"
+          - "verify"
+          - "recover"
+          - "lb"
+          - "autoscaling"
+          - "perf-bench"
+          - "malicious join"
 
+        attestationVariant:
+          - "gcp-sev-es"
+          - "gcp-sev-snp"
+          - "azure-sev-snp"
+          - "azure-tdx"
+          - "aws-sev-snp"
+        kubernetes-version: ["v1.31"]
+        clusterCreation: ["cli"]
+        runner: ["ubuntu-24.04"]
+        include:
           # sonobuoy full test on all k8s versions
           - test: "sonobuoy full"
             attestationVariant: "gcp-sev-es"
@@ -71,32 +85,6 @@ jobs:
             runner: "ubuntu-24.04"
             clusterCreation: "cli"
 
-          - test: "sonobuoy full"
-            attestationVariant: "gcp-sev-es"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "sonobuoy full"
-            attestationVariant: "gcp-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "sonobuoy full"
-            attestationVariant: "azure-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "sonobuoy full"
-            attestationVariant: "azure-tdx"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "sonobuoy full"
-            attestationVariant: "aws-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-
           - test: "sonobuoy full"
             attestationVariant: "gcp-sev-es"
             kubernetes-version: "v1.29"
@@ -123,181 +111,13 @@ jobs:
             runner: "ubuntu-24.04"
             clusterCreation: "cli"
 
-          # verify test on latest k8s version
-          - test: "verify"
-            attestationVariant: "gcp-sev-es"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "verify"
-            attestationVariant: "gcp-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "verify"
-            attestationVariant: "azure-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "verify"
-            attestationVariant: "azure-tdx"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "verify"
-            attestationVariant: "aws-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-
-          # recover test on latest k8s version
-          - test: "recover"
-            attestationVariant: "gcp-sev-es"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "recover"
-            attestationVariant: "gcp-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "recover"
-            attestationVariant: "azure-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "recover"
-            attestationVariant: "azure-tdx"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "recover"
-            attestationVariant: "aws-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-
-          # lb test on latest k8s version
-          - test: "lb"
-            attestationVariant: "gcp-sev-es"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "lb"
-            attestationVariant: "gcp-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "lb"
-            attestationVariant: "azure-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "lb"
-            attestationVariant: "azure-tdx"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "lb"
-            attestationVariant: "aws-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-
-          # autoscaling test on latest k8s version
-          - test: "autoscaling"
-            attestationVariant: "gcp-sev-es"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "autoscaling"
-            attestationVariant: "gcp-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "autoscaling"
-            attestationVariant: "azure-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "autoscaling"
-            attestationVariant: "azure-tdx"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "autoscaling"
-            attestationVariant: "aws-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-
-          # perf-bench test on latest k8s version
-          - test: "perf-bench"
-            attestationVariant: "gcp-sev-es"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "perf-bench"
-            attestationVariant: "gcp-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "perf-bench"
-            attestationVariant: "azure-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "perf-bench"
-            attestationVariant: "azure-tdx"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-          - test: "perf-bench"
-            attestationVariant: "aws-sev-snp"
-            kubernetes-version: "v1.30"
-            runner: "ubuntu-24.04"
-            clusterCreation: "cli"
-
           # s3proxy test on latest k8s version
           - test: "s3proxy"
-            refStream: "ref/main/stream/debug/?"
             attestationVariant: "gcp-sev-es"
-            kubernetes-version: "v1.30"
+            kubernetes-version: "v1.31"
             runner: "ubuntu-24.04"
             clusterCreation: "cli"
 
-          # malicious join test on latest k8s version
-          - test: "malicious join"
-            refStream: "ref/main/stream/debug/?"
-            attestationVariant: "gcp-sev-es"
-            kubernetes-version: "v1.30"
-            clusterCreation: "cli"
-            runner: "ubuntu-24.04"
-          - test: "malicious join"
-            refStream: "ref/main/stream/debug/?"
-            attestationVariant: "gcp-sev-snp"
-            kubernetes-version: "v1.30"
-            clusterCreation: "cli"
-            runner: "ubuntu-24.04"
-          - test: "malicious join"
-            refStream: "ref/main/stream/debug/?"
-            attestationVariant: "azure-sev-snp"
-            kubernetes-version: "v1.30"
-            clusterCreation: "cli"
-            runner: "ubuntu-24.04"
-          - test: "malicious join"
-            refStream: "ref/main/stream/debug/?"
-            attestationVariant: "azure-tdx"
-            kubernetes-version: "v1.30"
-            clusterCreation: "cli"
-            runner: "ubuntu-24.04"
-          - test: "malicious join"
-            refStream: "ref/main/stream/debug/?"
-            attestationVariant: "aws-sev-snp"
-            kubernetes-version: "v1.30"
-            clusterCreation: "cli"
-            runner: "ubuntu-24.04"
-
           #
           # Tests on macOS runner
           #
@@ -305,11 +125,11 @@ jobs:
           # TODO(3u13r): Update verify test to work on MacOS runners
           # - test: "verify"
           #  attestationVariant: "azure-sev-snp"
-          #  kubernetes-version: "v1.30"
+          #  kubernetes-version: "v1.31"
           #  runner: "macos-latest"
           - test: "recover"
             attestationVariant: "gcp-sev-es"
-            kubernetes-version: "v1.30"
+            kubernetes-version: "v1.31"
             runner: "macos-latest"
             clusterCreation: "cli"
     runs-on: ${{ matrix.runner }}