diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index a8f91b9153..ae48b57e45 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -1,4 +1,4 @@
-name: E2E Tests
+name: Unit and E2E Tests
 
 on:
   push:
@@ -73,22 +73,20 @@ jobs:
         with:
           name: code-coverage
           path: coverage.out
-#      - name: Upload code coverage information to codecov.io
-#        uses: codecov/codecov-action@v4.5.0
-#        with:
-#          file: coverage.out
-#          fail_ci_if_error: false
-#        env:
-#          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
   test-e2e:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-minor-version:
-          - 1.26
-          - 1.27
-          - 1.28
-          - 1.29
+        kubernetes:
+          - version: 1.26
+            latest: false
+          - version: 1.27
+            latest: false
+          - version: 1.28
+            latest: false
+          - version: 1.29
+            latest: true
     name: Run end-to-end tests
     runs-on: ubuntu-latest
     steps:
@@ -99,7 +97,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Setup k3s
         env:
-          INSTALL_K3S_CHANNEL: v${{ matrix.kubernetes-minor-version }}
+          INSTALL_K3S_CHANNEL: v${{ matrix.kubernetes.version }}
         run: |
           curl -sfL https://get.k3s.io | sh -
           sudo mkdir ~/.kube
@@ -134,20 +132,22 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: E2E Test Results (k8s ${{ matrix.kubernetes-minor-version }})
+          name: E2E Test Results (k8s ${{ matrix.kubernetes.version }})
           path: |
             junit.xml
       - name: Upload e2e-controller logs
         uses: actions/upload-artifact@v4
         with:
-          name: e2e-controller-k8s-${{ matrix.kubernetes-minor-version }}.log
+          name: e2e-controller-k8s-${{ matrix.kubernetes.version }}.log
           path: /tmp/e2e-controller.log
         if: ${{ always() }}
-      - name: Generate code coverage artifacts
+      - name: Upload code coverage artifacts
         uses: actions/upload-artifact@v4
         with:
           name: coverage-output-e2e
           path: coverage-output-e2e
+        if: ${{ matrix.k3s.latest }}
+
   coverage-process:
     name: Run end-to-end tests
     runs-on: ubuntu-latest
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 18d621181c..8fb59d6b93 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -72,31 +72,6 @@ jobs:
       - name: Compile all packages
         run: make controller plugin
 
-#      - name: Test
-#        run: make test-unit
-#
-#      - name: Upload Unit Test Results
-#        if: always()
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: Unit Test Results
-#          path: |
-#            junit.xml
-#
-#      - name: Generate code coverage artifacts
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: code-coverage
-#          path: coverage.out
-#
-#      - name: Upload code coverage information to codecov.io
-#        uses: codecov/codecov-action@v4.5.0
-#        with:
-#          file: coverage.out
-#          fail_ci_if_error: false
-#        env:
-#          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
   codegen:
     name: Verify Codegen
     runs-on: ubuntu-latest