diff --git a/bitnami/nginx-intel/0/debian-11/Dockerfile b/bitnami/nginx-intel/0/debian-11/Dockerfile
index f41d7313d5a6..09644072a1f5 100644
--- a/bitnami/nginx-intel/0/debian-11/Dockerfile
+++ b/bitnami/nginx-intel/0/debian-11/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="0.4.8-debian-11-r5" \
+      org.opencontainers.image.ref.name="0.4.8-debian-11-r6" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx-intel" \
       org.opencontainers.image.title="nginx-intel" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -21,7 +21,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "qatengine-0.6.15-2-linux-${OS_ARCH}-debian-11" \
+      "qatengine-0.6.16-0-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.3-154-linux-${OS_ARCH}-debian-11" \
       "nginx-intel-0.4.8-2-linux-${OS_ARCH}-debian-11" \
       "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \
@@ -33,7 +33,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       fi && \
       sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
       tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-      rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \
+      rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
     done
 RUN apt-get autoremove --purge -y curl && \
     apt-get update && apt-get upgrade -y && \
diff --git a/bitnami/nginx-intel/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx-intel/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index ae0fa6aab3ba..a4557217dce2 100644
--- a/bitnami/nginx-intel/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/nginx-intel/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,10 +15,10 @@
     },
     "qatengine": {
         "arch": "amd64",
-        "digest": "985c22e620e69d44646dd8da7739d18ff4dc225aac7bf5a25f41a8aa91b1575c",
+        "digest": "699e8cfd8f4216a1d307583b36cdb5c25079ad756c5eed6734288cd178d0449e",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "0.6.15-2"
+        "version": "0.6.16-0"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/nginx-intel/0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/nginx-intel/0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 92530b32d94d..5e141d4ce3f1 100644
--- a/bitnami/nginx-intel/0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/nginx-intel/0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -519,7 +519,7 @@ get_machine_id() {
 get_disk_device_id() {
     local device_id=""
     if grep -q ^/dev /proc/mounts; then
-        device_id="$(grep -q ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)"
+        device_id="$(grep ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)"
     fi
     # If it could not be autodetected, fallback to /dev/sda1 as a default
     if [[ -z "$device_id" || ! -b "$device_id" ]]; then
@@ -538,7 +538,7 @@ get_disk_device_id() {
 #   Root disk ID
 #########################
 get_root_disk_device_id() {
-    get_disk_device_id | sed 's/[0-9]\+$//'
+    get_disk_device_id | sed -E 's/p?[0-9]+$//'
 }
 
 ########################