diff --git a/.tekton/cosign-pull-request.yaml b/.tekton/cosign-pull-request.yaml
index a143f1db992..f3822a49ec8 100644
--- a/.tekton/cosign-pull-request.yaml
+++ b/.tekton/cosign-pull-request.yaml
@@ -183,11 +183,6 @@ spec:
         - name: kind
           value: task
         resolver: bundles
-      when:
-      - input: $(params.hermetic)
-        operator: in
-        values:
-        - "true"
     - name: build-container
       params:
       - name: IMAGE
diff --git a/.tekton/cosign-unit-test.yaml b/.tekton/cosign-unit-test.yaml
index d2df8f8d4c4..5b6f10a96ed 100644
--- a/.tekton/cosign-unit-test.yaml
+++ b/.tekton/cosign-unit-test.yaml
@@ -31,7 +31,7 @@ spec:
         - $(params.SOURCE_ARTIFACT)=/var/workdir/source
         - $(params.CACHI2_ARTIFACT)=/cachi2
     - name: run-tests
-      image: registry.access.redhat.com/ubi9/go-toolset@sha256:1421b69ee4c6d5631174776dc40654051b5183f149213613d74f61a11afaaa94
+      image: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22@sha256:859b38e6f53f49350402ca0a8dc342402f0afd8434c2f8984a7a3e714173cdca
       workingDir: /var/workdir/source
       script: |
         #!/usr/bin/env sh
diff --git a/Dockerfile.cosign.rh b/Dockerfile.cosign.rh
index a033eb44964..ec13f3416d9 100644
--- a/Dockerfile.cosign.rh
+++ b/Dockerfile.cosign.rh
@@ -1,5 +1,5 @@
 # Build stage
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:0b2abd1d5ebaffa4ff68386aa6ea2951cfdf6ab09e55624091636cd0e32b62da AS build-env
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22@sha256:859b38e6f53f49350402ca0a8dc342402f0afd8434c2f8984a7a3e714173cdca AS build-env
 
 WORKDIR /cosign
 COPY . .