diff --git a/docker/deployment/db/scripts/create_databases.sh b/docker/deployment/db/scripts/create_databases.sh
index 7abee803d..5cbbc2e92 100644
--- a/docker/deployment/db/scripts/create_databases.sh
+++ b/docker/deployment/db/scripts/create_databases.sh
@@ -3,20 +3,19 @@
 set -e
 set -u
 
-function create_user_and_database() {
+function create_database() {
   local database=$1
   echo " Creating user and database '$database'"
   psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
-    CREATE USER $database WITH PASSWORD '$database';
     CREATE DATABASE $database;
-    GRANT ALL PRIVILEGES ON DATABASE $database TO $database;
+    GRANT ALL PRIVILEGES ON DATABASE $database TO $POSTGRES_USER;
 EOSQL
 }
 
 if [ -n "$POSTGRES_MULTIPLE_DATABASES" ]; then
 	echo "Multiple database creation requested: $POSTGRES_MULTIPLE_DATABASES"
 	for db in $(echo $POSTGRES_MULTIPLE_DATABASES | tr ',' ' '); do
-		create_user_and_database $db
+		create_database $db
 	done
 	echo "Multiple databases created"
-fi
\ No newline at end of file
+fi
diff --git a/docker/deployment/hangar/application.yml b/docker/deployment/hangar/application.yml
index 387ab08a0..f08318e79 100644
--- a/docker/deployment/hangar/application.yml
+++ b/docker/deployment/hangar/application.yml
@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:postgresql://db:5432/hangar
+    url: jdbc:postgresql://hangar_db:5432/hangar
     username: hangar
     password: hangar