diff --git a/images/baremetal/Dockerfile.ci b/images/baremetal/Dockerfile.ci
index 8db2eccd63b..c4d0fe24100 100644
--- a/images/baremetal/Dockerfile.ci
+++ b/images/baremetal/Dockerfile.ci
@@ -8,6 +8,8 @@ FROM registry.ci.openshift.org/ocp/5.0:hyperkube AS kas
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder
 ARG TAGS="baremetal fipscapable"
 ARG SKIP_ENVTEST="y"
+ARG BUILD_VERSION
+ENV BUILD_VERSION=${BUILD_VERSION}
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=etcd /usr/bin/etcd /usr/bin/etcd
diff --git a/images/installer-artifacts/Dockerfile.rhel b/images/installer-artifacts/Dockerfile.rhel
index 8e460fbd069..3ab60cad091 100644
--- a/images/installer-artifacts/Dockerfile.rhel
+++ b/images/installer-artifacts/Dockerfile.rhel
@@ -10,6 +10,8 @@ FROM registry.ci.openshift.org/ocp/5.0:installer-etcd-artifacts AS etcd-artifact
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS macbuilder
 ENV GO_COMPLIANCE_EXCLUDE=".*"
 ARG TAGS=""
+ARG BUILD_VERSION
+ENV BUILD_VERSION=${BUILD_VERSION}
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=kas-artifacts /usr/share/openshift/darwin/amd64 cluster-api/bin/darwin_amd64
@@ -19,6 +21,8 @@ RUN GOOS=darwin GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS macarmbuilder
 ENV GO_COMPLIANCE_EXCLUDE=".*"
 ARG TAGS=""
+ARG BUILD_VERSION
+ENV BUILD_VERSION=${BUILD_VERSION}
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=kas-artifacts /usr/share/openshift/darwin/arm64 cluster-api/bin/darwin_arm64
@@ -28,6 +32,8 @@ RUN GOOS=darwin GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS linuxbuilder
 ENV GO_COMPLIANCE_EXCLUDE=".*"
 ARG TAGS=""
+ARG BUILD_VERSION
+ENV BUILD_VERSION=${BUILD_VERSION}
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=kas-artifacts /usr/share/openshift/linux/amd64 cluster-api/bin/linux_amd64
@@ -38,6 +44,8 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS l
 ENV GO_COMPLIANCE_EXCLUDE=".*"
 ARG TAGS=""
 ARG SKIP_ENVTEST="y"
+ARG BUILD_VERSION
+ENV BUILD_VERSION=${BUILD_VERSION}
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=kas-artifacts /usr/share/openshift/linux/arm64 cluster-api/bin/linux_arm64
diff --git a/images/installer/Dockerfile.ci b/images/installer/Dockerfile.ci
index 0df8bd76f41..53ef164b752 100644
--- a/images/installer/Dockerfile.ci
+++ b/images/installer/Dockerfile.ci
@@ -10,6 +10,8 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS b
 ENV GO_COMPLIANCE_EXCLUDE=".*"
 ARG TAGS=""
 ARG SKIP_ENVTEST="y"
+ARG BUILD_VERSION
+ENV BUILD_VERSION=${BUILD_VERSION}
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=kas-artifacts /usr/share/openshift/ cluster-api/bin/
diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci
index 90b6494385b..15a70bd1f97 100644
--- a/images/installer/Dockerfile.upi.ci
+++ b/images/installer/Dockerfile.upi.ci
@@ -11,6 +11,8 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS b
 ENV GO_COMPLIANCE_EXCLUDE=".*"
 ARG TAGS=""
 ARG SKIP_ENVTEST="y"
+ARG BUILD_VERSION
+ENV BUILD_VERSION=${BUILD_VERSION}
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=kas-artifacts /usr/share/openshift/ cluster-api/bin/
diff --git a/images/libvirt/Dockerfile.ci b/images/libvirt/Dockerfile.ci
index bed65187a46..a2719fbcae4 100644
--- a/images/libvirt/Dockerfile.ci
+++ b/images/libvirt/Dockerfile.ci
@@ -9,6 +9,8 @@ FROM registry.ci.openshift.org/ocp/4.17:hyperkube AS kas
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder
 ARG TAGS="libvirt fipscapable"
 ARG SKIP_ENVTEST="y"
+ARG BUILD_VERSION
+ENV BUILD_VERSION=${BUILD_VERSION}
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=etcd /usr/bin/etcd /usr/bin/etcd
diff --git a/images/openstack/Dockerfile.ci b/images/openstack/Dockerfile.ci
index b40d53d799c..8e52f78f096 100644
--- a/images/openstack/Dockerfile.ci
+++ b/images/openstack/Dockerfile.ci
@@ -10,6 +10,8 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS b
 ENV GO_COMPLIANCE_EXCLUDE=".*"
 ARG TAGS=""
 ARG SKIP_ENVTEST="y"
+ARG BUILD_VERSION
+ENV BUILD_VERSION=${BUILD_VERSION}
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 COPY --from=kas-artifacts /usr/share/openshift/ cluster-api/bin/