diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile
index 3488d9fea118..ac9bdb9305e3 100644
--- a/bitnami/phpmyadmin/5/debian-10/Dockerfile
+++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile
@@ -28,7 +28,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="phpmyadmin" \
-    BITNAMI_IMAGE_VERSION="5.1.0-debian-10-r24" \
+    BITNAMI_IMAGE_VERSION="5.1.0-debian-10-r25" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 8f37ecbd823e..ae5e2459c377 100644
--- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -106,9 +106,9 @@ is_file_writable() {
 relativize() {
     local -r path="${1:?missing path}"
     local -r base="${2:?missing base}"
-    pushd "$base" >/dev/null
+    pushd "$base" >/dev/null || exit
     realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||'
-    popd >/dev/null
+    popd >/dev/null || exit
 }
 
 ########################
diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
index 452c1f4b2831..264a9291d634 100644
--- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
+++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
@@ -35,7 +35,7 @@ persist_app() {
         warn "No files are configured to be persisted"
         return
     fi
-    pushd "$install_dir" >/dev/null
+    pushd "$install_dir" >/dev/null || exit
     local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder
     local -r tmp_file="/tmp/perms.acl"
     for file_to_persist in "${files_to_persist[@]}"; do
@@ -53,16 +53,16 @@ persist_app() {
         ensure_dir_exists "$file_to_persist_destination_folder"
         cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder"
         # Restore permissions
-        pushd "$persist_dir" >/dev/null
+        pushd "$persist_dir" >/dev/null || exit
         if am_i_root; then
             setfacl --restore="$tmp_file"
         else
             # When running as non-root, don't change ownership
             setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file")
         fi
-        popd >/dev/null
+        popd >/dev/null || exit
     done
-    popd >/dev/null
+    popd >/dev/null || exit
     rm -f "$tmp_file"
     # Install the persisted files into the installation directory, via symlinks
     restore_persisted_app "$@"
diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md
index ea2e4f84bbed..d980eb3efd57 100644
--- a/bitnami/phpmyadmin/README.md
+++ b/bitnami/phpmyadmin/README.md
@@ -38,7 +38,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 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/).
 
 
-* [`5`, `5-debian-10`, `5.1.0`, `5.1.0-debian-10-r24`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r24/5/debian-10/Dockerfile)
+* [`5`, `5-debian-10`, `5.1.0`, `5.1.0-debian-10-r25`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r25/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).