diff --git a/bitnami/postgresql/rootfs/etc/services.d/postgresql/finish b/bitnami/postgresql/rootfs/etc/services.d/postgresql/finish
deleted file mode 120000
index 63b10de42114..000000000000
--- a/bitnami/postgresql/rootfs/etc/services.d/postgresql/finish
+++ /dev/null
@@ -1 +0,0 @@
-/bin/true
\ No newline at end of file
diff --git a/bitnami/postgresql/rootfs/etc/services.d/postgresql/finish b/bitnami/postgresql/rootfs/etc/services.d/postgresql/finish
new file mode 100755
index 000000000000..9f54f1ccfc16
--- /dev/null
+++ b/bitnami/postgresql/rootfs/etc/services.d/postgresql/finish
@@ -0,0 +1,21 @@
+#!/usr/bin/with-contenv bash
+
+failcount=0
+if [ -f $BITNAMI_APP_DIR/tmp/failcount ]; then
+  failcount=$(cat $BITNAMI_APP_DIR/tmp/failcount)
+fi
+
+start=$(cat $BITNAMI_APP_DIR/tmp/start)
+stop=`date '+%d%H%M%S'`
+interval=`expr $stop - $start`
+if test $interval -lt 30 ; then
+  failcount=`expr $failcount + 1`
+else
+  failcount=0
+fi
+echo -n $failcount > $BITNAMI_APP_DIR/tmp/failcount
+
+# bring down container on frequent failures. something is definitely wrong
+if test $failcount -ge 3 ; then
+  s6-svscanctl -t /var/run/s6/services
+fi
diff --git a/bitnami/postgresql/rootfs/etc/services.d/postgresql/run b/bitnami/postgresql/rootfs/etc/services.d/postgresql/run
index ab0f5f396c67..4167f1741915 100755
--- a/bitnami/postgresql/rootfs/etc/services.d/postgresql/run
+++ b/bitnami/postgresql/rootfs/etc/services.d/postgresql/run
@@ -3,4 +3,6 @@ set -e
 source $BITNAMI_PREFIX/bitnami-utils.sh
 export LD_LIBRARY_PATH=$BITNAMI_PREFIX/common/lib
 
+mkdir -p $BITNAMI_APP_DIR/tmp
+date '+%d%H%M%S' > $BITNAMI_APP_DIR/tmp/start
 exec s6-setuidgid $BITNAMI_APP_USER postgres $PROGRAM_OPTIONS ${EXTRA_OPTIONS:+"$EXTRA_OPTIONS"}