diff --git a/9.0/docker-entrypoint.sh b/9.0/docker-entrypoint.sh
index a8d6252557..87d7e3b87c 100755
--- a/9.0/docker-entrypoint.sh
+++ b/9.0/docker-entrypoint.sh
@@ -52,6 +52,7 @@ if [ "$1" = 'postgres' ]; then
 
 		: ${POSTGRES_USER:=postgres}
 		: ${POSTGRES_DB:=$POSTGRES_USER}
+		export POSTGRES_USER POSTGRES_DB
 
 		if [ "$POSTGRES_DB" != 'postgres' ]; then
 			psql --username postgres <<-EOSQL
diff --git a/9.1/docker-entrypoint.sh b/9.1/docker-entrypoint.sh
index a8d6252557..87d7e3b87c 100755
--- a/9.1/docker-entrypoint.sh
+++ b/9.1/docker-entrypoint.sh
@@ -52,6 +52,7 @@ if [ "$1" = 'postgres' ]; then
 
 		: ${POSTGRES_USER:=postgres}
 		: ${POSTGRES_DB:=$POSTGRES_USER}
+		export POSTGRES_USER POSTGRES_DB
 
 		if [ "$POSTGRES_DB" != 'postgres' ]; then
 			psql --username postgres <<-EOSQL
diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh
index a8d6252557..87d7e3b87c 100755
--- a/9.2/docker-entrypoint.sh
+++ b/9.2/docker-entrypoint.sh
@@ -52,6 +52,7 @@ if [ "$1" = 'postgres' ]; then
 
 		: ${POSTGRES_USER:=postgres}
 		: ${POSTGRES_DB:=$POSTGRES_USER}
+		export POSTGRES_USER POSTGRES_DB
 
 		if [ "$POSTGRES_DB" != 'postgres' ]; then
 			psql --username postgres <<-EOSQL
diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh
index a8d6252557..87d7e3b87c 100755
--- a/9.3/docker-entrypoint.sh
+++ b/9.3/docker-entrypoint.sh
@@ -52,6 +52,7 @@ if [ "$1" = 'postgres' ]; then
 
 		: ${POSTGRES_USER:=postgres}
 		: ${POSTGRES_DB:=$POSTGRES_USER}
+		export POSTGRES_USER POSTGRES_DB
 
 		if [ "$POSTGRES_DB" != 'postgres' ]; then
 			psql --username postgres <<-EOSQL
diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh
index a8d6252557..87d7e3b87c 100755
--- a/9.4/docker-entrypoint.sh
+++ b/9.4/docker-entrypoint.sh
@@ -52,6 +52,7 @@ if [ "$1" = 'postgres' ]; then
 
 		: ${POSTGRES_USER:=postgres}
 		: ${POSTGRES_DB:=$POSTGRES_USER}
+		export POSTGRES_USER POSTGRES_DB
 
 		if [ "$POSTGRES_DB" != 'postgres' ]; then
 			psql --username postgres <<-EOSQL
diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh
index a8d6252557..87d7e3b87c 100755
--- a/9.5/docker-entrypoint.sh
+++ b/9.5/docker-entrypoint.sh
@@ -52,6 +52,7 @@ if [ "$1" = 'postgres' ]; then
 
 		: ${POSTGRES_USER:=postgres}
 		: ${POSTGRES_DB:=$POSTGRES_USER}
+		export POSTGRES_USER POSTGRES_DB
 
 		if [ "$POSTGRES_DB" != 'postgres' ]; then
 			psql --username postgres <<-EOSQL
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index a8d6252557..87d7e3b87c 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -52,6 +52,7 @@ if [ "$1" = 'postgres' ]; then
 
 		: ${POSTGRES_USER:=postgres}
 		: ${POSTGRES_DB:=$POSTGRES_USER}
+		export POSTGRES_USER POSTGRES_DB
 
 		if [ "$POSTGRES_DB" != 'postgres' ]; then
 			psql --username postgres <<-EOSQL