diff --git a/Dockerfiles/1-26.rhel10.Dockerfile b/Dockerfiles/1-26.rhel10.Dockerfile
new file mode 100644
index 0000000000..b5c57c2593
--- /dev/null
+++ b/Dockerfiles/1-26.rhel10.Dockerfile
@@ -0,0 +1,58 @@
+FROM registry.redhat.io/ubi10:latest
+
+ARG GOPATH
+ENV SUMMARY="RHEL10 based Go builder image for OpenShift ART" \
+    container=oci \
+    GOFLAGS='-mod=vendor' \
+    GOPATH=${GOPATH:-/go} \
+    GOMAXPROCS=8 \
+    GOAMD64=v2 \
+    VERSION="1.26" \
+    GO_VERSION="${__doozer_version:-$VERSION}" \
+    GODEBUG="disablethp=1"
+
+LABEL summary="$SUMMARY" \
+      description="$SUMMARY" \
+      io.k8s.description="$SUMMARY" \
+      io.k8s.display-name="Go Builder $VERSION" \
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
+      version="$VERSION"
+
+RUN dnf update -y && \
+    dnf install -y --nodocs \
+        bc \
+        diffutils \
+        dos2unix \
+        file \
+        findutils \
+        git \
+        goversioninfo \
+        gpgme \
+        gpgme-devel \
+        hostname \
+        krb5-devel \
+        libassuan-devel \
+        libtool \
+        lsof \
+        make \
+        openssl \
+        openssl-devel \
+        patch \
+        python3 \
+        rsync \
+        socat \
+        systemd-devel \
+        tar \
+        tree \
+        util-linux \
+        wget \
+        which \
+        xz \
+        zip && \
+    dnf install -y "golang-*$VERSION*" && \
+    mkdir -p /go/src
+RUN dnf clean all -y
+
+# FOD wrapper modification
+COPY go_wrapper.sh /tmp/go_wrapper.sh
+RUN GO_BIN_PATH=$(which go) && mv $GO_BIN_PATH $GO_BIN_PATH.real && mv /tmp/go_wrapper.sh $GO_BIN_PATH && chmod +x $GO_BIN_PATH
diff --git a/Dockerfiles/1-26.rhel8.Dockerfile b/Dockerfiles/1-26.rhel8.Dockerfile
new file mode 100644
index 0000000000..fbeb0ebf77
--- /dev/null
+++ b/Dockerfiles/1-26.rhel8.Dockerfile
@@ -0,0 +1,79 @@
+FROM registry.redhat.io/ubi8:latest
+
+ARG GOPATH
+ENV SUMMARY="RHEL8 based Go builder image for OpenShift ART" \
+    container=oci \
+    GOFLAGS='-mod=vendor' \
+    GOPATH=${GOPATH:-/go} \
+    GOMAXPROCS=8 \
+    VERSION="1.26" \
+    GO_VERSION="${__doozer_version:-$VERSION}" \
+    GODEBUG="disablethp=1"
+
+LABEL summary="$SUMMARY" \
+      description="$SUMMARY" \
+      io.k8s.description="$SUMMARY" \
+      io.k8s.display-name="Go Builder $VERSION" \
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
+      version="$VERSION"
+
+RUN dnf update -y && \
+    dnf install -y --nodocs \
+        bc \
+        diffutils \
+        dos2unix \
+        file \
+        findutils \
+        git \
+        goversioninfo \
+        gpgme \
+        gpgme-devel \
+        hostname \
+        libassuan-devel \
+        libtool \
+        lsof \
+        make \
+        openssl \
+        openssl-devel \
+        patch \
+        python3 \
+        rsync \
+        socat \
+        systemd-devel \
+        tar \
+        tree \
+        util-linux \
+        wget \
+        which \
+        xz \
+        zip && \
+    dnf install -y "golang-*$VERSION*" && \
+    mkdir -p /go/src
+# provide a cross-compiler for windows/mac binaries (amd64 only)
+COPY cross.tar.gz .
+RUN [ $(go env GOARCH) != "amd64" ] || (\
+    # only install cross-compiler dependencies on amd64
+    yum install -y --setopt=tsflags=nodocs \
+    # Required packages for mac cross-compilation
+    llvm-toolset-17* cmake3 gcc-c++ libxml2-devel \
+    # Required packages for windows cross-compilation
+    glibc mingw64-gcc && \
+    # compile macos cross-compilers
+    tar zfx cross.tar.gz && \
+    export TP_OSXCROSS_DEV=$(pwd)/cross/deps && \
+    pushd cross/osxcross && \
+    UNATTENDED=yes ./build.sh && \
+    popd && \
+    cp -avr cross/osxcross/target/bin/* /usr/local/bin/ && \
+    cp -avr cross/osxcross/target/lib/* /usr/local/lib64/ && \
+    cp -avr cross/osxcross/target/SDK /usr/local/SDK && \
+    echo /usr/local/lib64 > /etc/ld.so.conf.d/local.conf && \
+    /sbin/ldconfig && \
+    rm -rf cross)
+
+# above is conditional; clean up unconditionally
+RUN rm -f cross.tar.gz && yum clean all -y
+
+# FOD wrapper modification
+COPY go_wrapper.sh /tmp/go_wrapper.sh
+RUN GO_BIN_PATH=$(which go) && mv $GO_BIN_PATH $GO_BIN_PATH.real && mv /tmp/go_wrapper.sh $GO_BIN_PATH && chmod +x $GO_BIN_PATH
diff --git a/Dockerfiles/1-26.rhel9.Dockerfile b/Dockerfiles/1-26.rhel9.Dockerfile
new file mode 100644
index 0000000000..88546f7003
--- /dev/null
+++ b/Dockerfiles/1-26.rhel9.Dockerfile
@@ -0,0 +1,81 @@
+FROM registry.redhat.io/ubi9:latest
+
+ARG GOPATH
+ENV SUMMARY="RHEL9 based Go builder image for OpenShift ART" \
+    container=oci \
+    GOFLAGS='-mod=vendor' \
+    GOPATH=${GOPATH:-/go} \
+    GOMAXPROCS=8 \
+    GOAMD64=v2 \
+    VERSION="1.26" \
+    GO_VERSION="${__doozer_version:-$VERSION}" \
+    GODEBUG="disablethp=1"
+
+LABEL summary="$SUMMARY" \
+      description="$SUMMARY" \
+      io.k8s.description="$SUMMARY" \
+      io.k8s.display-name="Go Builder $VERSION" \
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
+      version="$VERSION"
+
+RUN dnf update -y && \
+    dnf install -y --nodocs \
+        bc \
+        diffutils \
+        dos2unix \
+        file \
+        findutils \
+        git \
+        goversioninfo \
+        gpgme \
+        gpgme-devel \
+        hostname \
+        krb5-devel \
+        libassuan-devel \
+        libtool \
+        lsof \
+        make \
+        openssl \
+        openssl-devel \
+        patch \
+        python3 \
+        rsync \
+        socat \
+        systemd-devel \
+        tar \
+        tree \
+        util-linux \
+        wget \
+        which \
+        xz \
+        zip && \
+    dnf install -y "golang-*$VERSION*" && \
+    mkdir -p /go/src
+# provide a cross-compiler for windows/mac binaries (amd64 only)
+COPY cross.tar.gz .
+RUN [ $(go env GOARCH) != "amd64" ] || (\
+    # only install cross-compiler dependencies on amd64
+    yum install -y --setopt=tsflags=nodocs \
+    # Required packages for mac cross-compilation
+    llvm-toolset cmake3 gcc-c++ libxml2-devel \
+    # Required packages for windows cross-compilation
+    glibc mingw64-gcc && \
+    # compile macos cross-compilers
+    tar zfx cross.tar.gz && \
+    export TP_OSXCROSS_DEV=$(pwd)/cross/deps && \
+    pushd cross/osxcross && \
+    UNATTENDED=yes ./build.sh && \
+    popd && \
+    cp -avr cross/osxcross/target/bin/* /usr/local/bin/ && \
+    cp -avr cross/osxcross/target/lib/* /usr/local/lib64/ && \
+    cp -avr cross/osxcross/target/SDK /usr/local/SDK && \
+    echo /usr/local/lib64 > /etc/ld.so.conf.d/local.conf && \
+    /sbin/ldconfig && \
+    rm -rf cross)
+
+# above is conditional; clean up unconditionally
+RUN rm -f cross.tar.gz && yum clean all -y
+
+# FOD wrapper modification
+COPY go_wrapper.sh /tmp/go_wrapper.sh
+RUN GO_BIN_PATH=$(which go) && mv $GO_BIN_PATH $GO_BIN_PATH.real && mv /tmp/go_wrapper.sh $GO_BIN_PATH && chmod +x $GO_BIN_PATH
diff --git a/group.yml b/group.yml
new file mode 100644
index 0000000000..33d9b7faa1
--- /dev/null
+++ b/group.yml
@@ -0,0 +1,222 @@
+name: golang
+
+arches:
+- x86_64
+- ppc64le
+- s390x
+- aarch64
+
+# These values are injected at runtime for the specific group that the builder is built for
+vars:
+  MAJOR: major
+  MINOR: minor
+
+konflux:
+  cachi2:
+    enabled: true
+
+urls:
+  brewhub: https://brewhub.engineering.redhat.com/brewhub
+  brew_image_host: registry-proxy.engineering.redhat.com
+  brew_image_namespace: rh-osbs
+  cgit: https://pkgs.devel.redhat.com/cgit
+
+insecure_source: true
+default_image_build_method: osbs2
+
+default_image_build_profile: unsigned
+build_profiles:
+  image:
+    unsigned:
+      signing_intent: unsigned
+      repo_type: unsigned
+
+repos:
+  # RHEL 9
+  rhel-9-golang-rpms:
+    conf:
+      extra_options:
+        module_hotfixes: 1
+        includepkgs: module-build-macros golang* goversioninfo
+      baseurl:
+        aarch64: https://download.devel.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-9-build/latest/aarch64/
+        ppc64le: https://download.devel.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-9-build/latest/ppc64le/
+        s390x: https://download.devel.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-9-build/latest/s390x/
+        x86_64: https://download.devel.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-9-build/latest/x86_64/
+    content_set:
+      default: rhocp-{MAJOR}.{MINOR}-for-rhel-9-x86_64-rpms
+      aarch64: rhocp-{MAJOR}.{MINOR}-for-rhel-9-aarch64-rpms
+      ppc64le: rhocp-{MAJOR}.{MINOR}-for-rhel-9-ppc64le-rpms
+      s390x: rhocp-{MAJOR}.{MINOR}-for-rhel-9-s390x-rpms
+      optional: true
+
+  rhel-9-baseos-rpms:
+    conf:
+      baseurl:
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/aarch64/baseos/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/ppc64le/baseos/os/
+        s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/s390x/baseos/os/
+        x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/x86_64/baseos/os/
+    content_set:
+      default: rhel-9-for-x86_64-baseos-eus-rpms__9_DOT_4
+      aarch64: rhel-9-for-aarch64-baseos-eus-rpms__9_DOT_4
+      ppc64le: rhel-9-for-ppc64le-baseos-eus-rpms__9_DOT_4
+      s390x: rhel-9-for-s390x-baseos-eus-rpms__9_DOT_4
+    reposync:
+      enabled: false
+
+  rhel-9-appstream-rpms:
+    conf:
+      baseurl:
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/aarch64/appstream/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/ppc64le/appstream/os/
+        s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/s390x/appstream/os/
+        x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/x86_64/appstream/os/
+    content_set:
+      default: rhel-9-for-x86_64-appstream-eus-rpms__9_DOT_4
+      aarch64: rhel-9-for-aarch64-appstream-eus-rpms__9_DOT_4
+      ppc64le: rhel-9-for-ppc64le-appstream-eus-rpms__9_DOT_4
+      s390x: rhel-9-for-s390x-appstream-eus-rpms__9_DOT_4
+    reposync:
+      enabled: false
+
+  rhel-9-codeready-builder-rpms:
+    conf:
+      baseurl:
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/aarch64/codeready-builder/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/ppc64le/codeready-builder/os/
+        s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/s390x/codeready-builder/os/
+        x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/x86_64/codeready-builder/os/
+    content_set:
+      default: codeready-builder-for-rhel-9-x86_64-eus-rpms__9_DOT_4
+      aarch64: codeready-builder-for-rhel-9-aarch64-eus-rpms__9_DOT_4
+      ppc64le: codeready-builder-for-rhel-9-ppc64le-eus-rpms__9_DOT_4
+      s390x: codeready-builder-for-rhel-9-s390x-eus-rpms__9_DOT_4
+    reposync:
+      enabled: false
+
+  # RHEL 8
+  rhel-8-golang-rpms:
+    conf:
+      extra_options:
+        module_hotfixes: 1
+        includepkgs: module-build-macros delve golang* go-toolset* goversioninfo
+      baseurl:
+        aarch64: https://download.devel.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-8-build/latest/aarch64/
+        ppc64le: https://download.devel.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-8-build/latest/ppc64le/
+        s390x: https://download.devel.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-8-build/latest/s390x/
+        x86_64: https://download.devel.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-8-build/latest/x86_64/
+    content_set:
+      default: rhocp-{MAJOR}.{MINOR}-for-rhel-8-x86_64-rpms
+      aarch64: rhocp-{MAJOR}.{MINOR}-for-rhel-8-aarch64-rpms
+      ppc64le: rhocp-{MAJOR}.{MINOR}-for-rhel-8-ppc64le-rpms
+      s390x: rhocp-{MAJOR}.{MINOR}-for-rhel-8-s390x-rpms
+      optional: true
+
+  rhel-8-baseos-rpms:
+    conf:
+      baseurl:
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/aarch64/baseos/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/ppc64le/baseos/os/
+        s390x:   https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/s390x/baseos/os/
+        x86_64:  https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/x86_64/baseos/os/
+    content_set:
+      default: rhel-8-for-x86_64-baseos-rpms__8
+      aarch64: rhel-8-for-aarch64-baseos-rpms__8
+      ppc64le: rhel-8-for-ppc64le-baseos-rpms__8
+      s390x: rhel-8-for-s390x-baseos-rpms__8
+    reposync:
+      enabled: false
+
+  rhel-8-appstream-rpms:
+    conf:
+      baseurl:
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/aarch64/appstream/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/ppc64le/appstream/os/
+        s390x:   https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/s390x/appstream/os/
+        x86_64:  https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/x86_64/appstream/os/
+    content_set:
+      default: rhel-8-for-x86_64-appstream-rpms__8
+      aarch64: rhel-8-for-aarch64-appstream-rpms__8
+      ppc64le: rhel-8-for-ppc64le-appstream-rpms__8
+      s390x: rhel-8-for-s390x-appstream-rpms__8
+    reposync:
+      enabled: false
+
+  rhel-8-codeready-builder-rpms:
+    conf:
+      baseurl:
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/aarch64/codeready-builder/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/ppc64le/codeready-builder/os/
+        s390x:   https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/s390x/codeready-builder/os/
+        x86_64:  https://rhsm-pulp.corp.redhat.com/content/dist/rhel8/8/x86_64/codeready-builder/os/
+    content_set:
+      default: codeready-builder-for-rhel-8-x86_64-rpms__8
+      aarch64: codeready-builder-for-rhel-8-aarch64-rpms__8
+      ppc64le: codeready-builder-for-rhel-8-ppc64le-rpms__8
+      s390x:   codeready-builder-for-rhel-8-s390x-rpms__8
+    reposync:
+      enabled: false
+
+  # RHEL 10
+  rhel-10-golang-rpms:
+    conf:
+      extra_options:
+        module_hotfixes: 1
+        includepkgs: module-build-macros golang* goversioninfo
+      baseurl:
+        aarch64: https://download-node-02.eng.bos.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-10-build/latest/aarch64/
+        ppc64le: https://download-node-02.eng.bos.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-10-build/latest/ppc64le/
+        s390x: https://download-node-02.eng.bos.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-10-build/latest/s390x/
+        x86_64: https://download-node-02.eng.bos.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-10-build/latest/x86_64/
+    content_set:
+      default: rhocp-{MAJOR}.{MINOR}-for-rhel-10-x86_64-rpms
+      aarch64: rhocp-{MAJOR}.{MINOR}-for-rhel-10-aarch64-rpms
+      ppc64le: rhocp-{MAJOR}.{MINOR}-for-rhel-10-ppc64le-rpms
+      s390x: rhocp-{MAJOR}.{MINOR}-for-rhel-10-s390x-rpms
+      optional: true
+
+  rhel-10-baseos-rpms:
+    conf:
+      baseurl:
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/aarch64/baseos/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/ppc64le/baseos/os/
+        s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/s390x/baseos/os/
+        x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/x86_64/baseos/os/
+    content_set:
+      default: rhel-10-for-x86_64-baseos-eus-rpms__10_DOT_0
+      aarch64: rhel-10-for-aarch64-baseos-eus-rpms__10_DOT_0
+      ppc64le: rhel-10-for-ppc64le-baseos-eus-rpms__10_DOT_0
+      s390x: rhel-10-for-s390x-baseos-eus-rpms__10_DOT_0
+    reposync:
+      enabled: false
+
+  rhel-10-appstream-rpms:
+    conf:
+      baseurl:
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/aarch64/appstream/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/ppc64le/appstream/os/
+        s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/s390x/appstream/os/
+        x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/x86_64/appstream/os/
+    content_set:
+      default: rhel-10-for-x86_64-appstream-eus-rpms__10_DOT_0
+      aarch64: rhel-10-for-aarch64-appstream-eus-rpms__10_DOT_0
+      ppc64le: rhel-10-for-ppc64le-appstream-eus-rpms__10_DOT_0
+      s390x: rhel-10-for-s390x-appstream-eus-rpms__10_DOT_0
+    reposync:
+      enabled: false
+
+  rhel-10-codeready-builder-rpms:
+    conf:
+      baseurl:
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/aarch64/codeready-builder/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/ppc64le/codeready-builder/os/
+        s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/s390x/codeready-builder/os/
+        x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel10/10.0/x86_64/codeready-builder/os/
+    content_set:
+      default: codeready-builder-for-rhel-10-x86_64-eus-rpms__10_DOT_0
+      aarch64: codeready-builder-for-rhel-10-aarch64-eus-rpms__10_DOT_0
+      ppc64le: codeready-builder-for-rhel-10-ppc64le-eus-rpms__10_DOT_0
+      s390x: codeready-builder-for-rhel-10-s390x-eus-rpms__10_DOT_0
+    reposync:
+      enabled: false
diff --git a/images/openshift-golang-builder-1-26.rhel10.yml b/images/openshift-golang-builder-1-26.rhel10.yml
new file mode 100644
index 0000000000..c106a1bc69
--- /dev/null
+++ b/images/openshift-golang-builder-1-26.rhel10.yml
@@ -0,0 +1,60 @@
+content:
+  set_build_variables: false
+  source:
+    path: Dockerfiles
+    dockerfile: 1-26.rhel10.Dockerfile
+    git:
+      branch:
+        target: golang
+      url: git@github.com:openshift-eng/ocp-build-data.git
+    modifications:
+    - &add_fips_wrapper
+      action: add
+      doozer_source: golang_builder_FIPS_wrapper.sh
+      path: go_wrapper.sh
+      overwriting: true
+
+distgit:
+  branch: rhaos-{MAJOR}.{MINOR}-rhel-10
+
+targets:
+- rhaos-{MAJOR}.{MINOR}-rhel-10-hotfix
+
+enabled_repos:
+- rhel-10-baseos-rpms
+- rhel-10-golang-rpms
+# for clang
+- rhel-10-appstream-rpms
+- rhel-10-codeready-builder-rpms
+
+from:
+  stream: rhel10
+
+labels:
+  io.k8s.description: golang builder image for Red Hat internal builds
+
+name: openshift/golang-builder
+
+owners:
+- aos-team-art@redhat.com
+
+# for CPaaS
+additional_tags:
+- 'rhel_10_golang_1.26'
+- 'rhel_10_1.26'
+maintainer:
+  component: Release
+
+konflux:
+  cachi2:
+    artifact_lockfile:
+      resources:
+      - https://ocp-artifacts.engineering.redhat.com/pub/RHOCP/build-deps/openshift-golang-builder/cross.tar.gz
+  network_mode: open
+  content:
+    source:
+      modifications:
+        - *add_fips_wrapper
+        - action: replace
+          match: "COPY cross.tar.gz "
+          replacement: "RUN cp /cachi2/output/deps/generic/cross.tar.gz "
diff --git a/images/openshift-golang-builder-1-26.rhel8.yml b/images/openshift-golang-builder-1-26.rhel8.yml
new file mode 100644
index 0000000000..f2bb050cdf
--- /dev/null
+++ b/images/openshift-golang-builder-1-26.rhel8.yml
@@ -0,0 +1,59 @@
+content:
+  set_build_variables: false
+  source:
+    path: Dockerfiles
+    dockerfile: 1-26.rhel8.Dockerfile
+    git:
+      branch:
+        target: golang
+      url: git@github.com:openshift-eng/ocp-build-data.git
+    modifications:
+    - &add_fips_wrapper
+      action: add
+      doozer_source: golang_builder_FIPS_wrapper.sh
+      path: go_wrapper.sh
+      overwriting: true
+
+distgit:
+  branch: rhaos-{MAJOR}.{MINOR}-rhel-8
+
+targets:
+- rhaos-{MAJOR}.{MINOR}-rhel-8-hotfix
+
+enabled_repos:
+- rhel-8-golang-rpms
+- rhel-8-baseos-rpms
+# for clang
+- rhel-8-appstream-rpms
+- rhel-8-codeready-builder-rpms
+
+from:
+  stream: rhel8
+
+labels:
+  io.k8s.description: golang builder image for Red Hat internal builds
+
+name: openshift/golang-builder
+
+owners:
+- aos-team-art@redhat.com
+
+additional_tags:
+- 'rhel_8_golang_1.26'
+- 'rhel_8_1.26'
+maintainer:
+  component: Release
+
+konflux:
+  cachi2:
+    artifact_lockfile:
+      resources:
+      - https://ocp-artifacts.engineering.redhat.com/pub/RHOCP/build-deps/openshift-golang-builder/cross.tar.gz
+  network_mode: open
+  content:
+    source:
+      modifications:
+        - *add_fips_wrapper
+        - action: replace
+          match: "COPY cross.tar.gz "
+          replacement: "RUN cp /cachi2/output/deps/generic/cross.tar.gz "
diff --git a/images/openshift-golang-builder-1-26.rhel9.yml b/images/openshift-golang-builder-1-26.rhel9.yml
new file mode 100644
index 0000000000..47c2f02710
--- /dev/null
+++ b/images/openshift-golang-builder-1-26.rhel9.yml
@@ -0,0 +1,60 @@
+content:
+  set_build_variables: false
+  source:
+    path: Dockerfiles
+    dockerfile: 1-26.rhel9.Dockerfile
+    git:
+      branch:
+        target: golang
+      url: git@github.com:openshift-eng/ocp-build-data.git
+    modifications:
+    - &add_fips_wrapper
+      action: add
+      doozer_source: golang_builder_FIPS_wrapper.sh
+      path: go_wrapper.sh
+      overwriting: true
+
+distgit:
+  branch: rhaos-{MAJOR}.{MINOR}-rhel-9
+
+targets:
+- rhaos-{MAJOR}.{MINOR}-rhel-9-hotfix
+
+enabled_repos:
+- rhel-9-baseos-rpms
+- rhel-9-golang-rpms
+# for clang
+- rhel-9-appstream-rpms
+- rhel-9-codeready-builder-rpms
+
+from:
+  stream: rhel9
+
+labels:
+  io.k8s.description: golang builder image for Red Hat internal builds
+
+name: openshift/golang-builder
+
+owners:
+- aos-team-art@redhat.com
+
+# for CPaaS
+additional_tags:
+- 'rhel_9_golang_1.26'
+- 'rhel_9_1.26'
+maintainer:
+  component: Release
+
+konflux:
+  network_mode: hermetic
+  cachi2:
+    artifact_lockfile:
+      resources:
+      - https://ocp-artifacts.engineering.redhat.com/pub/RHOCP/build-deps/openshift-golang-builder/cross.tar.gz
+  content:
+    source:
+      modifications:
+        - *add_fips_wrapper
+        - action: replace
+          match: "COPY cross.tar.gz "
+          replacement: "RUN cp /cachi2/output/deps/generic/cross.tar.gz "
diff --git a/streams.yml b/streams.yml
new file mode 100644
index 0000000000..a9289fdc99
--- /dev/null
+++ b/streams.yml
@@ -0,0 +1,12 @@
+---
+rhel9:
+# rhel-els-container-9.4-943.1726661131
+  image: registry-proxy.engineering.redhat.com/rh-osbs/rhel-els@sha256:2aaaf576ca73226a6f00af0fd0f0f1e08d5f6a269d15f9b5305d3d5bde94d4f7
+
+rhel8:
+  # ubi8-container-8.10-901.1717584420
+  image: registry-proxy.engineering.redhat.com/rh-osbs/ubi8@sha256:143123d85045df426c5bbafc6863659880ebe276eb02c77ee868b88d08dbd05d
+
+rhel10:
+  # TODO: update with actual rhel-10 base image digest
+  image: registry-proxy.engineering.redhat.com/rh-osbs/ubi10:latest