diff --git a/bitnami/mariadb/10.5/debian-11/Dockerfile b/bitnami/mariadb/10.5/debian-11/Dockerfile
index 3c3284d10210..2fafc2fa4af9 100644
--- a/bitnami/mariadb/10.5/debian-11/Dockerfile
+++ b/bitnami/mariadb/10.5/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="10.5.17-debian-11-r19" \
+      org.opencontainers.image.ref.name="10.5.17-debian-11-r20" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -32,7 +32,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/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 92530b32d94d..5e141d4ce3f1 100644
--- a/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/mariadb/10.5/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]+$//'
 }
 
 ########################