diff --git a/bitnami/postgresql/9.6/debian-9/Dockerfile b/bitnami/postgresql/9.6/debian-9/Dockerfile
index 5982f5a82260..17d7c1d15923 100644
--- a/bitnami/postgresql/9.6/debian-9/Dockerfile
+++ b/bitnami/postgresql/9.6/debian-9/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb-extras:stretch-r183
+FROM bitnami/minideb-extras:stretch-r191
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
@@ -12,7 +12,7 @@ RUN chmod -R g+rwX /opt/bitnami/postgresql/conf/
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="9.6.10-debian-9-r63" \
+    BITNAMI_IMAGE_VERSION="9.6.10-debian-9-r64" \
     PATH="/opt/bitnami/postgresql/bin:$PATH" \
     POSTGRESQL_DATABASE="" \
     POSTGRESQL_MASTER_HOST="" \
diff --git a/bitnami/postgresql/9.6/debian-9/rootfs/app-entrypoint.sh b/bitnami/postgresql/9.6/debian-9/rootfs/app-entrypoint.sh
index dd520071a93a..b5500163a2ec 100755
--- a/bitnami/postgresql/9.6/debian-9/rootfs/app-entrypoint.sh
+++ b/bitnami/postgresql/9.6/debian-9/rootfs/app-entrypoint.sh
@@ -6,13 +6,16 @@
 print_welcome_page
 
 if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then
-  if ! getent passwd "$(id -u)" &> /dev/null && [ -e /usr/lib/libnss_wrapper.so ]; then
+  #!/bin/bash
+
+if ! getent passwd "$(id -u)" > /dev/null 2>&1 && [ -e /usr/lib/libnss_wrapper.so ]; then
     export LD_PRELOAD='/usr/lib/libnss_wrapper.so'
-    export NSS_WRAPPER_PASSWD="$(mktemp)"
-    export NSS_WRAPPER_GROUP="$(mktemp)"
+    NSS_WRAPPER_PASSWD="$(mktemp)"
+    NSS_WRAPPER_GROUP="$(mktemp)"
+    export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
     echo "postgres:x:$(id -u):$(id -g):PostgreSQL:$PGDATA:/bin/false" > "$NSS_WRAPPER_PASSWD"
     echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
-  fi
+fi
 
   nami_initialize postgresql
   info "Starting postgresql... "
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 5a6139f48ac3..cbfab8d14550 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -52,7 +52,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`10-ol-7`, `10.5.0-ol-7-r60` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.5.0-ol-7-r60/10/ol-7/Dockerfile)
 * [`10-debian-9`, `10.5.0-debian-9-r70`, `10`, `10.5.0`, `10.5.0-r70`, `latest` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.5.0-debian-9-r70/10/debian-9/Dockerfile)
 * [`9.6-ol-7`, `9.6.10-ol-7-r75` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.10-ol-7-r75/9.6/ol-7/Dockerfile)
-* [`9.6-debian-9`, `9.6.10-debian-9-r63`, `9.6`, `9.6.10`, `9.6.10-r63` (9.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.10-debian-9-r63/9.6/debian-9/Dockerfile)
+* [`9.6-debian-9`, `9.6.10-debian-9-r64`, `9.6`, `9.6.10`, `9.6.10-r64` (9.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.10-debian-9-r64/9.6/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).