diff --git a/bitnami/postgresql/12/debian-10/Dockerfile b/bitnami/postgresql/12/debian-10/Dockerfile
index 8dc4ad90930b..caaad76cd7c5 100644
--- a/bitnami/postgresql/12/debian-10/Dockerfile
+++ b/bitnami/postgresql/12/debian-10/Dockerfile
@@ -24,7 +24,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="12.5.0-debian-10-r53" \
+    BITNAMI_IMAGE_VERSION="12.5.0-debian-10-r54" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib/:/opt/bitnami/common/lib/:$LD_LIBRARY_PATH" \
diff --git a/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libhook.sh
new file mode 100644
index 000000000000..9694852a7d25
--- /dev/null
+++ b/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libhook.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Library to use for scripts expected to be used as Kubernetes lifecycle hooks
+
+# shellcheck disable=SC1091
+
+# Load generic libraries
+. /opt/bitnami/scripts/liblog.sh
+. /opt/bitnami/scripts/libos.sh
+
+# Override functions that log to stdout/stderr of the current process, so they print to process 1
+for function_to_override in stderr_print debug_execute; do
+    # Output is sent to output of process 1 and thus end up in the container log
+    # The hook output in general isn't saved
+    eval "$(declare -f "$function_to_override") >/proc/1/fd/1 2>/proc/1/fd/2"
+done
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index ec565837fd04..7f3a0fabd4aa 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`13`, `13-debian-10`, `13.1.0`, `13.1.0-debian-10-r56` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.1.0-debian-10-r56/13/debian-10/Dockerfile)
-* [`12`, `12-debian-10`, `12.5.0`, `12.5.0-debian-10-r53` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.5.0-debian-10-r53/12/debian-10/Dockerfile)
+* [`12`, `12-debian-10`, `12.5.0`, `12.5.0-debian-10-r54` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.5.0-debian-10-r54/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.10.0`, `11.10.0-debian-10-r55`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.10.0-debian-10-r55/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.15.0`, `10.15.0-debian-10-r53` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.15.0-debian-10-r53/10/debian-10/Dockerfile)
 * [`9.6`, `9.6-debian-10`, `9.6.20`, `9.6.20-debian-10-r52` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.20-debian-10-r52/9.6/debian-10/Dockerfile)