diff --git a/.gitignore b/.gitignore
index 5f644de46..ec7ebbab0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,11 +43,6 @@ public/architectures/**/secrets/*
 
 docker/mongodb-kubernetes-appdb/content/readinessprobe
 mongodb-kubernetes
-docker/mongodb-kubernetes-operator/Dockerfile
-docker/mongodb-kubernetes-database/Dockerfile
-docker/mongodb-enterprise-ops-manager/Dockerfile
-docker/mongodb-kubernetes-init-database/Dockerfile
-docker/mongodb-kubernetes-init-ops-manager/Dockerfile
 docker/mongodb-kubernetes-operator/content/mongodb-kubernetes-operator.tar
 docker/mongodb-kubernetes-tests/helm_chart/
 docker/mongodb-kubernetes-tests/public/
diff --git a/docker/mongodb-agent-non-matrix/Dockerfile b/docker/mongodb-agent-non-matrix/Dockerfile
index e1c1caff2..0677126fd 100644
--- a/docker/mongodb-agent-non-matrix/Dockerfile
+++ b/docker/mongodb-agent-non-matrix/Dockerfile
@@ -1,5 +1,14 @@
-ARG imagebase
-FROM ${imagebase} as base
+FROM scratch AS base
+
+ARG agent_version
+ARG agent_distro
+ARG tools_version
+ARG tools_distro
+
+ADD https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod/mongodb-mms-automation-agent-${agent_version}.${agent_distro}.tar.gz /data/mongodb-agent.tar.gz
+ADD https://downloads.mongodb.org/tools/db/mongodb-database-tools-${tools_distro}-${tools_version}.tgz /data/mongodb-tools.tgz
+
+COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/LICENSE
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal
 
diff --git a/docker/mongodb-agent-non-matrix/Dockerfile.old b/docker/mongodb-agent-non-matrix/Dockerfile.old
new file mode 100644
index 000000000..e1c1caff2
--- /dev/null
+++ b/docker/mongodb-agent-non-matrix/Dockerfile.old
@@ -0,0 +1,60 @@
+ARG imagebase
+FROM ${imagebase} as base
+
+FROM registry.access.redhat.com/ubi9/ubi-minimal
+
+ARG version
+
+LABEL name="MongoDB Agent" \
+      version="${version}" \
+      summary="MongoDB Agent" \
+      description="MongoDB Agent" \
+      vendor="MongoDB" \
+      release="1" \
+      maintainer="support@mongodb.com"
+
+# Replace libcurl-minimal and curl-minimal with the full versions
+# https://bugzilla.redhat.com/show_bug.cgi?id=1994521
+RUN  microdnf install -y libssh libpsl libbrotli \
+    && microdnf download curl libcurl \
+    && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \
+    && microdnf remove -y libcurl-minimal curl-minimal
+
+RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 nss_wrapper
+# Copy-pasted from https://www.mongodb.com/docs/manual/tutorial/install-mongodb-enterprise-on-red-hat-tarball/
+RUN microdnf install -y --disableplugin=subscription-manager \
+ cyrus-sasl cyrus-sasl-gssapi cyrus-sasl-plain krb5-libs openldap openssl xz-libs
+# Dependencies for the Agent
+RUN microdnf install -y --disableplugin=subscription-manager  --setopt=install_weak_deps=0 \
+        net-snmp \
+        net-snmp-agent-libs
+RUN microdnf install -y --disableplugin=subscription-manager \
+    hostname tar gzip procps jq \
+    && microdnf upgrade -y  \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /agent \
+    && mkdir -p /var/lib/mongodb-mms-automation \
+      && mkdir -p /var/log/mongodb-mms-automation/ \
+      && chmod -R +wr /var/log/mongodb-mms-automation/ \
+      # ensure that the agent user can write the logs in OpenShift
+      && touch /var/log/mongodb-mms-automation/readiness.log \
+      && chmod ugo+rw /var/log/mongodb-mms-automation/readiness.log
+
+
+COPY --from=base /data/mongodb-agent.tar.gz /agent
+COPY --from=base /data/mongodb-tools.tgz /agent
+COPY --from=base /data/LICENSE /licenses/LICENSE
+
+RUN tar xfz /agent/mongodb-agent.tar.gz \
+    && mv mongodb-mms-automation-agent-*/mongodb-mms-automation-agent /agent/mongodb-agent \
+    && chmod +x /agent/mongodb-agent \
+    && mkdir -p /var/lib/automation/config \
+    && chmod -R +r /var/lib/automation/config \
+    && rm /agent/mongodb-agent.tar.gz \
+    && rm -r mongodb-mms-automation-agent-*
+
+RUN tar xfz /agent/mongodb-tools.tgz --directory /var/lib/mongodb-mms-automation/ && rm /agent/mongodb-tools.tgz
+
+USER 2000
+CMD ["/agent/mongodb-agent", "-cluster=/var/lib/automation/config/automation-config.json"]
diff --git a/docker/mongodb-agent-non-matrix/README.md b/docker/mongodb-agent-non-matrix/README.md
new file mode 100644
index 000000000..79dc0d2d5
--- /dev/null
+++ b/docker/mongodb-agent-non-matrix/README.md
@@ -0,0 +1,17 @@
+### Building locally
+
+For building the MongoDB Agent (non-static) image locally use the example command:
+
+TODO: What to do with label quay.expires-after=48h?
+```bash
+AGENT_VERSION="108.0.7.8810-1"
+TOOLS_VERSION="100.12.0"
+AGENT_DISTRO="rhel9_x86_64"
+TOOLS_DISTRO="rhel93-x86_64"
+docker buildx build --load --progress plain . -f docker/mongodb-agent/Dockerfile -t "mongodb-agent:${AGENT_VERSION}" \
+ --build-arg version="${VERSION}" \
+ --build-arg agent_version="${AGENT_VERSION}" \
+ --build-arg tools_version="${TOOLS_VERSION}" \
+ --build-arg agent_distro="${AGENT_DISTRO}" \
+ --build-arg tools_distro="${TOOLS_DISTRO}"
+```
diff --git a/docker/mongodb-agent/Dockerfile b/docker/mongodb-agent/Dockerfile
index 08d8746d8..5ec4e127b 100644
--- a/docker/mongodb-agent/Dockerfile
+++ b/docker/mongodb-agent/Dockerfile
@@ -1,5 +1,40 @@
-ARG imagebase
-FROM ${imagebase} as base
+# the init database image gets supplied by pipeline.py and corresponds to the operator version we want to release
+# the agent with. This enables us to release the agent for older operator.
+ARG init_database_image
+FROM ${init_database_image} AS init_database
+
+FROM public.ecr.aws/docker/library/golang:1.24 AS dependency_downloader
+
+WORKDIR /go/src/github.com/mongodb/mongodb-kubernetes/
+
+COPY go.mod go.sum ./
+
+RUN go mod download
+
+FROM public.ecr.aws/docker/library/golang:1.24 AS readiness_builder
+
+WORKDIR /go/src/github.com/mongodb/mongodb-kubernetes/
+
+COPY --from=dependency_downloader /go/pkg /go/pkg
+COPY . /go/src/github.com/mongodb/mongodb-kubernetes
+
+RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false go build -o /readinessprobe ./mongodb-community-operator/cmd/readiness/main.go
+RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false go build -o /version-upgrade-hook ./mongodb-community-operator/cmd/versionhook/main.go
+
+FROM scratch AS base
+ARG mongodb_tools_url_ubi
+ARG mongodb_agent_url_ubi
+
+COPY --from=readiness_builder /readinessprobe /data/
+COPY --from=readiness_builder /version-upgrade-hook /data/
+
+ADD ${mongodb_tools_url_ubi} /data/mongodb_tools_ubi.tgz
+ADD ${mongodb_agent_url_ubi} /data/mongodb_agent_ubi.tgz
+
+COPY --from=init_database /probes/probe.sh /data/probe.sh
+COPY --from=init_database /scripts/agent-launcher-lib.sh /data/
+COPY --from=init_database /scripts/agent-launcher.sh /data/
+COPY --from=init_database /licenses/LICENSE /data/
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal
 
diff --git a/docker/mongodb-agent/Dockerfile.old b/docker/mongodb-agent/Dockerfile.old
new file mode 100644
index 000000000..08d8746d8
--- /dev/null
+++ b/docker/mongodb-agent/Dockerfile.old
@@ -0,0 +1,64 @@
+ARG imagebase
+FROM ${imagebase} as base
+
+FROM registry.access.redhat.com/ubi9/ubi-minimal
+
+ARG version
+
+LABEL name="MongoDB Agent" \
+      version="${version}" \
+      summary="MongoDB Agent" \
+      description="MongoDB Agent" \
+      vendor="MongoDB" \
+      release="1" \
+      maintainer="support@mongodb.com"
+
+COPY --from=base /data/probe.sh /opt/scripts/probe.sh
+COPY --from=base /data/readinessprobe /opt/scripts/readinessprobe
+COPY --from=base /data/version-upgrade-hook /opt/scripts/version-upgrade-hook
+COPY --from=base /data/agent-launcher-lib.sh /opt/scripts/agent-launcher-lib.sh
+COPY --from=base /data/agent-launcher.sh /opt/scripts/agent-launcher.sh
+COPY --from=base /data/LICENSE /licenses/LICENSE
+
+# Replace libcurl-minimal and curl-minimal with the full versions
+# https://bugzilla.redhat.com/show_bug.cgi?id=1994521
+RUN  microdnf install -y libssh libpsl libbrotli \
+    && microdnf download curl libcurl \
+    && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \
+    && microdnf remove -y libcurl-minimal curl-minimal
+
+RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 nss_wrapper
+# Copy-pasted from https://www.mongodb.com/docs/manual/tutorial/install-mongodb-enterprise-on-red-hat-tarball/
+RUN microdnf install -y --disableplugin=subscription-manager \
+ cyrus-sasl cyrus-sasl-gssapi cyrus-sasl-plain krb5-libs openldap openssl xz-libs
+# Dependencies for the Agent
+RUN microdnf install -y --disableplugin=subscription-manager  --setopt=install_weak_deps=0 \
+        net-snmp \
+        net-snmp-agent-libs
+RUN microdnf install -y --disableplugin=subscription-manager \
+    hostname tar gzip procps jq \
+    && microdnf upgrade -y  \
+    && rm -rf /var/lib/apt/lists/*
+
+
+COPY --from=base /data/mongodb_tools_ubi.tgz /tools/mongodb_tools.tgz
+COPY --from=base /data/mongodb_agent_ubi.tgz /agent/mongodb_agent.tgz
+
+RUN tar xfz /tools/mongodb_tools.tgz
+RUN mv mongodb-database-tools-*/bin/* /tools
+RUN chmod +x /tools/*
+RUN rm /tools/mongodb_tools.tgz
+RUN rm -rf /mongodb-database-tools-*
+
+RUN tar xfz /agent/mongodb_agent.tgz
+RUN mv mongodb-mms-automation-agent-*/mongodb-mms-automation-agent /agent/mongodb-agent
+RUN chmod +x /agent/mongodb-agent
+RUN rm /agent/mongodb_agent.tgz
+RUN rm -rf mongodb-mms-automation-agent-*
+
+RUN mkdir -p /var/lib/automation/config
+RUN chmod -R +r /var/lib/automation/config
+
+USER 2000
+
+HEALTHCHECK --timeout=30s CMD ls /opt/scripts/readinessprobe || exit 1
diff --git a/docker/mongodb-agent/README.md b/docker/mongodb-agent/README.md
index 377f4b938..a447d60f0 100644
--- a/docker/mongodb-agent/README.md
+++ b/docker/mongodb-agent/README.md
@@ -1,4 +1,20 @@
 # Mongodb-Agent
 The agent gets released in a matrix style with the init-database image, which gets tagged with the operator version.
-This works by using the multi-stage pattern and build-args. First - retrieve the `init-database:<version>` and retrieve the 
-binaries from there. Then we continue with the other steps to fully build the image.
\ No newline at end of file
+This works by using the multi-stage pattern and build-args. First - retrieve the `init-database:<version>` and retrieve the
+binaries from there. Then we continue with the other steps to fully build the image.
+
+### Building locally
+
+For building the MongoDB Agent image locally use the example command:
+
+```bash
+VERSION="108.0.7.8810-1"
+INIT_DATABASE_IMAGE="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database:1.1.0"
+MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db/mongodb-database-tools-rhel93-x86_64-100.12.0.tgz"
+MONGODB_AGENT_URL_UBI="https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod/mongodb-mms-automation-agent-108.0.7.8810-1.rhel9_x86_64.tar.gz"
+docker buildx build --load --progress plain . -f docker/mongodb-agent/Dockerfile -t "mongodb-agent:${VERSION}_1.1.0" \
+ --build-arg version="${VERSION}" \
+ --build-arg init_database_image="${INIT_DATABASE_IMAGE}" \
+ --build-arg mongodb_tools_url_ubi="${MONGODB_TOOLS_URL_UBI}" \
+ --build-arg mongodb_agent_url_ubi="${MONGODB_AGENT_URL_UBI}"
+```
diff --git a/docker/mongodb-enterprise-ops-manager/Dockerfile b/docker/mongodb-enterprise-ops-manager/Dockerfile
new file mode 100644
index 000000000..aa95b4bee
--- /dev/null
+++ b/docker/mongodb-enterprise-ops-manager/Dockerfile
@@ -0,0 +1,95 @@
+# Build compilable stuff
+
+FROM public.ecr.aws/docker/library/golang:1.24 AS readiness_builder
+COPY . /go/src/github.com/mongodb/mongodb-kubernetes
+WORKDIR /go/src/github.com/mongodb/mongodb-kubernetes
+
+RUN CGO_ENABLED=0 go build -a -buildvcs=false -o /data/scripts/mmsconfiguration ./docker/mongodb-kubernetes-init-ops-manager/mmsconfiguration/edit_mms_configuration.go
+RUN CGO_ENABLED=0 go build -a -buildvcs=false -o /data/scripts/backup-daemon-readiness-probe ./docker/mongodb-kubernetes-init-ops-manager/backupdaemon_readinessprobe/backupdaemon_readiness.go
+
+# Move binaries and scripts
+FROM scratch AS base
+
+COPY --from=readiness_builder /data/scripts/mmsconfiguration /data/scripts/mmsconfiguration
+COPY --from=readiness_builder /data/scripts/backup-daemon-readiness-probe /data/scripts/backup-daemon-readiness-probe
+
+# After v2.0, when non-Static Agent images will be removed, please ensure to copy those files
+# into ./docker/mongodb-enterprise-ops-manager directory. Leaving it this way will make the maintenance easier.
+COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/docker-entry-point.sh /data/scripts
+COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/backup-daemon-liveness-probe.sh /data/scripts
+COPY ./docker/mongodb-kubernetes-init-ops-manager/LICENSE /data/licenses/mongodb-enterprise-ops-manager
+
+FROM registry.access.redhat.com/ubi9/ubi-minimal
+
+ARG version
+ARG om_download_url
+
+LABEL name="MongoDB Enterprise Ops Manager" \
+  maintainer="support@mongodb.com" \
+  vendor="MongoDB" \
+  version=${version} \
+  release="1" \
+  summary="MongoDB Enterprise Ops Manager Image" \
+  description="MongoDB Enterprise Ops Manager"
+
+ENV MMS_HOME=/mongodb-ops-manager
+ENV MMS_PROP_FILE=${MMS_HOME}/conf/conf-mms.properties
+ENV MMS_CONF_FILE=${MMS_HOME}/conf/mms.conf
+ENV MMS_LOG_DIR=${MMS_HOME}/logs
+ENV MMS_TMP_DIR=${MMS_HOME}/tmp
+
+EXPOSE 8080
+
+# OpsManager docker image needs to have the MongoDB dependencies because the
+# backup daemon is running its database locally
+
+# Replace libcurl-minimal and curl-minimal with the full versions
+# https://bugzilla.redhat.com/show_bug.cgi?id=1994521
+RUN microdnf install -y libssh libpsl libbrotli \
+    && microdnf download curl libcurl \
+    && rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" \
+    && microdnf remove -y libcurl-minimal curl-minimal
+
+RUN microdnf install --disableplugin=subscription-manager -y \
+  cyrus-sasl \
+  cyrus-sasl-gssapi \
+  cyrus-sasl-plain \
+  krb5-libs \
+  libpcap \
+  lm_sensors-libs \
+  net-snmp \
+  net-snmp-agent-libs \
+  openldap \
+  openssl \
+  tar \
+  rpm-libs \
+  net-tools \
+  procps-ng \
+  ncurses
+
+COPY --from=base /data/licenses /licenses/
+COPY --from=base /data/scripts /opt/scripts
+
+RUN curl --fail -L -o ops_manager.tar.gz ${om_download_url} \
+  && tar -xzf ops_manager.tar.gz \
+  && rm ops_manager.tar.gz \
+  && mv mongodb-mms* "${MMS_HOME}"
+
+# permissions
+RUN chmod -R 0777 "${MMS_LOG_DIR}" \
+  && chmod -R 0777 "${MMS_TMP_DIR}" \
+  && chmod -R 0775 "${MMS_HOME}/conf" \
+  && chmod -R 0775 "${MMS_HOME}/jdk" \
+  && mkdir "${MMS_HOME}/mongodb-releases/" \
+  && chmod -R 0775 "${MMS_HOME}/mongodb-releases" \
+  && chmod -R 0777 "${MMS_CONF_FILE}" \
+  && chmod -R 0777 "${MMS_PROP_FILE}"
+
+# The "${MMS_HOME}/conf" will be populated by the docker-entry-point.sh.
+# For now we need to move into the templates directory.
+RUN cp -r "${MMS_HOME}/conf" "${MMS_HOME}/conf-template"
+
+USER 2000
+
+# operator to change the entrypoint to: /mongodb-ops-manager/bin/mongodb-mms start_mms (or a wrapper around this)
+ENTRYPOINT [ "sleep infinity" ]
diff --git a/docker/mongodb-enterprise-ops-manager/Dockerfile.dcar b/docker/mongodb-enterprise-ops-manager/Dockerfile.dcar
deleted file mode 100644
index 639c7930b..000000000
--- a/docker/mongodb-enterprise-ops-manager/Dockerfile.dcar
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "Dockerfile.ubi" %}
-
-
-{% block packages %}
-RUN yum install --disableplugin=subscription-manager \
-  cyrus-sasl \
-  cyrus-sasl-gssapi \
-  cyrus-sasl-plain \
-  krb5-libs \
-  libcurl \
-  libpcap \
-  lm_sensors-libs \
-  net-snmp \
-  net-snmp-agent-libs \
-  openldap \
-  openssl \
-  rpm-libs \
-  net-tools \
-  procps-ng \
-  ncurses
-{% endblock %}
-
-{% block healthcheck %}
-HEALTHCHECK --timeout=30s CMD ls /mongodb-ops-manager/bin/mongodb-mms || exit 1
-{% endblock %}
diff --git a/docker/mongodb-enterprise-ops-manager/LICENSE b/docker/mongodb-enterprise-ops-manager/LICENSE
deleted file mode 100644
index dc71da876..000000000
--- a/docker/mongodb-enterprise-ops-manager/LICENSE
+++ /dev/null
@@ -1,3 +0,0 @@
-Usage of the MongoDB Enterprise Operator for Kubernetes indicates agreement with the MongoDB Customer Agreement.
-
-* https://www.mongodb.com/customer-agreement/
diff --git a/docker/mongodb-enterprise-ops-manager/README.md b/docker/mongodb-enterprise-ops-manager/README.md
new file mode 100644
index 000000000..440e839bc
--- /dev/null
+++ b/docker/mongodb-enterprise-ops-manager/README.md
@@ -0,0 +1,11 @@
+### Building locally
+
+For building the MongoDB Enterprise Ops Manager Docker image locally use the example command:
+
+```bash
+VERSION="8.0.7"
+OM_DOWNLOAD_URL="https://downloads.mongodb.com/on-prem-mms/tar/mongodb-mms-8.0.7.500.20250505T1426Z.tar.gz"
+docker buildx build --load --progress plain . -f docker/mongodb-enterprise-ops-manager/Dockerfile -t "mongodb-enterprise-ops-manager:${VERSION}" \
+  --build-arg version="${VERSION}" \
+  --build-arg om_download_url="${OM_DOWNLOAD_URL}"
+```
diff --git a/docker/mongodb-kubernetes-database/Dockerfile b/docker/mongodb-kubernetes-database/Dockerfile
new file mode 100644
index 000000000..97fbda8d0
--- /dev/null
+++ b/docker/mongodb-kubernetes-database/Dockerfile
@@ -0,0 +1,71 @@
+FROM scratch AS base
+
+COPY ./docker/mongodb-kubernetes-database/LICENSE /data/licenses/mongodb-kubernetes-database
+
+FROM registry.access.redhat.com/ubi8/ubi-minimal
+
+ARG VERSION
+
+LABEL name="MongoDB Kubernetes Database" \
+      version="${VERSION}" \
+      summary="MongoDB Kubernetes Database Image" \
+      description="MongoDB Kubernetes Database Image" \
+      vendor="MongoDB" \
+      release="1" \
+      maintainer="support@mongodb.com"
+
+ENV MMS_HOME=/mongodb-automation
+ENV MMS_LOG_DIR=/var/log/mongodb-mms-automation
+
+RUN microdnf update -y && rm -rf /var/cache/yum
+
+# these are the packages needed for the agent
+RUN microdnf install -y --disableplugin=subscription-manager --setopt=install_weak_deps=0 nss_wrapper
+RUN microdnf install -y --disableplugin=subscription-manager \
+        hostname \
+        procps
+
+# these are the packages needed for MongoDB
+# (https://docs.mongodb.com/manual/tutorial/install-mongodb-enterprise-on-red-hat-tarball/ "RHEL/CentOS 8" tab)
+RUN microdnf install -y --disableplugin=subscription-manager \
+        cyrus-sasl \
+        cyrus-sasl-gssapi \
+        cyrus-sasl-plain \
+        krb5-libs \
+        libcurl \
+        lm_sensors-libs \
+        net-snmp \
+        net-snmp-agent-libs \
+        openldap \
+        openssl \
+        jq \
+        tar \
+        xz-libs \
+        findutils
+
+RUN ln -s /usr/lib64/libsasl2.so.3 /usr/lib64/libsasl2.so.2
+
+# Set the required perms
+RUN mkdir -p "${MMS_LOG_DIR}" \
+        && chmod 0775 "${MMS_LOG_DIR}" \
+        && mkdir -p /var/lib/mongodb-mms-automation \
+        && chmod 0775 /var/lib/mongodb-mms-automation \
+        && mkdir -p /data \
+        && chmod 0775 /data \
+        && mkdir -p /journal \
+        && chmod 0775 /journal \
+        && mkdir -p "${MMS_HOME}" \
+        && chmod -R 0775 "${MMS_HOME}"
+
+# USER needs to be set for this image to pass RedHat verification. Some customers have these requirements as well
+# It does not matter what number it is, as long as it is set to something.
+# However, OpenShift will run the container as a random user,
+# and the number in this configuration is not relevant.
+USER 2000
+
+# The docker image doesn't have any scripts so by default does nothing
+# The script will be copied in runtime from init containers and the operator is expected
+# to override the COMMAND
+ENTRYPOINT ["sleep infinity"]
+
+COPY --from=base /data/licenses/mongodb-kubernetes-database /licenses/mongodb-kubernetes-database
diff --git a/docker/mongodb-kubernetes-database/README.md b/docker/mongodb-kubernetes-database/README.md
index a6abf56a9..e7b937e0e 100644
--- a/docker/mongodb-kubernetes-database/README.md
+++ b/docker/mongodb-kubernetes-database/README.md
@@ -34,11 +34,12 @@ This image can't be built in any host, because it will require the use of a subs
 host, with subscription service enabled, is required. That's the reason behind using the Redhat build service to build
 this images with.
 
-## Building the DCAR database image
+### Building locally
 
-The dcar image needs to be built manually.
+For building the MongoDB Database image locally use the example command:
 
 ```bash
-docker build . -t 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/usaf/mongodb-kubernetes-database:1.5.3
-docker push 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/usaf/mongodb-kubernetes-database:1.5.3
+VERSION="1.0.1"
+docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-database/Dockerfile -t "mongodb-kubernetes-database:${VERSION}" \
+ --build-arg VERSION="${VERSION}"
 ```
diff --git a/docker/mongodb-kubernetes-init-appdb/Dockerfile b/docker/mongodb-kubernetes-init-appdb/Dockerfile
new file mode 100644
index 000000000..ed0cea9dd
--- /dev/null
+++ b/docker/mongodb-kubernetes-init-appdb/Dockerfile
@@ -0,0 +1,52 @@
+FROM public.ecr.aws/docker/library/golang:1.24 AS readiness_builder
+
+COPY . /go/src/github.com/mongodb/mongodb-kubernetes
+WORKDIR /go/src/github.com/mongodb/mongodb-kubernetes
+RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false go build -o /readinessprobe ./mongodb-community-operator/cmd/readiness/main.go
+RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false go build -o /version-upgrade-hook ./mongodb-community-operator/cmd/versionhook/main.go
+
+FROM scratch AS base
+
+ARG mongodb_tools_url_ubi
+
+COPY --from=readiness_builder /readinessprobe /data/
+COPY --from=readiness_builder /version-upgrade-hook /data/version-upgrade-hook
+
+ADD ${mongodb_tools_url_ubi} /data/mongodb_tools_ubi.tgz
+
+COPY ./docker/mongodb-kubernetes-init-database/content/probe.sh /data/probe.sh
+
+COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher-lib.sh /data/scripts/
+COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher.sh /data/scripts/
+
+COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/licenses/
+
+FROM registry.access.redhat.com/ubi8/ubi-minimal
+
+ARG version
+LABEL name="MongoDB Kubernetes Init AppDB" \
+      version="mongodb-kubernetes-init-appdb-${version}" \
+      summary="MongoDB Kubernetes AppDB Init Image" \
+      description="Startup Scripts for MongoDB Enterprise Application Database for Ops Manager" \
+      release="1" \
+      vendor="MongoDB" \
+      maintainer="support@mongodb.com"
+
+COPY --from=base /data/readinessprobe /probes/readinessprobe
+COPY --from=base /data/probe.sh /probes/probe.sh
+COPY --from=base /data/scripts/ /scripts/
+COPY --from=base /data/licenses /licenses/
+COPY --from=base /data/version-upgrade-hook /probes/version-upgrade-hook
+
+RUN microdnf -y update --nodocs \
+    && microdnf -y install --nodocs tar gzip \
+    && microdnf clean all
+
+COPY --from=base /data/mongodb_tools_ubi.tgz /tools/mongodb_tools.tgz
+
+RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
+    && rm /tools/mongodb_tools.tgz
+
+USER 2000
+
+ENTRYPOINT [ "/bin/cp", "-f", "-r", "/scripts/agent-launcher.sh", "/scripts/agent-launcher-lib.sh", "/probes/readinessprobe", "/probes/probe.sh", "/tools", "/opt/scripts/" ]
diff --git a/docker/mongodb-kubernetes-init-appdb/Dockerfile.builder b/docker/mongodb-kubernetes-init-appdb/Dockerfile.builder
new file mode 100644
index 000000000..69dc6d6af
--- /dev/null
+++ b/docker/mongodb-kubernetes-init-appdb/Dockerfile.builder
@@ -0,0 +1,22 @@
+# Build compilable stuff
+
+FROM public.ecr.aws/docker/library/golang:1.24 as readiness_builder
+COPY . /go/src/github.com/mongodb/mongodb-kubernetes
+WORKDIR /go/src/github.com/mongodb/mongodb-kubernetes
+RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false go build -o /readinessprobe ./mongodb-community-operator/cmd/readiness/main.go
+RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false go build -o /version-upgrade-hook ./mongodb-community-operator/cmd/versionhook/main.go
+
+FROM scratch
+ARG mongodb_tools_url_ubi
+
+COPY --from=readiness_builder /readinessprobe /data/
+COPY --from=readiness_builder /version-upgrade-hook /data/version-upgrade-hook
+
+ADD ${mongodb_tools_url_ubi} /data/mongodb_tools_ubi.tgz
+
+COPY ./docker/mongodb-kubernetes-init-database/content/probe.sh /data/probe.sh
+
+COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher-lib.sh /data/scripts/
+COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher.sh /data/scripts/
+
+COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/licenses/
diff --git a/docker/mongodb-kubernetes-init-appdb/Dockerfile.template b/docker/mongodb-kubernetes-init-appdb/Dockerfile.template
new file mode 100644
index 000000000..3c0d45ee4
--- /dev/null
+++ b/docker/mongodb-kubernetes-init-appdb/Dockerfile.template
@@ -0,0 +1,42 @@
+ARG imagebase
+FROM ${imagebase} as base
+
+FROM {{ base_image }}
+
+ARG version
+
+{%- if is_appdb %}
+LABEL name="MongoDB Kubernetes Init AppDB" \
+      version="mongodb-kubernetes-init-appdb-${version}" \
+      summary="MongoDB Kubernetes AppDB Init Image" \
+      description="Startup Scripts for MongoDB Enterprise Application Database for Ops Manager" \
+{%- else %}
+LABEL name="MongoDB Kubernetes Init Database" \
+      version="mongodb-kubernetes-init-database-${version}" \
+      summary="MongoDB Kubernetes Database Init Image" \
+      description="Startup Scripts for MongoDB Enterprise Database" \
+{%- endif %}
+      release="1" \
+      vendor="MongoDB" \
+      maintainer="support@mongodb.com"
+
+COPY --from=base /data/readinessprobe /probes/readinessprobe
+COPY --from=base /data/probe.sh /probes/probe.sh
+COPY --from=base /data/scripts/ /scripts/
+COPY --from=base /data/licenses /licenses/
+
+{%- if is_appdb %}
+COPY --from=base /data/version-upgrade-hook /probes/version-upgrade-hook
+{%- endif %}
+
+{% block mongodb_tools %}
+{% endblock %}
+
+RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
+    && rm /tools/mongodb_tools.tgz
+
+USER 2000
+ENTRYPOINT [ "/bin/cp", "-f", "-r", "/scripts/agent-launcher.sh", "/scripts/agent-launcher-lib.sh", "/probes/readinessprobe", "/probes/probe.sh", "/tools", "/opt/scripts/" ]
+
+{% block healthcheck %}
+{% endblock %}
diff --git a/docker/mongodb-kubernetes-init-appdb/Dockerfile.ubi_minimal b/docker/mongodb-kubernetes-init-appdb/Dockerfile.ubi_minimal
new file mode 100644
index 000000000..b5400b147
--- /dev/null
+++ b/docker/mongodb-kubernetes-init-appdb/Dockerfile.ubi_minimal
@@ -0,0 +1,11 @@
+{% extends "Dockerfile.template" %}
+
+{% set base_image = "registry.access.redhat.com/ubi8/ubi-minimal" %}
+
+{% block mongodb_tools %}
+RUN microdnf -y update --nodocs \
+    && microdnf -y install --nodocs tar gzip \
+    && microdnf clean all
+
+COPY --from=base /data/mongodb_tools_ubi.tgz    /tools/mongodb_tools.tgz
+{% endblock %}
diff --git a/docker/mongodb-kubernetes-init-appdb/README.md b/docker/mongodb-kubernetes-init-appdb/README.md
new file mode 100644
index 000000000..d49ca4b3a
--- /dev/null
+++ b/docker/mongodb-kubernetes-init-appdb/README.md
@@ -0,0 +1,11 @@
+### Building locally
+
+For building the MongoDB Init AppDB image locally use the example command:
+
+```bash
+VERSION="1.0.1"
+MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db/mongodb-database-tools-rhel93-x86_64-100.12.0.tgz"
+docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-init-appdb/Dockerfile -t "mongodb-kubernetes-init-appdb:${VERSION}" \
+ --build-arg version="${VERSION}" \
+ --build-arg mongodb_tools_url_ubi="${MONGODB_TOOLS_URL_UBI}"
+```
diff --git a/docker/mongodb-kubernetes-init-database/Dockerfile b/docker/mongodb-kubernetes-init-database/Dockerfile
new file mode 100644
index 000000000..6c861fb6a
--- /dev/null
+++ b/docker/mongodb-kubernetes-init-database/Dockerfile
@@ -0,0 +1,50 @@
+FROM public.ecr.aws/docker/library/golang:1.24 AS readiness_builder
+
+COPY . /go/src/github.com/mongodb/mongodb-kubernetes
+WORKDIR /go/src/github.com/mongodb/mongodb-kubernetes
+RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false go build -o /readinessprobe ./mongodb-community-operator/cmd/readiness/main.go
+RUN CGO_ENABLED=0 GOFLAGS=-buildvcs=false go build -o /version-upgrade-hook ./mongodb-community-operator/cmd/versionhook/main.go
+
+FROM scratch AS base
+
+ARG mongodb_tools_url_ubi
+
+COPY --from=readiness_builder /readinessprobe /data/
+COPY --from=readiness_builder /version-upgrade-hook /data/version-upgrade-hook
+
+ADD ${mongodb_tools_url_ubi} /data/mongodb_tools_ubi.tgz
+
+COPY ./docker/mongodb-kubernetes-init-database/content/probe.sh /data/probe.sh
+
+COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher-lib.sh /data/scripts/
+COPY ./docker/mongodb-kubernetes-init-database/content/agent-launcher.sh /data/scripts/
+
+COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/licenses/
+
+FROM registry.access.redhat.com/ubi8/ubi-minimal
+
+ARG version
+LABEL name="MongoDB Kubernetes Init Database" \
+      version="mongodb-kubernetes-init-database-${version}" \
+      summary="MongoDB Kubernetes Database Init Image" \
+      description="Startup Scripts for MongoDB Enterprise Database" \
+      release="1" \
+      vendor="MongoDB" \
+      maintainer="support@mongodb.com"
+
+COPY --from=base /data/readinessprobe /probes/readinessprobe
+COPY --from=base /data/probe.sh /probes/probe.sh
+COPY --from=base /data/scripts/ /scripts/
+COPY --from=base /data/licenses /licenses/
+
+RUN microdnf -y update --nodocs \
+    && microdnf -y install --nodocs tar gzip \
+    && microdnf clean all
+
+COPY --from=base /data/mongodb_tools_ubi.tgz  /tools/mongodb_tools.tgz
+
+RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
+    && rm /tools/mongodb_tools.tgz
+
+USER 2000
+ENTRYPOINT [ "/bin/cp", "-f", "-r", "/scripts/agent-launcher.sh", "/scripts/agent-launcher-lib.sh", "/probes/readinessprobe", "/probes/probe.sh", "/tools", "/opt/scripts/" ]
diff --git a/docker/mongodb-kubernetes-init-database/README.md b/docker/mongodb-kubernetes-init-database/README.md
new file mode 100644
index 000000000..0e6657531
--- /dev/null
+++ b/docker/mongodb-kubernetes-init-database/README.md
@@ -0,0 +1,11 @@
+### Building locally
+
+For building the MongoDB Init AppDB image locally use the example command:
+
+```bash
+VERSION="1.0.1"
+MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db/mongodb-database-tools-rhel93-x86_64-100.12.0.tgz"
+docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-init-database/Dockerfile -t "mongodb-kubernetes-init-database:${VERSION}" \
+ --build-arg version="${VERSION}" \
+ --build-arg mongodb_tools_url_ubi="${MONGODB_TOOLS_URL_UBI}"
+```
diff --git a/docker/mongodb-kubernetes-init-ops-manager/Dockerfile b/docker/mongodb-kubernetes-init-ops-manager/Dockerfile
new file mode 100644
index 000000000..1229ec929
--- /dev/null
+++ b/docker/mongodb-kubernetes-init-ops-manager/Dockerfile
@@ -0,0 +1,31 @@
+FROM public.ecr.aws/docker/library/golang:1.24 AS base
+
+WORKDIR /go/src
+ADD ./docker/mongodb-kubernetes-init-ops-manager .
+RUN CGO_ENABLED=0 go build -a -buildvcs=false -o /data/scripts/mmsconfiguration ./mmsconfiguration
+RUN CGO_ENABLED=0 go build -a -buildvcs=false -o /data/scripts/backup-daemon-readiness-probe ./backupdaemon_readinessprobe/
+
+COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/docker-entry-point.sh /data/scripts/
+COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/backup-daemon-liveness-probe.sh /data/scripts/
+COPY ./docker/mongodb-kubernetes-init-ops-manager/LICENSE /data/licenses/mongodb-enterprise-ops-manager
+
+FROM registry.access.redhat.com/ubi9/ubi-minimal
+
+ARG version
+
+LABEL name="MongoDB Kubernetes Ops Manager Init" \
+      maintainer="support@mongodb.com" \
+      vendor="MongoDB" \
+      version="mongodb-kubernetes-init-ops-manager-${version}" \
+      release="1" \
+      summary="MongoDB Kubernetes Ops Manager Init Image" \
+      description="Startup Scripts for MongoDB Enterprise Ops Manager"
+
+COPY --from=base /data/scripts /scripts
+COPY --from=base /data/licenses /licenses
+
+RUN microdnf -y update --nodocs \
+    && microdnf clean all
+
+USER 2000
+ENTRYPOINT [ "/bin/cp", "-f", "/scripts/docker-entry-point.sh", "/scripts/backup-daemon-liveness-probe.sh",  "/scripts/mmsconfiguration", "/scripts/backup-daemon-readiness-probe", "/opt/scripts/" ]
diff --git a/docker/mongodb-kubernetes-init-ops-manager/README.md b/docker/mongodb-kubernetes-init-ops-manager/README.md
new file mode 100644
index 000000000..71d02da75
--- /dev/null
+++ b/docker/mongodb-kubernetes-init-ops-manager/README.md
@@ -0,0 +1,9 @@
+### Building locally
+
+For building the MongoDB Init Ops Manager image locally use the example command:
+
+```bash
+VERSION="1.1.0"
+docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-init-ops-manager/Dockerfile -t "mongodb-kubernetes-init-ops-manager:${VERSION}" \
+ --build-arg version="${VERSION}"
+```
diff --git a/docker/mongodb-kubernetes-operator/Dockerfile b/docker/mongodb-kubernetes-operator/Dockerfile
new file mode 100644
index 000000000..dcd3af35c
--- /dev/null
+++ b/docker/mongodb-kubernetes-operator/Dockerfile
@@ -0,0 +1,72 @@
+FROM public.ecr.aws/docker/library/golang:1.24 AS builder
+
+ARG version
+ARG log_automation_config_diff
+ARG use_race
+
+COPY go.sum go.mod /go/src/github.com/mongodb/mongodb-kubernetes/
+
+WORKDIR /go/src/github.com/mongodb/mongodb-kubernetes
+RUN go mod download
+
+COPY . /go/src/github.com/mongodb/mongodb-kubernetes
+
+RUN go version
+RUN git version
+RUN mkdir /build && \
+    if [ $use_race = "true" ]; then \
+        echo "Building with race detector" && \
+        CGO_ENABLED=1 go build -o /build/mongodb-kubernetes-operator \
+        -buildvcs=false \
+        -race \
+        -ldflags=" -X github.com/mongodb/mongodb-kubernetes/pkg/util.OperatorVersion=${version} \
+        -X github.com/mongodb/mongodb-kubernetes/pkg/util.LogAutomationConfigDiff=${log_automation_config_diff}"; \
+    else \
+        echo "Building without race detector" && \
+        CGO_ENABLED=0 go build -o /build/mongodb-kubernetes-operator \
+        -buildvcs=false \
+        -ldflags="-s -w -X github.com/mongodb/mongodb-kubernetes/pkg/util.OperatorVersion=${version} \
+        -X github.com/mongodb/mongodb-kubernetes/pkg/util.LogAutomationConfigDiff=${log_automation_config_diff}"; \
+    fi
+
+
+ADD https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 /usr/local/bin/jq
+RUN chmod +x /usr/local/bin/jq
+
+RUN mkdir -p /data
+RUN cat release.json | jq -r '.supportedImages."mongodb-agent" | { "supportedImages": { "mongodb-agent": . } }' > /data/om_version_mapping.json
+RUN chmod +r /data/om_version_mapping.json
+
+FROM scratch AS base
+
+COPY --from=builder /build/mongodb-kubernetes-operator /data/
+COPY --from=builder /data/om_version_mapping.json /data/om_version_mapping.json
+
+ADD docker/mongodb-kubernetes-operator/licenses /data/licenses/
+
+FROM registry.access.redhat.com/ubi9/ubi-minimal
+
+ARG version
+
+LABEL name="MongoDB Kubernetes Operator" \
+      maintainer="support@mongodb.com" \
+      vendor="MongoDB" \
+      version="${version}" \
+      release="1" \
+      summary="MongoDB Kubernetes Operator Image" \
+      description="MongoDB Kubernetes Operator Image"
+
+# Building an UBI-based image: https://red.ht/3n6b9y0
+RUN microdnf update \
+    --disableplugin=subscription-manager \
+    --disablerepo=* --enablerepo=ubi-9-appstream-rpms --enablerepo=ubi-9-baseos-rpms -y \
+    && rm -rf /var/cache/yum
+RUN microdnf install -y glibc-langpack-en
+
+COPY --from=base /data/mongodb-kubernetes-operator /usr/local/bin/mongodb-kubernetes-operator
+COPY --from=base /data/om_version_mapping.json /usr/local/om_version_mapping.json
+COPY --from=base /data/licenses /licenses/
+
+USER 2000
+
+ENTRYPOINT exec /usr/local/bin/mongodb-kubernetes-operator
diff --git a/docker/mongodb-kubernetes-operator/README.md b/docker/mongodb-kubernetes-operator/README.md
index 4dc971f03..8335c1d79 100644
--- a/docker/mongodb-kubernetes-operator/README.md
+++ b/docker/mongodb-kubernetes-operator/README.md
@@ -10,8 +10,16 @@ CGO_ENABLED=0 GOOS=linux GOFLAGS="-mod=vendor" go build -i -o mongodb-kubernetes
 
 ### Building the image
 
+For building the MongoDB Init Ops Manager image locally use the example command:
+
 ```bash
-docker build -t mongodb-kubernetes-operator:0.1 .
+VERSION="1.1.0"
+LOG_AUTOMATION_CONFIG_DIFF="false"
+USE_RACE="false"
+docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-operator/Dockerfile -t "mongodb-kubernetes-operator:${VERSION}" \
+ --build-arg version="${VERSION}" \
+ --build-arg log_automation_config_diff="${LOG_AUTOMATION_CONFIG_DIFF}" \
+ --build-arg use_race="${USE_RACE}"
 ```
 
 ### Running locally
diff --git a/docker/mongodb-kubernetes-readinessprobe/Dockerfile b/docker/mongodb-kubernetes-readinessprobe/Dockerfile
index 17c590526..a2f3159b4 100644
--- a/docker/mongodb-kubernetes-readinessprobe/Dockerfile
+++ b/docker/mongodb-kubernetes-readinessprobe/Dockerfile
@@ -1,6 +1,11 @@
-ARG imagebase
-FROM ${imagebase} as base
+FROM public.ecr.aws/docker/library/golang:1.24 AS builder
+
+WORKDIR /go/src
+ADD . .
+
+ARG TARGETARCH
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} go build -a -o /data/scripts/readinessprobe ./mongodb-community-operator/cmd/readiness/main.go
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal
 
-COPY --from=base /probes/readinessprobe /probes/readinessprobe
+COPY --from=builder /data/scripts/readinessprobe /probes/readinessprobe
diff --git a/docker/mongodb-kubernetes-readinessprobe/Dockerfile.old b/docker/mongodb-kubernetes-readinessprobe/Dockerfile.old
new file mode 100644
index 000000000..17c590526
--- /dev/null
+++ b/docker/mongodb-kubernetes-readinessprobe/Dockerfile.old
@@ -0,0 +1,6 @@
+ARG imagebase
+FROM ${imagebase} as base
+
+FROM registry.access.redhat.com/ubi9/ubi-minimal
+
+COPY --from=base /probes/readinessprobe /probes/readinessprobe
diff --git a/docker/mongodb-kubernetes-readinessprobe/README.md b/docker/mongodb-kubernetes-readinessprobe/README.md
new file mode 100644
index 000000000..1dd56bae8
--- /dev/null
+++ b/docker/mongodb-kubernetes-readinessprobe/README.md
@@ -0,0 +1,10 @@
+### Building locally
+
+For building the readiness probe image locally use the example command:
+
+```bash
+VERSION="1.0.22"
+TARGETARCH="amd64"
+docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-readinessprobe/Dockerfile -t "mongodb-kubernetes-readinessprobe:${VERSION}" \
+ --build-arg TARGETARCH="${TARGETARCH}"
+```
diff --git a/docker/mongodb-kubernetes-upgrade-hook/Dockerfile b/docker/mongodb-kubernetes-upgrade-hook/Dockerfile
index 362831582..5005f5801 100644
--- a/docker/mongodb-kubernetes-upgrade-hook/Dockerfile
+++ b/docker/mongodb-kubernetes-upgrade-hook/Dockerfile
@@ -1,6 +1,11 @@
-ARG imagebase
-FROM ${imagebase} as base
+FROM public.ecr.aws/docker/library/golang:1.24 AS builder
+
+WORKDIR /go/src
+ADD . .
+
+ARG TARGETARCH
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} go build -a -o /data/scripts/version-upgrade-hook ./mongodb-community-operator/cmd/versionhook/main.go
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal
 
-COPY --from=base /version-upgrade-hook /version-upgrade-hook
+COPY --from=builder /data/scripts/version-upgrade-hook /version-upgrade-hook
diff --git a/docker/mongodb-kubernetes-upgrade-hook/Dockerfile.old b/docker/mongodb-kubernetes-upgrade-hook/Dockerfile.old
new file mode 100644
index 000000000..362831582
--- /dev/null
+++ b/docker/mongodb-kubernetes-upgrade-hook/Dockerfile.old
@@ -0,0 +1,6 @@
+ARG imagebase
+FROM ${imagebase} as base
+
+FROM registry.access.redhat.com/ubi9/ubi-minimal
+
+COPY --from=base /version-upgrade-hook /version-upgrade-hook
diff --git a/docker/mongodb-kubernetes-upgrade-hook/README.md b/docker/mongodb-kubernetes-upgrade-hook/README.md
new file mode 100644
index 000000000..9205118c2
--- /dev/null
+++ b/docker/mongodb-kubernetes-upgrade-hook/README.md
@@ -0,0 +1,10 @@
+### Building locally
+
+For building the readiness probe image locally use the example command:
+
+```bash
+VERSION="1.0.9"
+TARGETARCH="amd64"
+docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-upgrade-hook/Dockerfile -t "mongodb-kubernetes-upgrade-hook:${VERSION}" \
+ --build-arg TARGETARCH="${TARGETARCH}"
+```
diff --git a/inventories/agent.yaml b/inventories/agent.yaml
index 3e7fa7d00..42f5eaa21 100644
--- a/inventories/agent.yaml
+++ b/inventories/agent.yaml
@@ -38,7 +38,7 @@ images:
     buildargs:
       imagebase: $(inputs.params.registry)/mongodb-agent-ubi:$(inputs.params.version)-context
       version:  $(inputs.params.version)
-    dockerfile: docker/mongodb-agent/Dockerfile
+    dockerfile: docker/mongodb-agent/Dockerfile.old
     output:
     - registry: $(inputs.params.registry)/mongodb-agent-ubi
       tag: $(inputs.params.version)
diff --git a/inventories/agent_non_matrix.yaml b/inventories/agent_non_matrix.yaml
index 21df88d92..08531d9ed 100644
--- a/inventories/agent_non_matrix.yaml
+++ b/inventories/agent_non_matrix.yaml
@@ -46,7 +46,7 @@ images:
         buildargs:
           imagebase: $(inputs.params.registry)/mongodb-agent-ubi:$(inputs.params.version)-context-$(inputs.params.architecture)
           version:  $(inputs.params.version)
-        dockerfile: docker/mongodb-agent-non-matrix/Dockerfile
+        dockerfile: docker/mongodb-agent-non-matrix/Dockerfile.old
 
         labels:
           quay.expires-after: 48h
@@ -61,4 +61,4 @@ images:
         task_type: dockerfile_template
         tags: ["release"]
         output:
-          - dockerfile: $(inputs.params.s3_bucket)/$(inputs.params.version)/ubi/Dockerfile
\ No newline at end of file
+          - dockerfile: $(inputs.params.s3_bucket)/$(inputs.params.version)/ubi/Dockerfile
diff --git a/inventories/readiness_probe.yaml b/inventories/readiness_probe.yaml
index 3ca2e5cb7..c871ac093 100644
--- a/inventories/readiness_probe.yaml
+++ b/inventories/readiness_probe.yaml
@@ -44,7 +44,7 @@ images:
         buildargs:
           imagebase: $(inputs.params.registry)/mongodb-kubernetes-readinessprobe:$(inputs.params.version_id)-context-$(inputs.params.architecture)
           version: $(inputs.params.version)
-        dockerfile: docker/mongodb-kubernetes-readinessprobe/Dockerfile
+        dockerfile: docker/mongodb-kubernetes-readinessprobe/Dockerfile.old
 
         labels:
           quay.expires-after: 48h
diff --git a/inventories/upgrade_hook.yaml b/inventories/upgrade_hook.yaml
index 9407d0427..0540fb8e8 100644
--- a/inventories/upgrade_hook.yaml
+++ b/inventories/upgrade_hook.yaml
@@ -44,7 +44,7 @@ images:
         buildargs:
           imagebase: $(inputs.params.registry)/mongodb-kubernetes-operator-version-upgrade-post-start-hook:$(inputs.params.version_id)-context-$(inputs.params.architecture)
           version: $(inputs.params.version)
-        dockerfile: docker/mongodb-kubernetes-upgrade-hook/Dockerfile
+        dockerfile: docker/mongodb-kubernetes-upgrade-hook/Dockerfile.old
 
         labels:
           quay.expires-after: 48h