diff --git a/bitnami/grafana-image-renderer/3/debian-11/Dockerfile b/bitnami/grafana-image-renderer/3/debian-11/Dockerfile
index 64e019e14719..933dfdbeb948 100644
--- a/bitnami/grafana-image-renderer/3/debian-11/Dockerfile
+++ b/bitnami/grafana-image-renderer/3/debian-11/Dockerfile
@@ -1,42 +1,48 @@
 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="3.6.1-debian-11-r1" \
+      org.opencontainers.image.ref.name="3.6.1-debian-11-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/grafana-image-renderer" \
       org.opencontainers.image.title="grafana-image-renderer" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.6.1"
 
+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 chromium curl fonts-freefont-ttf fonts-ipafont-gothic fonts-kacst fonts-thai-tlwg fonts-wqy-zenhei gnupg gzip jq libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libavahi-client3 libavahi-common3 libblkid1 libbrotli1 libbsd0 libbz2-1.0 libc6 libcairo2 libcom-err2 libcrypt1 libcups2 libdatrie1 libdbus-1-3 libdrm2 libexpat1 libffi7 libfontconfig1 libfreetype6 libfribidi0 libgbm1 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgpg-error0 libgraphite2-3 libgssapi-krb5-2 libharfbuzz0b libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblz4-1 liblzma5 libmd0 libmount1 libncursesw6 libnettle8 libnsl2 libnspr4 libnss3 libp11-kit0 libpango-1.0-0 libpcre2-8-0 libpcre3 libpixman-1-0 libpng16-16 libreadline8 libselinux1 libsqlite3-0 libssl1.1 libstdc++6 libsystemd0 libtasn1-6 libthai0 libtinfo6 libtirpc3 libunistring2 libuuid1 libwayland-server0 libx11-6 libx11-xcb1 libxau6 libxcb-dri3-0 libxcb-render0 libxcb-shm0 libxcb1 libxcomposite1 libxdamage1 libxdmcp6 libxext6 libxfixes3 libxkbcommon0 libxrandr2 libxrender1 libxshmfence1 libxss1 libxtst6 libzstd1 procps tar wget zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f python-3.8.13-167-linux-amd64-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/python-3.8.13-167-linux-amd64-debian-11.tar.gz -O ; \
+    if [ ! -f python-3.8.14-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/python-3.8.14-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/python-3.8.14-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    echo "6e21552dc6c19b01247f3ec7bcd0401e6192519fe206e136e205ac6c3b842e7b  python-3.8.13-167-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf python-3.8.13-167-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf python-3.8.13-167-linux-amd64-debian-11.tar.gz
+    sha256sum -c python-3.8.14-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf python-3.8.14-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf python-3.8.14-0-linux-${OS_ARCH}-debian-11.tar.gz
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f node-16.17.0-1-linux-amd64-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/node-16.17.0-1-linux-amd64-debian-11.tar.gz -O ; \
+    if [ ! -f node-16.17.0-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/node-16.17.0-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/node-16.17.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    echo "8e8fb9f8c5852147b47c1ae5c653292774ec8c15623f2f6859fad71a8bd208a9  node-16.17.0-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf node-16.17.0-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf node-16.17.0-1-linux-amd64-debian-11.tar.gz
+    sha256sum -c node-16.17.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf node-16.17.0-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf node-16.17.0-1-linux-${OS_ARCH}-debian-11.tar.gz
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f grafana-image-renderer-3.6.1-0-linux-amd64-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/grafana-image-renderer-3.6.1-0-linux-amd64-debian-11.tar.gz -O ; \
+    if [ ! -f grafana-image-renderer-3.6.1-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/grafana-image-renderer-3.6.1-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/grafana-image-renderer-3.6.1-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    echo "207aa19aac7967a2497dee0f5f21ad598837daf43fd1d930ea597da548996adc  grafana-image-renderer-3.6.1-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf grafana-image-renderer-3.6.1-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf grafana-image-renderer-3.6.1-0-linux-amd64-debian-11.tar.gz
+    sha256sum -c grafana-image-renderer-3.6.1-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf grafana-image-renderer-3.6.1-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf grafana-image-renderer-3.6.1-0-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/grafana-image-renderer/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index b80ccab3bde2..fcb4a977b683 100644
--- a/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,9 +15,9 @@
     },
     "python": {
         "arch": "amd64",
-        "digest": "6e21552dc6c19b01247f3ec7bcd0401e6192519fe206e136e205ac6c3b842e7b",
+        "digest": "65934e9dc4f3e47bd5d50e082931d40e9e2e8a2b10c6f059e67da2b6c1ad38cb",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.8.13-167"
+        "version": "3.8.14-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/grafana-image-renderer/README.md b/bitnami/grafana-image-renderer/README.md
index 38d4f53c49e5..c71a7534458d 100644
--- a/bitnami/grafana-image-renderer/README.md
+++ b/bitnami/grafana-image-renderer/README.md
@@ -38,7 +38,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`3`, `3-debian-11`, `3.6.1`, `3.6.1-debian-11-r1`, `latest` (3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/grafana-image-renderer/3/debian-11/Dockerfile)
+* [`3`, `3-debian-11`, `3.6.1`, `3.6.1-debian-11-r2`, `latest` (3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/grafana-image-renderer/3/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).