diff --git a/9.0/docker-entrypoint.sh b/9.0/docker-entrypoint.sh
index 87d7e3b87c..4bfeb7611b 100755
--- a/9.0/docker-entrypoint.sh
+++ b/9.0/docker-entrypoint.sh
@@ -8,6 +8,7 @@ set_listen_addresses() {
 
 if [ "$1" = 'postgres' ]; then
 	mkdir -p "$PGDATA"
+	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
 
 	chmod g+s /run/postgresql
diff --git a/9.1/docker-entrypoint.sh b/9.1/docker-entrypoint.sh
index 87d7e3b87c..4bfeb7611b 100755
--- a/9.1/docker-entrypoint.sh
+++ b/9.1/docker-entrypoint.sh
@@ -8,6 +8,7 @@ set_listen_addresses() {
 
 if [ "$1" = 'postgres' ]; then
 	mkdir -p "$PGDATA"
+	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
 
 	chmod g+s /run/postgresql
diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh
index 87d7e3b87c..4bfeb7611b 100755
--- a/9.2/docker-entrypoint.sh
+++ b/9.2/docker-entrypoint.sh
@@ -8,6 +8,7 @@ set_listen_addresses() {
 
 if [ "$1" = 'postgres' ]; then
 	mkdir -p "$PGDATA"
+	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
 
 	chmod g+s /run/postgresql
diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh
index 87d7e3b87c..4bfeb7611b 100755
--- a/9.3/docker-entrypoint.sh
+++ b/9.3/docker-entrypoint.sh
@@ -8,6 +8,7 @@ set_listen_addresses() {
 
 if [ "$1" = 'postgres' ]; then
 	mkdir -p "$PGDATA"
+	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
 
 	chmod g+s /run/postgresql
diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh
index 87d7e3b87c..4bfeb7611b 100755
--- a/9.4/docker-entrypoint.sh
+++ b/9.4/docker-entrypoint.sh
@@ -8,6 +8,7 @@ set_listen_addresses() {
 
 if [ "$1" = 'postgres' ]; then
 	mkdir -p "$PGDATA"
+	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
 
 	chmod g+s /run/postgresql
diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh
index 87d7e3b87c..4bfeb7611b 100755
--- a/9.5/docker-entrypoint.sh
+++ b/9.5/docker-entrypoint.sh
@@ -8,6 +8,7 @@ set_listen_addresses() {
 
 if [ "$1" = 'postgres' ]; then
 	mkdir -p "$PGDATA"
+	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
 
 	chmod g+s /run/postgresql
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 87d7e3b87c..4bfeb7611b 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -8,6 +8,7 @@ set_listen_addresses() {
 
 if [ "$1" = 'postgres' ]; then
 	mkdir -p "$PGDATA"
+	chmod 700 "$PGDATA"
 	chown -R postgres "$PGDATA"
 
 	chmod g+s /run/postgresql