diff --git a/bitnami/postgresql/11/ol-7/Dockerfile b/bitnami/postgresql/11/ol-7/Dockerfile
index 35f0ac4312c9..04a33e6a6818 100644
--- a/bitnami/postgresql/11/ol-7/Dockerfile
+++ b/bitnami/postgresql/11/ol-7/Dockerfile
@@ -6,18 +6,21 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
 
 # Install required system packages and dependencies
 RUN install_packages glibc keyutils-libs krb5-libs libcom_err libselinux libxml2 libxslt ncurses-libs openssl-libs pcre readline xz-libs zlib
-RUN bitnami-pkg unpack postgresql-11.1.0-28 --checksum 7bb77a6de25bbf09dac7c317651fcc3952df757f746e3320fcfd625988490412
+RUN bitnami-pkg unpack postgresql-11.1.0-29 --checksum 7d8846d62a77a84cf65ec3ff629e1c61dc8ed69412d2ac13fb9748c44fc4abcf
 RUN mkdir /docker-entrypoint-initdb.d /opt/bitnami/postgresql/conf/
 RUN chmod -R g+rwX /opt/bitnami/postgresql/conf/
 
 COPY rootfs /
 RUN rpm -Uvh --nodeps $(repoquery --location nss_wrapper)
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="11.1.0-ol-7-r78" \
+    BITNAMI_IMAGE_VERSION="11.1.0-ol-7-r79" \
     NAMI_PREFIX="/.nami" \
     PATH="/opt/bitnami/postgresql/bin:$PATH" \
     POSTGRESQL_CLUSTER_APP_NAME="walreceiver" \
     POSTGRESQL_DATABASE="" \
+    POSTGRESQL_DATA_DIR="/bitnami/postgresql" \
+    POSTGRESQL_INITDB_ARGS="" \
+    POSTGRESQL_INITDB_WALDIR="" \
     POSTGRESQL_MASTER_HOST="" \
     POSTGRESQL_MASTER_PORT_NUMBER="5432" \
     POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS="0" \
diff --git a/bitnami/postgresql/11/ol-7/rootfs/app-entrypoint.sh b/bitnami/postgresql/11/ol-7/rootfs/app-entrypoint.sh
index 055793929f20..3daff929fa7c 100755
--- a/bitnami/postgresql/11/ol-7/rootfs/app-entrypoint.sh
+++ b/bitnami/postgresql/11/ol-7/rootfs/app-entrypoint.sh
@@ -36,6 +36,32 @@ if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then
       export POSTGRESQL_REPLICATION_PASSWORD=$REPLICATION_PASSWORD_AUX
   fi
 
+  declareEnvironmentVariableAlias() {
+      if env | grep -q "$2"; then
+          export $1=${!2}
+      fi
+  }
+
+  # Alias created for official postgre image compatibility
+  declareEnvironmentVariableAlias POSTGRESQL_PASSWORD POSTGRES_PASSWORD
+  declareEnvironmentVariableAlias POSTGRESQL_DATABASE POSTGRES_DB
+  declareEnvironmentVariableAlias POSTGRESQL_USERNAME POSTGRES_USER
+  declareEnvironmentVariableAlias POSTGRESQL_DATA_DIR PGDATA
+  declareEnvironmentVariableAlias POSTGRESQL_INITDB_WALDIR POSTGRES_INITDB_WALDIR
+
+  # Alias created for maintain consistency using prefix
+  declareEnvironmentVariableAlias POSTGRESQL_CLUSTER_APP_NAME POSTGRES_CLUSTER_APP_NAME
+  declareEnvironmentVariableAlias POSTGRESQL_MASTER_HOST POSTGRES_MASTER_HOST
+  declareEnvironmentVariableAlias POSTGRESQL_MASTER_PORT_NUMBER POSTGRES_MASTER_PORT_NUMBER
+  declareEnvironmentVariableAlias POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS POSTGRES_NUM_SYNCHRONOUS_REPLICAS
+  declareEnvironmentVariableAlias POSTGRESQL_PORT_NUMBER POSTGRES_PORT_NUMBER
+  declareEnvironmentVariableAlias POSTGRESQL_REPLICATION_MODE POSTGRES_REPLICATION_MODE
+  declareEnvironmentVariableAlias POSTGRESQL_REPLICATION_PASSWORD POSTGRES_REPLICATION_PASSWORD
+  declareEnvironmentVariableAlias POSTGRESQL_REPLICATION_USER POSTGRES_REPLICATION_USER
+  declareEnvironmentVariableAlias POSTGRESQL_SYNCHRONOUS_COMMIT_MODE POSTGRES_SYNCHRONOUS_COMMIT_MODE
+  declareEnvironmentVariableAlias POSTGRESQL_PASSWORD_FILE POSTGRES_PASSWORD_FILE
+  declareEnvironmentVariableAlias POSTGRESQL_REPLICATION_PASSWORD_FILE POSTGRES_REPLICATION_PASSWORD_FILE
+
   nami_initialize postgresql
   info "Starting postgresql... "
 fi
diff --git a/bitnami/postgresql/11/ol-7/rootfs/postgresql-inputs.json b/bitnami/postgresql/11/ol-7/rootfs/postgresql-inputs.json
index 40f6732a3df3..d878f31c82f7 100644
--- a/bitnami/postgresql/11/ol-7/rootfs/postgresql-inputs.json
+++ b/bitnami/postgresql/11/ol-7/rootfs/postgresql-inputs.json
@@ -1,10 +1,13 @@
 {
   "clusterAppName": "{{$global.env.POSTGRESQL_CLUSTER_APP_NAME}}",
   "database": "{{$global.env.POSTGRESQL_DATABASE}}",
+  "initdbArgs": "{{$global.env.POSTGRESQL_INITDB_ARGS}}",
+  "initdbWalDir": "{{$global.env.POSTGRESQL_INITDB_WALDIR}}",
   "masterHost": "{{$global.env.POSTGRESQL_MASTER_HOST}}",
   "masterPort": "{{$global.env.POSTGRESQL_MASTER_PORT_NUMBER}}",
   "numSynchronousReplicas": "{{$global.env.POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS}}",
   "password": "{{$global.env.POSTGRESQL_PASSWORD}}",
+  "persistDir": "{{$global.env.POSTGRESQL_DATA_DIR}}",
   "postgresqlPort": "{{$global.env.POSTGRESQL_PORT_NUMBER}}",
   "replicationMode": "{{$global.env.POSTGRESQL_REPLICATION_MODE}}",
   "replicationPassword": "{{$global.env.POSTGRESQL_REPLICATION_PASSWORD}}",
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index daa595fca924..05bf853c1975 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -43,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`11-ol-7`, `11.1.0-ol-7-r78` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.1.0-ol-7-r78/11/ol-7/Dockerfile)
+* [`11-ol-7`, `11.1.0-ol-7-r79` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.1.0-ol-7-r79/11/ol-7/Dockerfile)
 * [`11-debian-9`, `11.1.0-debian-9-r61`, `11`, `11.1.0`, `11.1.0-r61` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.1.0-debian-9-r61/11/debian-9/Dockerfile)
 * [`10-ol-7`, `10.6.0-ol-7-r83` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.6.0-ol-7-r83/10/ol-7/Dockerfile)
 * [`10-debian-9`, `10.6.0-debian-9-r67`, `10`, `10.6.0`, `10.6.0-r67`, `latest` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.6.0-debian-9-r67/10/debian-9/Dockerfile)