diff --git a/10.1-2.4-2.5/initdb-pgrouting.sh b/10.1-2.4-2.5/initdb-pgrouting.sh
index ecabf4f..1729f27 100755
--- a/10.1-2.4-2.5/initdb-pgrouting.sh
+++ b/10.1-2.4-2.5/initdb-pgrouting.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-# Perform all actions as user 'postgres'
-export PGUSER=postgres
+# Perform all actions as $POSTGRES_USER
+export PGUSER="$POSTGRES_USER"
 
 # Add pgRouting Functions to the database
 psql --dbname="$POSTGRES_DB" <<EOSQL
diff --git a/9.4-2.1-2.0/initdb-pgrouting.sh b/9.4-2.1-2.0/initdb-pgrouting.sh
index ecabf4f..1729f27 100644
--- a/9.4-2.1-2.0/initdb-pgrouting.sh
+++ b/9.4-2.1-2.0/initdb-pgrouting.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-# Perform all actions as user 'postgres'
-export PGUSER=postgres
+# Perform all actions as $POSTGRES_USER
+export PGUSER="$POSTGRES_USER"
 
 # Add pgRouting Functions to the database
 psql --dbname="$POSTGRES_DB" <<EOSQL
diff --git a/9.6-2.3-2.3/initdb-pgrouting.sh b/9.6-2.3-2.3/initdb-pgrouting.sh
index ecabf4f..1729f27 100755
--- a/9.6-2.3-2.3/initdb-pgrouting.sh
+++ b/9.6-2.3-2.3/initdb-pgrouting.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-# Perform all actions as user 'postgres'
-export PGUSER=postgres
+# Perform all actions as $POSTGRES_USER
+export PGUSER="$POSTGRES_USER"
 
 # Add pgRouting Functions to the database
 psql --dbname="$POSTGRES_DB" <<EOSQL