diff --git a/bitnami/postgresql/12/debian-10/Dockerfile b/bitnami/postgresql/12/debian-10/Dockerfile
index 46ee7c251823..b1b5c8264147 100644
--- a/bitnami/postgresql/12/debian-10/Dockerfile
+++ b/bitnami/postgresql/12/debian-10/Dockerfile
@@ -22,7 +22,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.8.0-debian-10-r24" \
+    BITNAMI_IMAGE_VERSION="12.8.0-debian-10-r25" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
index ae8f310137d2..0b96a0be09e0 100644
--- a/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -137,6 +137,19 @@ generate_cron_conf() {
     fi
 }
 
+########################
+# Remove a cron configuration file for a given service
+# Arguments:
+#   $1 - Service name
+# Returns:
+#   None
+#########################
+remove_cron_conf() {
+    local service_name="${1:?service name is missing}"
+    local cron_conf_dir="/etc/monit/conf.d"
+    rm -f "${cron_conf_dir}/${service_name}"
+}
+
 ########################
 # Generate a monit configuration file for a given service
 # Arguments:
@@ -183,6 +196,19 @@ check process ${service_name}
 EOF
 }
 
+########################
+# Remove a monit configuration file for a given service
+# Arguments:
+#   $1 - Service name
+# Returns:
+#   None
+#########################
+remove_monit_conf() {
+    local service_name="${1:?service name is missing}"
+    local monit_conf_dir="/etc/monit/conf.d"
+    rm -f "${monit_conf_dir}/${service_name}.conf"
+}
+
 ########################
 # Generate a logrotate configuration file
 # Arguments:
@@ -233,3 +259,16 @@ $(indent "$extra" 2)
 }
 EOF
 }
+
+########################
+# Remove a logrotate configuration file
+# Arguments:
+#   $1 - Service name
+# Returns:
+#   None
+#########################
+remove_logrotate_conf() {
+    local service_name="${1:?service name is missing}"
+    local logrotate_conf_dir="/etc/logrotate.d"
+    rm -f "${logrotate_conf_dir}/${service_name}"
+}
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index a6ae87c2029f..5da982b1b584 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.4.0`, `13.4.0-debian-10-r25` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.4.0-debian-10-r25/13/debian-10/Dockerfile)
-* [`12`, `12-debian-10`, `12.8.0`, `12.8.0-debian-10-r24` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.8.0-debian-10-r24/12/debian-10/Dockerfile)
+* [`12`, `12-debian-10`, `12.8.0`, `12.8.0-debian-10-r25` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.8.0-debian-10-r25/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.13.0`, `11.13.0-debian-10-r24`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.13.0-debian-10-r24/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.18.0`, `10.18.0-debian-10-r24` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.18.0-debian-10-r24/10/debian-10/Dockerfile)
 * [`9.6`, `9.6-debian-10`, `9.6.23`, `9.6.23-debian-10-r24` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.23-debian-10-r24/9.6/debian-10/Dockerfile)