diff --git a/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile b/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile
index 7a397a495e3c..542ae435c9da 100644
--- a/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile
+++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile
@@ -1,35 +1,40 @@
 FROM docker.io/bitnami/minideb:bullseye
-ENV HOME="/" \
-    OS_ARCH="amd64" \
-    OS_FLAVOUR="debian-11" \
-    OS_NAME="linux"
+
+ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="2.8.5-debian-11-r6" \
+      org.opencontainers.image.ref.name="2.8.5-debian-11-r7" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-skipper-shell" \
       org.opencontainers.image.title="spring-cloud-skipper-shell" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.5"
 
+ENV HOME="/" \
+    OS_ARCH="${TARGETARCH:-amd64}" \
+    OS_FLAVOUR="debian-11" \
+    OS_NAME="linux"
+
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl gzip libc6 libgcc-s1 locales procps tar
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f java-1.8.345-2-linux-amd64-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-1.8.345-2-linux-amd64-debian-11.tar.gz -O ; \
+    if [ ! -f java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    echo "b244bc8c1f972d20fac8019cf97fb05ce6cd8be2034ca11f52243c8bd96aaa23  java-1.8.345-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf java-1.8.345-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf java-1.8.345-2-linux-amd64-debian-11.tar.gz
+    sha256sum -c java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f spring-cloud-skipper-shell-2.8.5-1-linux-amd64-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/spring-cloud-skipper-shell-2.8.5-1-linux-amd64-debian-11.tar.gz -O ; \
+    if [ ! -f spring-cloud-skipper-shell-2.8.5-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/spring-cloud-skipper-shell-2.8.5-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/spring-cloud-skipper-shell-2.8.5-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    echo "fb4f4cb5751bb42ea60805afdcdab50b9c81907b61cd102458eaf4da13e64ac4  spring-cloud-skipper-shell-2.8.5-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf spring-cloud-skipper-shell-2.8.5-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf spring-cloud-skipper-shell-2.8.5-1-linux-amd64-debian-11.tar.gz
+    sha256sum -c spring-cloud-skipper-shell-2.8.5-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf spring-cloud-skipper-shell-2.8.5-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf spring-cloud-skipper-shell-2.8.5-1-linux-${OS_ARCH}-debian-11.tar.gz
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
diff --git a/bitnami/spring-cloud-skipper-shell/README.md b/bitnami/spring-cloud-skipper-shell/README.md
index 131ac78429e1..517c4b329d75 100644
--- a/bitnami/spring-cloud-skipper-shell/README.md
+++ b/bitnami/spring-cloud-skipper-shell/README.md
@@ -28,7 +28,7 @@ $ docker run --name spring-cloud-skipper-shell bitnami/spring-cloud-skipper-shel
 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/).
 
 
-* [`2`, `2-debian-11`, `2.8.5`, `2.8.5-debian-11-r6`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile)
+* [`2`, `2-debian-11`, `2.8.5`, `2.8.5-debian-11-r7`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).