diff --git a/.konflux/controller/Dockerfile b/.konflux/controller/Dockerfile
index 1f81613..c9e1cf8 100644
--- a/.konflux/controller/Dockerfile
+++ b/.konflux/controller/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/go-toolset:1.24 AS builder
+FROM registry.redhat.io/ubi9/go-toolset@sha256:71f121a44270e46a17a548d6b92096a1a0fb56db44927ad318d095177d6dce4b AS builder
 
 ENV GOEXPERIMENT=strictfipsruntime
 
@@ -20,11 +20,15 @@ ENTRYPOINT ["./openshift-builds-controller"]
 LABEL \
     com.redhat.component="openshift-builds-controller" \
     name="openshift-builds/openshift-builds-controller-rhel9" \
-    version="v1.6.0" \
+    version="v1.6.1" \
     summary="Red Hat OpenShift Builds Controller" \
     maintainer="openshift-builds@redhat.com" \
     description="Red Hat OpenShift Builds Controller" \
     io.k8s.description="Red Hat OpenShift Builds Controller" \
     io.k8s.display-name="Red Hat OpenShift Builds Controller" \
     io.openshift.tags="builds,controller" \
-    cpe="cpe:/a:redhat:openshift_builds:1.6::el9"
\ No newline at end of file
+    cpe="cpe:/a:redhat:openshift_builds:1.6::el9" \
+    distribution-scope="restricted" \
+    release="2" \
+    url="https://github.com/redhat-openshift-builds/shipwright-io" \
+    vendor="Red Hat, Inc."
\ No newline at end of file
diff --git a/.konflux/git-cloner/Dockerfile b/.konflux/git-cloner/Dockerfile
index 6196a2e..ab1c7d8 100644
--- a/.konflux/git-cloner/Dockerfile
+++ b/.konflux/git-cloner/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/go-toolset:1.24 AS builder
+FROM registry.redhat.io/ubi9/go-toolset@sha256:71f121a44270e46a17a548d6b92096a1a0fb56db44927ad318d095177d6dce4b AS builder
 
 ENV GOEXPERIMENT=strictfipsruntime
 
@@ -32,11 +32,15 @@ ENTRYPOINT ["/ko-app/git"]
 LABEL \
     com.redhat.component="openshift-builds-git-cloner" \
     name="openshift-builds/openshift-builds-git-cloner-rhel9" \
-    version="v1.6.0" \
+    version="v1.6.1" \
     summary="Red Hat OpenShift Builds Git Cloner" \
     maintainer="openshift-builds@redhat.com" \
     description="Red Hat OpenShift Builds Git Cloner" \
     io.k8s.description="Red Hat OpenShift Builds Git Cloner" \
     io.k8s.display-name="Red Hat OpenShift Builds Git Cloner" \
     io.openshift.tags="builds,git-cloner" \
-    cpe="cpe:/a:redhat:openshift_builds:1.6::el9"
+    cpe="cpe:/a:redhat:openshift_builds:1.6::el9" \
+    distribution-scope="restricted" \
+    release="2" \
+    url="https://github.com/redhat-openshift-builds/shipwright-io" \
+    vendor="Red Hat, Inc."
diff --git a/.konflux/image-bundler/Dockerfile b/.konflux/image-bundler/Dockerfile
index 513a509..1f46597 100644
--- a/.konflux/image-bundler/Dockerfile
+++ b/.konflux/image-bundler/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/go-toolset:1.24 AS builder
+FROM registry.redhat.io/ubi9/go-toolset@sha256:71f121a44270e46a17a548d6b92096a1a0fb56db44927ad318d095177d6dce4b AS builder
 
 ENV GOEXPERIMENT=strictfipsruntime
 
@@ -20,11 +20,15 @@ ENTRYPOINT ["/ko-app/bundle"]
 LABEL \
     com.redhat.component="openshift-builds-image-bundler" \
     name="openshift-builds/openshift-builds-image-bundler-rhel9" \
-    version="v1.6.0" \
+    version="v1.6.1" \
     summary="Red Hat OpenShift Builds Image Bundler" \
     maintainer="openshift-builds@redhat.com" \
     description="Red Hat OpenShift Builds Image Bundler" \
     io.k8s.description="Red Hat OpenShift Builds Image Bundler" \
     io.k8s.display-name="Red Hat OpenShift Builds Image Bundler" \
     io.openshift.tags="builds,image-bundler" \
-    cpe="cpe:/a:redhat:openshift_builds:1.6::el9"
+    cpe="cpe:/a:redhat:openshift_builds:1.6::el9" \
+    distribution-scope="restricted" \
+    release="2" \
+    url="https://github.com/redhat-openshift-builds/shipwright-io" \
+    vendor="Red Hat, Inc."
diff --git a/.konflux/image-processing/Dockerfile b/.konflux/image-processing/Dockerfile
index 434ba5e..c4ac45e 100644
--- a/.konflux/image-processing/Dockerfile
+++ b/.konflux/image-processing/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/go-toolset:1.24 AS builder
+FROM registry.redhat.io/ubi9/go-toolset@sha256:71f121a44270e46a17a548d6b92096a1a0fb56db44927ad318d095177d6dce4b AS builder
 
 ENV GOEXPERIMENT=strictfipsruntime
 
@@ -31,11 +31,15 @@ ENTRYPOINT ["/ko-app/image-processing"]
 LABEL \
     com.redhat.component="openshift-builds-image-processing" \
     name="openshift-builds/openshift-builds-image-processing-rhel9" \
-    version="v1.6.0" \
+    version="v1.6.1" \
     summary="Red Hat OpenShift Builds Image Processing" \
     maintainer="openshift-builds@redhat.com" \
     description="Red Hat OpenShift Builds Image Processing" \
     io.k8s.description="Red Hat OpenShift Builds Image Processing" \
     io.k8s.display-name="Red Hat OpenShift Builds Image Processing" \
     io.openshift.tags="builds,image-processing" \
-    cpe="cpe:/a:redhat:openshift_builds:1.6::el9"
+    cpe="cpe:/a:redhat:openshift_builds:1.6::el9" \
+    distribution-scope="restricted" \
+    release="2" \
+    url="https://github.com/redhat-openshift-builds/shipwright-io" \
+    vendor="Red Hat, Inc."
diff --git a/.konflux/waiter/Dockerfile b/.konflux/waiter/Dockerfile
index 62747e5..2da296b 100644
--- a/.konflux/waiter/Dockerfile
+++ b/.konflux/waiter/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/go-toolset:1.24 AS builder
+FROM registry.redhat.io/ubi9/go-toolset@sha256:71f121a44270e46a17a548d6b92096a1a0fb56db44927ad318d095177d6dce4b AS builder
 
 ENV GOEXPERIMENT=strictfipsruntime
 
@@ -32,11 +32,15 @@ ENTRYPOINT ["/ko-app/waiter"]
 LABEL \
     com.redhat.component="openshift-builds-waiter" \
     name="openshift-builds/openshift-builds-waiter-rhel9" \
-    version="v1.6.0" \
+    version="v1.6.1" \
     summary="Red Hat OpenShift Builds Waiter" \
     maintainer="openshift-builds@redhat.com" \
     description="Red Hat OpenShift Builds Waiter" \
     io.k8s.description="Red Hat OpenShift Builds Waiter" \
     io.k8s.display-name="Red Hat OpenShift Builds Waiter" \
     io.openshift.tags="builds,waiter" \
-    cpe="cpe:/a:redhat:openshift_builds:1.6::el9"
+    cpe="cpe:/a:redhat:openshift_builds:1.6::el9" \
+    distribution-scope="restricted" \
+    release="2" \
+    url="https://github.com/redhat-openshift-builds/shipwright-io" \
+    vendor="Red Hat, Inc."
diff --git a/.konflux/webhook/Dockerfile b/.konflux/webhook/Dockerfile
index 298f347..ebc9622 100644
--- a/.konflux/webhook/Dockerfile
+++ b/.konflux/webhook/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/go-toolset:1.24 AS builder
+FROM registry.redhat.io/ubi9/go-toolset@sha256:71f121a44270e46a17a548d6b92096a1a0fb56db44927ad318d095177d6dce4b AS builder
 
 ENV GOEXPERIMENT=strictfipsruntime
 
@@ -20,11 +20,15 @@ ENTRYPOINT ["./openshift-builds-webhook"]
 LABEL \
     com.redhat.component="openshift-builds-webhook" \
     name="openshift-builds/openshift-builds-webhook-rhel9" \
-    version="v1.6.0" \
+    version="v1.6.1" \
     summary="Red Hat OpenShift Builds webhook" \
     maintainer="openshift-builds@redhat.com" \
     description="Red Hat OpenShift Builds webhook" \
     io.k8s.description="Red Hat OpenShift Builds Webhook" \
     io.k8s.display-name="Red Hat OpenShift Builds Webhook" \
     io.openshift.tags="builds,conversion-webhook" \
-    cpe="cpe:/a:redhat:openshift_builds:1.6::el9"
+    cpe="cpe:/a:redhat:openshift_builds:1.6::el9" \
+    distribution-scope="restricted" \
+    release="2" \
+    url="https://github.com/redhat-openshift-builds/shipwright-io" \
+    vendor="Red Hat, Inc."