diff --git a/bitnami/postgresql/9.6/ol-7/Dockerfile b/bitnami/postgresql/9.6/ol-7/Dockerfile
index 1a4f945fb58c..1ad1902e1385 100644
--- a/bitnami/postgresql/9.6/ol-7/Dockerfile
+++ b/bitnami/postgresql/9.6/ol-7/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/oraclelinux-extras-base:7-r471
+FROM oraclelinux:7-slim
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
@@ -7,15 +7,17 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
     OS_FLAVOUR="ol-7" \
     OS_NAME="linux"
 
+COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages glibc keyutils-libs krb5-libs libcom_err libedit libgcc libselinux libstdc++ libuuid libxml2 libxslt ncurses-libs nss-softokn-freebl openssl-libs pcre sqlite xz-libs zlib
+RUN install_packages ca-certificates curl glibc gzip hostname keyutils-libs krb5-libs libaio-devel libcom_err libedit libgcc libselinux libstdc++ libuuid libxml2 libxslt ncurses-libs nss-softokn-freebl openssl-libs pcre procps-ng sqlite sudo tar which xz-libs zlib
 RUN . ./libcomponent.sh && component_unpack "postgresql" "9.6.15-5" --checksum 80f8978cc3fd1f1409086870297572c756cc2110bf549101cac73939f6a61c7c
+RUN curl --silent -L https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64 > /usr/local/bin/gosu && echo 0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7 /usr/local/bin/gosu | sha256sum --check && chmod u+x /usr/local/bin/gosu && mkdir -p /opt/bitnami/licenses && curl --silent -L https://raw.githubusercontent.com/tianon/gosu/master/LICENSE > /opt/bitnami/licenses/gosu-1.11.txt
 
 COPY rootfs /
 RUN rpm -Uvh --nodeps $(repoquery --location nss_wrapper)
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="9.6.15-ol-7-r101" \
+    BITNAMI_IMAGE_VERSION="9.6.15-ol-7-r102" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NAMI_PREFIX="/.nami" \
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/libbitnami.sh b/bitnami/postgresql/9.6/ol-7/prebuildfs/libbitnami.sh
new file mode 100644
index 000000000000..529c3fd4a3e2
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/libbitnami.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Bitnami custom library
+
+# Load Generic Libraries
+. /liblog.sh
+
+# Constants
+BOLD='\033[1m'
+
+# Functions
+
+########################
+# Print the welcome page
+# Globals:
+#   DISABLE_WELCOME_MESSAGE
+#   BITNAMI_APP_NAME
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+print_welcome_page() {
+    if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then
+        if [[ -n "$BITNAMI_APP_NAME" ]]; then
+            print_image_welcome_page
+        fi
+    fi
+}
+
+########################
+# Print the welcome page for a Bitnami Docker image
+# Globals:
+#   BITNAMI_APP_NAME
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+print_image_welcome_page() {
+    local github_url="https://github.com/bitnami/bitnami-docker-${BITNAMI_APP_NAME}"
+
+    log ""
+    log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}"
+    log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}"
+    log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}"
+    log "Send us your feedback at ${BOLD}containers@bitnami.com${RESET}"
+    log ""
+}
+
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/libcomponent.sh b/bitnami/postgresql/9.6/ol-7/prebuildfs/libcomponent.sh
new file mode 100644
index 000000000000..025288664f69
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/libcomponent.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+#
+# Library for managing Bitnami components
+
+# Constants
+CACHE_ROOT="/tmp/bitnami/pkg/cache"
+DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith"
+
+# Functions
+
+########################
+# Download and unpack a Bitnami package
+# Globals:
+#   OS_NAME
+#   OS_ARCH
+#   OS_FLAVOUR
+# Arguments:
+#   $1 - component's name
+#   $2 - component's version
+# Returns:
+#   None
+#########################
+component_unpack() {
+    local name="${1:?name is required}"
+    local version="${2:?version is required}"
+    local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}"
+    local package_sha256=""
+
+    # Validate arguments
+    shift 2
+    while [ "$#" -gt 0 ]; do
+        case "$1" in
+            -c|--checksum)
+                shift
+                package_sha256="${1:?missing package checksum}"
+                ;;
+            *)
+                echo "Invalid command line flag $1" >&2
+                return 1
+                ;;
+        esac
+        shift
+    done
+
+    echo "Downloading $base_name package"
+    if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then
+        echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download."
+        cp "${CACHE_ROOT}/${base_name}.tar.gz" .
+        rm "${CACHE_ROOT}/${base_name}.tar.gz"
+        if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then
+            echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256"
+            package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")"
+            rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256"
+        fi
+    else
+	curl --remote-name --silent "${DOWNLOAD_URL}/${base_name}.tar.gz"
+    fi
+    if [ -n "$package_sha256" ]; then
+        echo "Verifying package integrity"
+        echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check -
+    fi
+    tar --directory /opt/bitnami --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 "${base_name}/files/"
+    rm "${base_name}.tar.gz"
+}
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/libfile.sh b/bitnami/postgresql/9.6/ol-7/prebuildfs/libfile.sh
new file mode 100644
index 000000000000..12010f043e49
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/libfile.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# Library for managing files
+
+# Functions
+
+########################
+# Ensure a line exists in the file by replacing a matching line.
+# Arguments:
+#   $1 - filename
+#   $2 - line
+#   $3 - match
+# Returns:
+#   None
+#########################
+file_contains_line() {
+    local filename="${1:?filename is required}"
+    local line="${2:?line is required}"
+    local match="${3:?match is required}"
+
+    sed --in-place "s/^$match\$/$line/" "$filename"
+}
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/libfs.sh b/bitnami/postgresql/9.6/ol-7/prebuildfs/libfs.sh
new file mode 100644
index 000000000000..965ec431b898
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/libfs.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+#
+# Library for file system actions
+
+# Load Generic Libraries
+. /liblog.sh
+
+# Functions
+
+########################
+# Ensure a file/directory is owned (user and group) but the given user
+# Arguments:
+#   $1 - filepath
+#   $2 - owner
+# Returns:
+#   None
+#########################
+owned_by() {
+    local path="${1:?path is missing}"
+    local owner="${2:?owner is missing}"
+
+    chown "$owner":"$owner" "$path"
+}
+
+########################
+# Ensure a directory exists and, optionally, is owned by the given user
+# Arguments:
+#   $1 - directory
+#   $2 - owner
+# Returns:
+#   None
+#########################
+ensure_dir_exists() {
+    local dir="${1:?directory is missing}"
+    local owner="${2:-}"
+
+    mkdir -p "${dir}"
+    if [[ "$owner" != "" ]]; then
+        owned_by "$dir" "$owner"
+    fi
+}
+
+########################
+# Checks whether a directory is empty or not
+# Arguments:
+#   $1 - directory
+# Returns:
+#   Boolean
+#########################
+is_dir_empty() {
+    local dir="${1:?missing directory}"
+
+    if [[ ! -e "$dir" ]] || [[ -z "$(ls -A "$dir")" ]]; then
+        true
+    else
+        false
+    fi
+}
+
+########################
+# Configure permisions and ownership recursively
+# Globals:
+#   None
+# Arguments:
+#   $1 - paths (as a string).
+# Flags:
+#   -f|--file-mode - mode for directories.
+#   -d|--dir-mode - mode for files.
+#   -u|--user - user
+#   -g|--group - group
+# Returns:
+#   None
+#########################
+configure_permissions_ownership() {
+    local -r paths="${1:?paths is missing}"
+    local dir_mode=""
+    local file_mode=""
+    local user=""
+    local group=""
+
+    # Validate arguments
+    shift 1
+    while [ "$#" -gt 0 ]; do
+        case "$1" in
+            -f|--file-mode)
+                shift
+                file_mode="${1:?missing mode for files}"
+                ;;
+            -d|--dir-mode)
+                shift
+                dir_mode="${1:?missing mode for directories}"
+                ;;
+            -u|--user)
+                shift
+                user="${1:?missing user}"
+                ;;
+            -g|--group)
+                shift
+                group="${1:?missing group}"
+                ;;
+            *)
+                echo "Invalid command line flag $1" >&2
+                return 1
+                ;;
+        esac
+        shift
+    done
+
+    read -r -a filepaths <<< "$paths"
+    for p in "${filepaths[@]}"; do
+        if [[ -e "$p" ]]; then
+            if [[ -n $dir_mode ]]; then
+                find -L "$p" -type d -exec chmod "$dir_mode" {} \;
+            fi
+            if [[ -n $file_mode ]]; then
+                find -L "$p" -type f -exec chmod "$file_mode" {} \;
+            fi
+            if [[ -n $user ]] && [[ -n $group ]]; then
+                chown -LR "$user":"$group" "$p"
+            elif [[ -n $user ]] && [[ -z $group ]]; then
+                chown -LR "$user" "$p"
+            elif [[ -z $user ]] && [[ -n $group ]]; then
+                chgrp -LR "$group" "$p"
+            fi
+        else
+            stderr_print "$p does not exist"
+        fi
+    done
+}
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/liblog.sh b/bitnami/postgresql/9.6/ol-7/prebuildfs/liblog.sh
new file mode 100644
index 000000000000..04118273394a
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/liblog.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+#
+# Library for logging functions
+
+# Constants
+RESET='\033[0m'
+RED='\033[38;5;1m'
+GREEN='\033[38;5;2m'
+YELLOW='\033[38;5;3m'
+MAGENTA='\033[38;5;5m'
+CYAN='\033[38;5;6m'
+
+# Functions
+
+########################
+# Print to STDERR
+# Arguments:
+#   Message to print
+# Returns:
+#   None
+#########################
+stderr_print() {
+    printf "%b\\n" "${*}" >&2
+}
+
+########################
+# Log message
+# Arguments:
+#   Message to log
+# Returns:
+#   None
+#########################
+log() {
+    stderr_print "${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")${RESET}${*}"
+}
+########################
+# Log an 'info' message
+# Arguments:
+#   Message to log
+# Returns:
+#   None
+#########################
+info() {
+    log "${GREEN}INFO ${RESET} ==> ${*}"
+}
+########################
+# Log message
+# Arguments:
+#   Message to log
+# Returns:
+#   None
+#########################
+warn() {
+    log "${YELLOW}WARN ${RESET} ==> ${*}"
+}
+########################
+# Log an 'error' message
+# Arguments:
+#   Message to log
+# Returns:
+#   None
+#########################
+error() {
+    log "${RED}ERROR${RESET} ==> ${*}"
+}
+########################
+# Log a 'debug' message
+# Globals:
+#   BITNAMI_DEBUG
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+debug() {
+    # 'is_boolean_yes' is defined in libvalidations.sh, but depends on this file so we cannot source it
+    local -r bool="${BITNAMI_DEBUG:-false}"
+    # comparison is performed without regard to the case of alphabetic characters
+    shopt -s nocasematch
+    if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then
+        log "${MAGENTA}DEBUG${RESET} ==> ${*}"
+    fi
+}
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/libnet.sh b/bitnami/postgresql/9.6/ol-7/prebuildfs/libnet.sh
new file mode 100644
index 000000000000..8c34b4f8ca7d
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/libnet.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# Library for network functions
+
+# Functions
+
+########################
+# Resolve dns
+# Arguments:
+#   $1 - Hostname to resolve
+# Returns:
+#   IP
+#########################
+dns_lookup() {
+    local host="${1:?host is missing}"
+    getent ahosts "$host" | awk '/STREAM/ {print $1 }'    
+}
+
+########################
+# Get machine's IP
+# Arguments:
+#   None
+# Returns:
+#   Machine IP
+#########################
+get_machine_ip() {
+    dns_lookup "$(hostname)"
+}
+
+########################
+# Check if the provided argument is a resolved hostname
+# Arguments:
+#   $1 - Value to check
+# Returns:
+#   Boolean
+#########################
+is_hostname_resolved() {
+    local -r host="${1:?missing value}"
+    if dns_lookup "$host" > /dev/null; then
+        true
+    else
+        false 
+    fi
+}
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/libos.sh b/bitnami/postgresql/9.6/ol-7/prebuildfs/libos.sh
new file mode 100644
index 000000000000..1a5ba3bb2a64
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/libos.sh
@@ -0,0 +1,132 @@
+#!/bin/bash
+#
+# Library for operating system actions
+
+# Functions
+
+########################
+# Check if an user exists in the system
+# Arguments:
+#   $1 - user
+# Returns:
+#   Boolean
+#########################
+user_exists() {
+    local user="${1:?user is missing}"
+    id "$user" >/dev/null 2>&1
+}
+
+########################
+# Check if a group exists in the system
+# Arguments:
+#   $1 - group
+# Returns:
+#   Boolean
+#########################
+group_exists() {
+    local group="${1:?group is missing}"
+    getent group "$group" >/dev/null 2>&1
+}
+
+########################
+# Create a group in the system if it does not exist already
+# Arguments:
+#   $1 - group
+# Returns:
+#   None
+#########################
+ensure_group_exists() {
+    local group="${1:?group is missing}"
+
+    if ! group_exists "$group"; then
+        groupadd "$group" >/dev/null 2>&1
+    fi
+}
+
+########################
+# Create an user in the system if it does not exist already
+# Arguments:
+#   $1 - user
+#   $2 - group
+# Returns:
+#   None
+#########################
+ensure_user_exists() {
+    local user="${1:?user is missing}"
+    local group="${2:-}"
+
+    if ! user_exists "$user"; then
+	useradd "$user" >/dev/null 2>&1
+        if [[ -n "$group" ]]; then
+            ensure_group_exists "$group"
+            usermod -a -G "$group" "$user" >/dev/null 2>&1
+        fi
+    fi
+}
+
+########################
+# Check if the script is currently running as root
+# Arguments:
+#   $1 - user
+#   $2 - group
+# Returns:
+#   Boolean
+#########################
+am_i_root() {
+    if [[ "$(id -u)" = "0" ]]; then
+        true
+    else
+	false
+    fi
+}
+
+########################
+# Get total memory available
+# Arguments:
+#   None
+# Returns:
+#   Memory in bytes
+#########################
+get_total_memory() {
+    echo $(($(grep MemTotal /proc/meminfo | awk '{print $2}') / 1024))
+}
+
+#########################
+# Redirects output to /dev/null if debug mode is disabled
+# Globals:
+#   BITNAMI_DEBUG
+# Arguments:
+#   $@ - Command to execute
+# Returns:
+#   None
+#########################
+debug_execute() {
+    if ${BITNAMI_DEBUG:-false}; then
+        "$@"
+    else
+        "$@" >/dev/null 2>&1
+    fi
+}
+
+########################
+# Retries a command a given number of times
+# Arguments:
+#   $1 - cmd (as a string)
+#   $2 - max retries. Default: 12
+#   $3 - sleep between retries (in seconds). Default: 5
+# Returns:
+#   Boolean
+#########################
+retry_while() {
+    local -r cmd="${1:?cmd is missing}"
+    local -r retries="${2:-12}"
+    local -r sleep_time="${3:-5}"
+    local return_value=1
+
+    read -r -a command <<< "$cmd"
+    for ((i = 1 ; i <= retries ; i+=1 )); do
+        "${command[@]}" && return_value=0 && break
+        sleep "$sleep_time"
+    done
+    return $return_value
+}
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/libservice.sh b/bitnami/postgresql/9.6/ol-7/prebuildfs/libservice.sh
new file mode 100644
index 000000000000..0a83cd3d927f
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/libservice.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+#
+# Library for managing services
+
+# Functions
+
+########################
+# Read the provided pid file and returns a PID
+# Arguments:
+#   $1 - Pid file
+# Returns:
+#   PID
+#########################
+get_pid_from_file() {
+    local pid_file="${1:?pid file is missing}"
+
+    if [[ -f "$pid_file" ]]; then
+        if [[ -n "$(< "$pid_file")" ]] && [[ "$(< "$pid_file")" -gt 0 ]]; then
+            echo "$(< "$pid_file")"
+	fi
+    fi
+}
+
+########################
+# Check if a provided PID corresponds to a running service
+# Arguments:
+#   $1 - PID
+# Returns:
+#   Boolean
+#########################
+is_service_running() {
+    local pid="${1:?pid is missing}"
+
+    kill -0 "$pid" 2>/dev/null
+}
+
+########################
+# Stop a service by sending a termination signal to its pid
+# Arguments:
+#   $1 - Pid file
+# Returns:
+#   None
+#########################
+stop_service_using_pid() {
+    local pid_file="${1:?pid file is missing}"
+    local pid
+
+    pid="$(get_pid_from_file "$pid_file")"
+    [[ -z "$pid" ]] || ! is_service_running "$pid" && return
+
+    kill "$pid"
+    local counter=10
+    while [[ "$counter" -ne 0 ]] && is_service_running "$pid"; do
+        sleep 1
+        counter=$((counter - 1))
+    done
+}
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/libvalidations.sh b/bitnami/postgresql/9.6/ol-7/prebuildfs/libvalidations.sh
new file mode 100644
index 000000000000..ef9aaf0cf31f
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/libvalidations.sh
@@ -0,0 +1,246 @@
+#!/bin/bash
+#
+# Validation functions library
+
+# Load Generic Libraries
+. /liblog.sh
+
+# Functions
+
+########################
+# Check if the provided argument is an integer
+# Arguments:
+#   $1 - Value to check
+# Returns:
+#   Boolean
+#########################
+is_int() {
+    local -r int="${1:?missing value}"
+    if [[ "$int" =~ ^-?[0-9]+ ]]; then
+        true
+    else
+        false
+    fi
+}
+
+########################
+# Check if the provided argument is a positive integer
+# Arguments:
+#   $1 - Value to check
+# Returns:
+#   Boolean
+#########################
+is_positive_int() {
+    local -r int="${1:?missing value}"
+    if is_int "$int" && (( "${int}" >= 0 )); then
+        true
+    else
+        false
+    fi
+}
+
+########################
+# Check if the provided argument is a boolean or is the string 'yes/true'
+# Arguments:
+#   $1 - Value to check
+# Returns:
+#   Boolean
+#########################
+is_boolean_yes() {
+    local -r bool="${1:-}"
+    # comparison is performed without regard to the case of alphabetic characters
+    shopt -s nocasematch
+    if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then
+        true
+    else
+        false
+    fi
+}
+
+########################
+# Check if the provided argument is a boolean yes/no value
+# Arguments:
+#   $1 - Value to check
+# Returns:
+#   Boolean
+#########################
+is_yes_no_value() {
+    local -r bool="${1:-}"
+    if [[ "$bool" =~ ^(yes|no)$ ]]; then
+        true
+    else
+        false
+    fi
+}
+
+########################
+# Check if the provided argument is a boolean true/false value
+# Arguments:
+#   $1 - Value to check
+# Returns:
+#   Boolean
+#########################
+is_true_false_value() {
+    local -r bool="${1:-}"
+    if [[ "$bool" =~ ^(true|false)$ ]]; then
+        true
+    else
+        false
+    fi
+}
+
+########################
+# Check if the provided argument is an empty string or not defined
+# Arguments:
+#   $1 - Value to check
+# Returns:
+#   Boolean
+#########################
+is_empty_value() {
+    local -r val="${1:-}"
+    if [[ -z "$val" ]]; then
+        true
+    else
+        false
+    fi
+}
+
+########################
+# Validate if the provided argument is a valid port
+# Arguments:
+#   $1 - Port to validate
+# Returns:
+#   Boolean and error message
+#########################
+validate_port() {
+    local value
+    local unprivileged=0
+
+    # Parse flags
+    while [[ "$#" -gt 0 ]]; do
+        case "$1" in
+            -unprivileged)
+                unprivileged=1
+                ;;
+            --)
+                shift
+                break
+                ;;
+            -*)
+                stderr_print "unrecognized flag $1"
+                return 1
+                ;;
+            *)
+                break
+                ;;
+        esac
+        shift
+    done
+
+    if [[ "$#" -gt 1 ]]; then
+        echo "too many arguments provided"
+        return 2
+    elif [[ "$#" -eq 0 ]]; then
+        stderr_print "missing port argument"
+        return 1
+    else
+        value=$1
+    fi
+
+    if [[ -z "$value" ]]; then
+        echo "the value is empty"
+        return 1
+    else
+        if ! is_int "$value"; then
+            echo "value is not an integer"
+            return 2
+        elif [[ "$value" -lt 0 ]]; then
+            echo "negative value provided"
+            return 2
+        elif [[ "$value" -gt 65535 ]]; then
+            echo "requested port is greater than 65535"
+            return 2
+        elif [[ "$unprivileged" = 1 && "$value" -lt 1024 ]]; then
+            echo "privileged port requested"
+            return 3
+        fi
+    fi
+}
+
+########################
+# Validate if the provided argument is a valid IPv4 address
+# Arguments:
+#   $1 - IP to validate
+# Returns:
+#   Boolean
+#########################
+validate_ipv4() {
+    local ip="${1:?ip is missing}"
+    local stat=1
+
+    if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+	read -r -a ip_array <<< "$(tr '.' ' ' <<< "$ip")"
+        [[ ${ip_array[0]} -le 255 && ${ip_array[1]} -le 255 \
+            && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
+        stat=$?
+    fi
+    return $stat
+}
+
+########################
+# Validate a string format
+# Arguments:
+#   $1 - String to validate
+# Returns:
+#   Boolean
+#########################
+validate_string() {
+    local string
+    local min_length=-1
+    local max_length=-1
+
+    # Parse flags
+    while [ "$#" -gt 0 ]; do
+        case "$1" in
+            -min-length)
+                shift
+                min_length=${1:-}
+                ;;
+            -max-length)
+                shift
+                max_length=${1:-}
+                ;;
+            --)
+                shift
+                break
+                ;;
+            -*)
+                stderr_print "unrecognized flag $1"
+                return 1
+                ;;
+            *)
+                break
+                ;;
+        esac
+        shift
+    done
+
+    if [ "$#" -gt 1 ]; then
+        stderr_print "too many arguments provided"
+        return 2
+    elif [ "$#" -eq 0 ]; then
+        stderr_print "missing string"
+        return 1
+    else
+        string=$1
+    fi
+
+    if [[ "$min_length" -ge 0 ]] && [[ "${#string}" -lt "$min_length" ]]; then
+        echo "string length is less than $min_length"
+        return 1
+    fi
+    if [[ "$max_length" -ge 0 ]] && [[ "${#string}" -gt "$max_length" ]]; then
+        echo "string length is great than $max_length"
+        return 1
+    fi
+}
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/libversion.sh b/bitnami/postgresql/9.6/ol-7/prebuildfs/libversion.sh
new file mode 100644
index 000000000000..b16090cfe1f4
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/libversion.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# Library for managing versions strings
+
+# Load Generic Libraries
+. ./liblog.sh
+
+# Functions
+########################
+# Gets semantic version 
+# Arguments:
+#   $1 - version: string to extract major.minor.patch
+#   $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch
+# Returns:
+#   array with the major, minor and release
+#########################
+get_sematic_version () {
+    local version="${1:?version is required}"
+    local section="${2:?section is required}"
+    local -a version_sections
+
+    #Regex to parse versions: x.y.z
+    local -r regex='([0-9]+)(\.([0-9]+)(\.([0-9]+))?)?'
+
+    if [[ "$version" =~ $regex ]]; then
+        local i=1
+        local j=1
+        local n=${#BASH_REMATCH[*]}
+
+        while [[ $i -lt $n ]]; do
+            if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]];  then
+                version_sections[$j]=${BASH_REMATCH[$i]}
+                ((j++))
+            fi
+            ((i++))
+        done
+
+        local number_regex='^[0-9]+$'
+        if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then
+             echo "${version_sections[$section]}"
+             return
+        else
+            stderr_print "Section allowed values are: 1, 2, and 3"
+            return 1
+        fi
+    fi
+}
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/opt/bitnami/.exists b/bitnami/postgresql/9.6/ol-7/prebuildfs/opt/bitnami/.exists
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/bitnami/postgresql/9.6/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/postgresql/9.6/ol-7/prebuildfs/usr/local/bin/install_packages
new file mode 100755
index 000000000000..4218ab93690a
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/prebuildfs/usr/local/bin/install_packages
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+set -u
+n=0
+max=2
+until [ $n -gt $max ]; do
+    set +e
+    yum --enablerepo base,updates,ol7_developer_EPEL,ol7_optional_latest install -y "$@"
+    CODE=$?
+    set -e
+    if [ $CODE -eq 0 ]; then
+        break
+    fi
+    if [ $n -eq $max ]; then
+        exit $CODE
+    fi
+    echo "yum failed, retrying"
+    n=$(($n + 1))
+done
+rm -r /var/cache/yum
diff --git a/bitnami/postgresql/9.6/ol-7/rootfs/libpostgresql.sh b/bitnami/postgresql/9.6/ol-7/rootfs/libpostgresql.sh
index f684f5041767..e6256a52cee4 100644
--- a/bitnami/postgresql/9.6/ol-7/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/9.6/ol-7/rootfs/libpostgresql.sh
@@ -122,6 +122,10 @@ export PATH="$POSTGRESQL_BIN_DIR:$PATH"
 export POSTGRESQL_DAEMON_USER="postgresql"
 export POSTGRESQL_DAEMON_GROUP="postgresql"
 
+# Version
+export POSTGRESQL_VERSION="$(echo "$BITNAMI_IMAGE_VERSION" | grep -oP "^\d+\.\d+\.\d+")"
+export POSTGRESQL_MAJOR_VERSION="$(echo "$BITNAMI_IMAGE_VERSION" | grep -oP "^\d+")"
+
 # Settings
 export POSTGRESQL_INIT_MAX_TIMEOUT=${POSTGRESQL_INIT_MAX_TIMEOUT:-60}
 export POSTGRESQL_CLUSTER_APP_NAME=${POSTGRESQL_CLUSTER_APP_NAME:-walreceiver}
@@ -139,23 +143,18 @@ export POSTGRESQL_SYNCHRONOUS_COMMIT_MODE="${POSTGRESQL_SYNCHRONOUS_COMMIT_MODE:
 export POSTGRESQL_FSYNC="${POSTGRESQL_FSYNC:-on}"
 export POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-postgres}"
 
-if [[ -z "${POSTGRESQL_INITSCRIPTS_USERNAME:-}" ]]; then
-    export POSTGRESQL_INITSCRIPTS_USERNAME=$POSTGRESQL_USERNAME
-else
-    export POSTGRESQL_INITSCRIPTS_USERNAME=$POSTGRESQL_INITSCRIPTS_USERNAME
-fi
-
-if [[ -z "${POSTGRESQL_INITSCRIPTS_PASSWORD:-}" ]]; then
-    export POSTGRESQL_INITSCRIPTS_PASSWORD=$POSTGRESQL_PASSWORD
-else
-    export POSTGRESQL_INITSCRIPTS_PASSWORD=$POSTGRESQL_INITSCRIPTS_PASSWORD
-fi
-
-# Version
-export POSTGRESQL_VERSION="$(echo "$BITNAMI_IMAGE_VERSION" | grep -oP "^\d+\.\d+\.\d+")"
-export POSTGRESQL_MAJOR_VERSION="$(echo "$BITNAMI_IMAGE_VERSION" | grep -oP "^\d+")"
-
+# Internal
+export POSTGRESQL_FIRST_BOOT="yes"
 EOF
+    if [[ -z "${POSTGRESQL_INITSCRIPTS_USERNAME:-}" ]]; then
+        cat <<"EOF"
+export POSTGRESQL_INITSCRIPTS_USERNAME="${POSTGRESQL_USERNAME}"
+EOF
+    else
+        cat <<"EOF"
+export POSTGRESQL_INITSCRIPTS_USERNAME="${POSTGRESQL_INITSCRIPTS_USERNAME}"
+EOF
+    fi
     if [[ -f "${POSTGRESQL_PASSWORD_FILE:-}" ]]; then
         cat <<"EOF"
 export POSTGRESQL_PASSWORD="$(< "${POSTGRESQL_PASSWORD_FILE}")"
@@ -181,6 +180,15 @@ EOF
     else
         cat <<"EOF"
 export POSTGRESQL_POSTGRES_PASSWORD="${POSTGRESQL_POSTGRES_PASSWORD:-}"
+EOF
+    fi
+    if [[ -z "${POSTGRESQL_INITSCRIPTS_PASSWORD:-}" ]]; then
+        cat <<"EOF"
+export POSTGRESQL_INITSCRIPTS_PASSWORD="${POSTGRESQL_PASSWORD:-}"
+EOF
+    else
+        cat <<"EOF"
+export POSTGRESQL_INITSCRIPTS_PASSWORD="${POSTGRESQL_INITSCRIPTS_PASSWORD:-}"
 EOF
     fi
 }
@@ -559,6 +567,7 @@ postgresql_initialize() {
 
     if ! is_dir_empty "$POSTGRESQL_DATA_DIR"; then
         postgresql_info "Deploying PostgreSQL with persisted data..."
+        export POSTGRESQL_FIRST_BOOT="no"
         is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba
         is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters
         is_boolean_yes "$create_conf_file" && postgresql_configure_fsync
diff --git a/bitnami/postgresql/9.6/ol-7/rootfs/licenses/licenses.txt b/bitnami/postgresql/9.6/ol-7/rootfs/licenses/licenses.txt
new file mode 100644
index 000000000000..c76ba31f3b8a
--- /dev/null
+++ b/bitnami/postgresql/9.6/ol-7/rootfs/licenses/licenses.txt
@@ -0,0 +1,3 @@
+Bitnami containers ship with software bundles. You can find the licenses under:
+/opt/bitnami/nami/COPYING
+/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 144c520b0e5e..93b7ac64565e 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -53,7 +53,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`10-ol-7`, `10.10.0-ol-7-r99` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.10.0-ol-7-r99/10/ol-7/Dockerfile)
 * [`10-debian-9`, `10.10.0-debian-9-r88`, `10`, `10.10.0`, `10.10.0-r88` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.10.0-debian-9-r88/10/debian-9/Dockerfile)
 * [`10-centos-7`, `10.10.0-centos-7-r100` (10/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.10.0-centos-7-r100/10/centos-7/Dockerfile)
-* [`9.6-ol-7`, `9.6.15-ol-7-r101` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.15-ol-7-r101/9.6/ol-7/Dockerfile)
+* [`9.6-ol-7`, `9.6.15-ol-7-r102` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.15-ol-7-r102/9.6/ol-7/Dockerfile)
 * [`9.6-debian-9`, `9.6.15-debian-9-r88`, `9.6`, `9.6.15`, `9.6.15-r88` (9.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.15-debian-9-r88/9.6/debian-9/Dockerfile)
 * [`9.6-centos-7`, `9.6.15-centos-7-r100` (9.6/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.15-centos-7-r100/9.6/centos-7/Dockerfile)