diff --git a/bitnami/postgresql/9.6/debian-10/Dockerfile b/bitnami/postgresql/9.6/debian-10/Dockerfile
index c6637f425898..d5fe342605b9 100644
--- a/bitnami/postgresql/9.6/debian-10/Dockerfile
+++ b/bitnami/postgresql/9.6/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="9.6.23-debian-10-r65" \
+    BITNAMI_IMAGE_VERSION="9.6.23-debian-10-r66" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
index 4391dacc7853..8bbf165e3e2a 100644
--- a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
@@ -140,3 +140,24 @@ parse_uri() {
     esac
     [[ "$uri" =~ $URI_REGEX ]] && echo "${BASH_REMATCH[${index}]}"
 }
+
+########################
+# Wait for a HTTP connection to succeed
+# Globals:
+#   *
+# Arguments:
+#   $1 - URL to wait for
+#   $2 - Maximum amount of retries (optional)
+#   $3 - Time between retries (optional)
+# Returns:
+#   true if the HTTP connection succeeded, false otherwise
+#########################
+wait_for_http_connection() {
+    local url="${1:?missing url}"
+    local retries="${2:-}"
+    local sleep_time="${3:-}"
+    if ! retry_while "debug_execute curl --silent ${url}" "$retries" "$sleep_time"; then
+        error "Could not connect to ${url}"
+        return 1
+    fi
+}
diff --git a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
index 0b96a0be09e0..a713bd108e15 100644
--- a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -158,7 +158,7 @@ remove_cron_conf() {
 #   $3 - Start command
 #   $4 - Stop command
 # Flags:
-#   --disabled - Whether to disable the monit configuration
+#   --disable - Whether to disable the monit configuration
 # Returns:
 #   None
 #########################
@@ -174,9 +174,8 @@ generate_monit_conf() {
     shift 4
     while [[ "$#" -gt 0 ]]; do
         case "$1" in
-            --disabled)
-                shift
-                disabled="$1"
+            --disable)
+                disabled="yes"
                 ;;
             *)
                 echo "Invalid command line flag ${1}" >&2
diff --git a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index dc322c377b1b..785d883f325e 100644
--- a/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/postgresql/9.6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -164,11 +164,14 @@ web_server_reload() {
 # Arguments:
 #   $1 - App name
 # Flags:
-#   --hosts - Hosts to enable
 #   --type - Application type, which has an effect on which configuration template to use
+#   --hosts - Host listen addresses
+#   --server-name - Server name
+#   --server-aliases - Server aliases
 #   --allow-remote-connections - Whether to allow remote connections or to require local connections
-#   --disabled - Whether to render the file with a .disabled prefix
-#   --enable-https - Enable app configuration on HTTPS port
+#   --disable - Whether to render server configurations with a .disabled prefix
+#   --disable-http - Whether to render the app's HTTP server configuration with a .disabled prefix
+#   --disable-https - Whether to render the app's HTTPS server configuration with a .disabled prefix
 #   --http-port - HTTP port number
 #   --https-port - HTTPS port number
 #   --document-root - Path to document root directory
@@ -198,11 +201,18 @@ ensure_web_server_app_configuration_exists() {
     while [[ "$#" -gt 0 ]]; do
         case "$1" in
             # Common flags
+            --disable \
+            | --disable-http \
+            | --disable-https \
+            )
+                apache_args+=("$1")
+                nginx_args+=("$1")
+                ;;
             --hosts \
+            | --server-name \
+            | --server-aliases \
             | --type \
             | --allow-remote-connections \
-            | --disabled \
-            | --enable-https \
             | --http-port \
             | --https-port \
             | --document-root \
@@ -347,8 +357,13 @@ ensure_web_server_prefix_configuration_exists() {
 # Arguments:
 #   $1 - App name
 # Flags:
-#   --hosts - Hosts to enable
-#   --enable-https - Update HTTPS app configuration
+#   --hosts - Host listen addresses
+#   --server-name - Server name
+#   --server-aliases - Server aliases
+#   --enable-http - Enable HTTP app configuration (if not enabled already)
+#   --enable-https - Enable HTTPS app configuration (if not enabled already)
+#   --disable-http - Disable HTTP app configuration (if not disabled already)
+#   --disable-https - Disable HTTPS app configuration (if not disabled already)
 #   --http-port - HTTP port number
 #   --https-port - HTTPS port number
 # Returns:
@@ -363,8 +378,20 @@ web_server_update_app_configuration() {
     while [[ "$#" -gt 0 ]]; do
         case "$1" in
             # Common flags
-            --hosts \
+            --enable-http \
             | --enable-https \
+            | --disable-http \
+            | --disable-https \
+            )
+                args+=("$1")
+                ;;
+            --hosts \
+            | --server-name \
+            | --server-aliases \
+            | --enable-http \
+            | --enable-https \
+            | --disable-http \
+            | --disable-https \
             | --http-port \
             | --https-port \
             )
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index c9613bd4f9dc..a2b1e2bd3964 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`12`, `12-debian-10`, `12.8.0`, `12.8.0-debian-10-r67` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.8.0-debian-10-r67/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.13.0`, `11.13.0-debian-10-r65`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.13.0-debian-10-r65/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.18.0`, `10.18.0-debian-10-r66` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.18.0-debian-10-r66/10/debian-10/Dockerfile)
-* [`9.6`, `9.6-debian-10`, `9.6.23`, `9.6.23-debian-10-r65` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.23-debian-10-r65/9.6/debian-10/Dockerfile)
+* [`9.6`, `9.6-debian-10`, `9.6.23`, `9.6.23-debian-10-r66` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.23-debian-10-r66/9.6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).