diff --git a/.konflux/dockerfiles/controller.Dockerfile b/.konflux/dockerfiles/controller.Dockerfile
index 236238ce0c4..c5f9ca94e67 100644
--- a/.konflux/dockerfiles/controller.Dockerfile
+++ b/.konflux/dockerfiles/controller.Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
 ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:e4ca1025efad7cc944fb991c716067b12e25ecbe05e6e81715a337179e417aa8
 
 FROM $GO_BUILDER AS builder
@@ -23,8 +23,8 @@ COPY --from=builder /tmp/controller /ko-app/controller
 COPY head ${KO_DATA_PATH}/HEAD
 
 LABEL \
-      com.redhat.component="openshift-pipelines-controller-rhel9-container" \
-      name="openshift-pipelines/pipelines-controller-rhel9" \
+      com.redhat.component="openshift-pipelines-controller-rhel8-container" \
+      name="openshift-pipelines/pipelines-controller-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Pipelines Controller" \
       maintainer="pipelines-extcomm@redhat.com" \
diff --git a/.konflux/dockerfiles/entrypoint.Dockerfile b/.konflux/dockerfiles/entrypoint.Dockerfile
index e3ccee9788a..1435ee5912f 100644
--- a/.konflux/dockerfiles/entrypoint.Dockerfile
+++ b/.konflux/dockerfiles/entrypoint.Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
 ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:e4ca1025efad7cc944fb991c716067b12e25ecbe05e6e81715a337179e417aa8
 
 FROM $GO_BUILDER AS builder
@@ -25,8 +25,8 @@ COPY --from=builder /tmp/entrypoint /ko-app/entrypoint
 COPY head ${KO_DATA_PATH}/HEAD
 
 LABEL \
-      com.redhat.component="openshift-pipelines-entrypoint-rhel9-container" \
-      name="openshift-pipelines/pipelines-entrypoint-rhel9" \
+      com.redhat.component="openshift-pipelines-entrypoint-rhel8-container" \
+      name="openshift-pipelines/pipelines-entrypoint-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Pipelines Entrypoint" \
       maintainer="pipelines-extcomm@redhat.com" \
diff --git a/.konflux/dockerfiles/events.Dockerfile b/.konflux/dockerfiles/events.Dockerfile
index 27e56fe4d78..37d16794fc8 100644
--- a/.konflux/dockerfiles/events.Dockerfile
+++ b/.konflux/dockerfiles/events.Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
 ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:e4ca1025efad7cc944fb991c716067b12e25ecbe05e6e81715a337179e417aa8
 
 FROM $GO_BUILDER AS builder
@@ -23,8 +23,8 @@ COPY --from=builder /tmp/events /ko-app/events
 COPY head ${KO_DATA_PATH}/HEAD
 
 LABEL \
-      com.redhat.component="openshift-pipelines-events-rhel9-container" \
-      name="openshift-pipelines/pipelines-events-rhel9" \
+      com.redhat.component="openshift-pipelines-events-rhel8-container" \
+      name="openshift-pipelines/pipelines-events-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Pipelines Events" \
       maintainer="pipelines-extcomm@redhat.com" \
diff --git a/.konflux/dockerfiles/nop.Dockerfile b/.konflux/dockerfiles/nop.Dockerfile
index 737fa25fc3e..afbcc36d846 100644
--- a/.konflux/dockerfiles/nop.Dockerfile
+++ b/.konflux/dockerfiles/nop.Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
 ARG RUNTIME=scratch
 
 FROM $GO_BUILDER AS builder
@@ -23,8 +23,8 @@ COPY --from=builder /tmp/nop /ko-app/nop
 COPY head ${KO_DATA_PATH}/HEAD
 
 LABEL \
-      com.redhat.component="openshift-pipelines-nop-rhel9-container" \
-      name="openshift-pipelines/pipelines-nop-rhel9" \
+      com.redhat.component="openshift-pipelines-nop-rhel8-container" \
+      name="openshift-pipelines/pipelines-nop-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Pipelines Nop" \
       maintainer="pipelines-extcomm@redhat.com" \
diff --git a/.konflux/dockerfiles/resolvers.Dockerfile b/.konflux/dockerfiles/resolvers.Dockerfile
index 500793d9293..58adfd28973 100644
--- a/.konflux/dockerfiles/resolvers.Dockerfile
+++ b/.konflux/dockerfiles/resolvers.Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
 ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:e4ca1025efad7cc944fb991c716067b12e25ecbe05e6e81715a337179e417aa8
 
 FROM $GO_BUILDER AS builder
@@ -23,8 +23,8 @@ COPY --from=builder /tmp/resolvers /ko-app/resolvers
 COPY head ${KO_DATA_PATH}/HEAD
 
 LABEL \
-      com.redhat.component="openshift-pipelines-resolvers-rhel9-container" \
-      name="openshift-pipelines/pipelines-resolvers-rhel9" \
+      com.redhat.component="openshift-pipelines-resolvers-rhel8-container" \
+      name="openshift-pipelines/pipelines-resolvers-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Pipelines Resolvers" \
       maintainer="pipelines-extcomm@redhat.com" \
diff --git a/.konflux/dockerfiles/sidecarlogresults.Dockerfile b/.konflux/dockerfiles/sidecarlogresults.Dockerfile
index a679cee54d6..c3b31cd92aa 100644
--- a/.konflux/dockerfiles/sidecarlogresults.Dockerfile
+++ b/.konflux/dockerfiles/sidecarlogresults.Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
 ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:e4ca1025efad7cc944fb991c716067b12e25ecbe05e6e81715a337179e417aa8
 
 FROM $GO_BUILDER AS builder
@@ -23,8 +23,8 @@ COPY --from=builder /tmp/sidecarlogresults /ko-app/sidecarlogresults
 COPY head ${KO_DATA_PATH}/HEAD
 
 LABEL \
-      com.redhat.component="openshift-pipelines-sidecarlogresults-rhel9-container" \
-      name="openshift-pipelines/pipelines-sidecarlogresults-rhel9" \
+      com.redhat.component="openshift-pipelines-sidecarlogresults-rhel8-container" \
+      name="openshift-pipelines/pipelines-sidecarlogresults-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Pipelines Sidecarlogresults" \
       maintainer="pipelines-extcomm@redhat.com" \
diff --git a/.konflux/dockerfiles/webhook.Dockerfile b/.konflux/dockerfiles/webhook.Dockerfile
index 79aab629c02..c1e2ffa9911 100644
--- a/.konflux/dockerfiles/webhook.Dockerfile
+++ b/.konflux/dockerfiles/webhook.Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
 ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:e4ca1025efad7cc944fb991c716067b12e25ecbe05e6e81715a337179e417aa8
 
 FROM $GO_BUILDER AS builder
@@ -23,8 +23,8 @@ COPY --from=builder /tmp/webhook /ko-app/webhook
 COPY head ${KO_DATA_PATH}/HEAD
 
 LABEL \
-      com.redhat.component="openshift-pipelines-webhook-rhel9-container" \
-      name="openshift-pipelines/pipelines-webhook-rhel9" \
+      com.redhat.component="openshift-pipelines-webhook-rhel8-container" \
+      name="openshift-pipelines/pipelines-webhook-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Pipelines Webhook" \
       maintainer="pipelines-extcomm@redhat.com" \
diff --git a/.konflux/dockerfiles/workingdirinit.Dockerfile b/.konflux/dockerfiles/workingdirinit.Dockerfile
index 9c0d432fc42..d3ffa7c9c29 100644
--- a/.konflux/dockerfiles/workingdirinit.Dockerfile
+++ b/.konflux/dockerfiles/workingdirinit.Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
 ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:e4ca1025efad7cc944fb991c716067b12e25ecbe05e6e81715a337179e417aa8
 
 FROM $GO_BUILDER AS builder
@@ -23,8 +23,8 @@ COPY --from=builder /tmp/workingdirinit /ko-app/workingdirinit
 COPY head ${KO_DATA_PATH}/HEAD
 
 LABEL \
-      com.redhat.component="openshift-pipelines-workingdirinit-rhel9-container" \
-      name="openshift-pipelines/pipelines-workingdirinit-rhel9" \
+      com.redhat.component="openshift-pipelines-workingdirinit-rhel8-container" \
+      name="openshift-pipelines/pipelines-workingdirinit-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Pipelines Workingdirinit" \
       maintainer="pipelines-extcomm@redhat.com" \