diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index 93336416..bf9d0d0a 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -45,6 +45,13 @@ jobs:
         - "1.20.5"
         ispr:
         - ${{github.event_name == 'pull_request'}}
+        include:
+          - go-version: "1.22"
+            controller-gen-version: "v0.14.0"
+            client-gen-version: "v0.29.2"
+          - go-version: "1.22.1"
+            controller-gen-version: "v0.14.0"
+            client-gen-version: "v0.29.2"
         exclude:
         - ispr: true
           go-version: "1.21.4"
@@ -91,4 +98,6 @@ jobs:
           platforms: ${{ env.IMAGE_PLATFORMS }}
           build-args: |
             GOLANG_VERSION=${{ matrix.go-version }}
+            CONTROLLER_GEN_VERSION=${{ matrix.controller-gen-version || 'v0.9.2' }}
+            CLIENT_GEN_VERSION=${{ matrix.client-gen-version || 'v0.26.1' }}
           tags: ghcr.io/nvidia/k8s-test-infra:devel-go${{ matrix.go-version }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
deleted file mode 100644
index 5b0f2558..00000000
--- a/.github/workflows/test.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: "Test issue comments"
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  execute:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code 
-        uses: actions/checkout@v1
-      - uses: ./
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}