diff --git a/bitnami/rmq-messaging-topology-operator/1/scratch/Dockerfile b/bitnami/rmq-messaging-topology-operator/1/scratch/Dockerfile
index 9c32913ae75c..4912563533ba 100644
--- a/bitnami/rmq-messaging-topology-operator/1/scratch/Dockerfile
+++ b/bitnami/rmq-messaging-topology-operator/1/scratch/Dockerfile
@@ -1,8 +1,24 @@
-FROM scratch
+FROM bitnami/minideb:bullseye as builder
 
 COPY prebuildfs /
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# Install required system packages and dependencies
+RUN install_packages ca-certificates gzip tar wget
+RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/rmq-messaging-topology-operator-1.7.1-0-linux-amd64-debian-11.tar.gz && \
+    echo "531a69d8283511cca1b354846289db487b8e24f0b552c6767d970d1317b470c1  /tmp/bitnami/pkg/cache/rmq-messaging-topology-operator-1.7.1-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/rmq-messaging-topology-operator-1.7.1-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/rmq-messaging-topology-operator-1.7.1-0-linux-amd64-debian-11.tar.gz
+
+######
+
+FROM scratch
+
+COPY prebuildfs /
 COPY rootfs /
+COPY --from=builder /opt/bitnami/rmq-messaging-topology-operator/bin/manager /manager
 
 USER 1001
+
 ENTRYPOINT [ "/manager" ]
diff --git a/bitnami/rmq-messaging-topology-operator/1/scratch/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rmq-messaging-topology-operator/1/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
index f106fc597ade..f88c3def9e1f 100644
--- a/bitnami/rmq-messaging-topology-operator/1/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/rmq-messaging-topology-operator/1/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,7 +1,9 @@
 {
     "rmq-messaging-topology-operator": {
-        "digest": "f78e9bbd85b1f7bd604dd73f46f1b2fa1264b5cffc5c39fc23453d35a6598f3e",
-        "type": "BLACKSMITH",
-        "version": "1.7.1"
+        "arch": "amd64",
+        "digest": "531a69d8283511cca1b354846289db487b8e24f0b552c6767d970d1317b470c1",
+        "distro": "debian-11",
+        "type": "NAMI",
+        "version": "1.7.1-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/rmq-messaging-topology-operator/README.md b/bitnami/rmq-messaging-topology-operator/README.md
index 394defda66a0..885f9bb8e3cb 100644
--- a/bitnami/rmq-messaging-topology-operator/README.md
+++ b/bitnami/rmq-messaging-topology-operator/README.md
@@ -28,7 +28,7 @@ $ docker run --name rmq-default-credential-updater bitnami/rmq-messaging-topolog
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-- [`1`, `1-scratch`, `1.7.1`, `1.7.1-scratch-r0`, `latest` (1/scratch/Dockerfile)](https://github.com/bitnami/bitnami-docker-rmq-default-credential-updater/blob/1.7.1-scratch-r0/1/scratch/Dockerfile)
+- [`1`, `1-scratch`, `1.7.1`, `1.7.1-scratch-r1`, `latest` (1/scratch/Dockerfile)](https://github.com/bitnami/bitnami-docker-rmq-default-credential-updater/blob/1.7.1-scratch-r1/1/scratch/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/rmq-default-credential-updater GitHub repo](https://github.com/bitnami/bitnami-docker-rmq-default-credential-updater).