diff --git a/10/alpine/docker-entrypoint.sh b/10/alpine/docker-entrypoint.sh
index 857389d553..7fa53c91d0 100755
--- a/10/alpine/docker-entrypoint.sh
+++ b/10/alpine/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/10/docker-entrypoint.sh b/10/docker-entrypoint.sh
index 02cb8e582a..6c4f2bfbf8 100755
--- a/10/docker-entrypoint.sh
+++ b/10/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/11/alpine/docker-entrypoint.sh b/11/alpine/docker-entrypoint.sh
index 857389d553..7fa53c91d0 100755
--- a/11/alpine/docker-entrypoint.sh
+++ b/11/alpine/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/11/docker-entrypoint.sh b/11/docker-entrypoint.sh
index 02cb8e582a..6c4f2bfbf8 100755
--- a/11/docker-entrypoint.sh
+++ b/11/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/12/alpine/docker-entrypoint.sh b/12/alpine/docker-entrypoint.sh
index 857389d553..7fa53c91d0 100755
--- a/12/alpine/docker-entrypoint.sh
+++ b/12/alpine/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/12/docker-entrypoint.sh b/12/docker-entrypoint.sh
index 02cb8e582a..6c4f2bfbf8 100755
--- a/12/docker-entrypoint.sh
+++ b/12/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh
index 45bb6e1f5e..ff895f7f68 100755
--- a/9.4/alpine/docker-entrypoint.sh
+++ b/9.4/alpine/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh
index 17b0a6878f..0ae88922c0 100755
--- a/9.4/docker-entrypoint.sh
+++ b/9.4/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh
index 45bb6e1f5e..ff895f7f68 100755
--- a/9.5/alpine/docker-entrypoint.sh
+++ b/9.5/alpine/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh
index 17b0a6878f..0ae88922c0 100755
--- a/9.5/docker-entrypoint.sh
+++ b/9.5/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh
index 45bb6e1f5e..ff895f7f68 100755
--- a/9.6/alpine/docker-entrypoint.sh
+++ b/9.6/alpine/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh
index 17b0a6878f..0ae88922c0 100755
--- a/9.6/docker-entrypoint.sh
+++ b/9.6/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 02cb8e582a..6c4f2bfbf8 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -212,11 +212,14 @@ docker_temp_server_start() {
 	if [ "$1" = 'postgres' ]; then
 		shift
 	fi
+
 	# internal start of server in order to allow setup using psql client
-	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
+	# does not listen on external TCP/IP and waits until start finishes
+	set -- "$@" -c listen_addresses='' -p 5432
+
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
 	pg_ctl -D "$PGDATA" \
-		-o "-c listen_addresses='' $([ "$#" -gt 0 ] && printf '%q ' "$@")" \
+		-o "$(printf '%q ' "$@")" \
 		-w start
 }