diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 08fd012..263fa6e 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -46,12 +46,15 @@ else
   $PGCTL reload
 
   # CREATE USER OR ROLE
-  psql -d "$PGUSER" -c "CREATE USER \"${POSTGRESQL_USER}\" WITH PASSWORD '${POSTGRESQL_PASSWORD}';" 
+  psql -d "$PGUSER" -c "CREATE USER \"${POSTGRESQL_USER}\" WITH PASSWORD '${POSTGRESQL_PASSWORD}';"
 
   # CREATE DATABASE
   echo "Creating database: ${POSTGRESQL_DATABASE}"
 
   psql -v ON_ERROR_STOP=1 -d "$PGUSER" -c "CREATE DATABASE \"${POSTGRESQL_DATABASE}\" OWNER '${POSTGRESQL_USER}';"
+  if [ -n "$POSTGRESQL_SCHEMA" ]; then
+    psql -v ON_ERROR_STOP=1 -d "$PGUSER" -d "$POSTGRESQL_DATABASE" -c "CREATE SCHEMA \"${POSTGRESQL_SCHEMA}\" AUTHORIZATION \"${POSTGRESQL_USER}\";"
+  fi
   if [ -n "$POSTGRESQL_ADMIN_PASSWORD" ]; then
     psql -v ON_ERROR_STOP=1 -d "$PGUSER" -c "ALTER USER \"$PGUSER\" WITH ENCRYPTED PASSWORD '${POSTGRESQL_ADMIN_PASSWORD}';"
   fi