diff --git a/composes/n8n/init-data.sh b/composes/n8n/init-data.sh
deleted file mode 100644
index 9fee3a6..0000000
--- a/composes/n8n/init-data.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e;
-
-if [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${POSTGRES_NON_ROOT_PASSWORD:-}" ]; then
-	psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB" -p 5433 <<-EOSQL
-		CREATE USER ${POSTGRES_NON_ROOT_USER} WITH PASSWORD '${POSTGRES_NON_ROOT_PASSWORD}';
-		GRANT ALL PRIVILEGES ON DATABASE ${POSTGRES_DB} TO ${POSTGRES_NON_ROOT_USER};
-	EOSQL
-else
-	echo "SETUP INFO: No Environment variables given!"
-fi
\ No newline at end of file
diff --git a/composes/postgres/init-data.sh b/composes/postgres/init-data.sh
index 9e4af07..cb97bc9 100644
--- a/composes/postgres/init-data.sh
+++ b/composes/postgres/init-data.sh
@@ -18,22 +18,20 @@ else
 fi
 
 # Create n8n table
-if [ -n "${N8N_DB:-n8n}" ] && [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${POSTGRES_NON_ROOT_PASSWORD:-}" ]; then
+if [ -n "$N8N_DB" ] && [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${POSTGRES_NON_ROOT_PASSWORD:-}" ]; then
 	# echo $N8N_SCHEMA $POSTGRES_USER $POSTGRES_NON_ROOT_USER;
 	psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB" <<-EOSQL
 		CREATE DATABASE ${N8N_DB:-n8n};
 		GRANT ALL PRIVILEGES ON DATABASE ${N8N_DB:-n8n} TO $POSTGRES_NON_ROOT_USER;
 	EOSQL
-else
-	echo "SETUP INFO: No N8N_DB given!"
+	echo "SETUP n8n database: $N8N_DB"
 fi
 
 # Create umami table
-if [ -n "${UMAMI_DB:-umami}" ] && [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${POSTGRES_NON_ROOT_PASSWORD:-}" ]; then
+if [ -n "$UMAMI_DB" ] && [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${POSTGRES_NON_ROOT_PASSWORD:-}" ]; then
 	psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB" <<-EOSQL
-		CREATE DATABASE ${UMAMI_DB:-umami};
-		GRANT ALL PRIVILEGES ON DATABASE ${UMAMI_DB:-umami} TO $POSTGRES_NON_ROOT_USER;
+		CREATE DATABASE ${UMAMI_DB};
+		GRANT ALL PRIVILEGES ON DATABASE ${UMAMI_DB} TO $POSTGRES_NON_ROOT_USER;
 	EOSQL
-else
-	echo "SETUP INFO: No UMAMI_DB given!"
+	echo "SETUP umami database: $UMAMI_DB"
 fi
\ No newline at end of file
diff --git a/composes/postgres/postgres.yml b/composes/postgres/postgres.yml
index 32279c7..86c89e6 100644
--- a/composes/postgres/postgres.yml
+++ b/composes/postgres/postgres.yml
@@ -11,6 +11,8 @@ services:
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_NON_ROOT_USER=${POSTGRES_NON_ROOT_USER:-$ADMIN_USER}
       - POSTGRES_NON_ROOT_PASSWORD=${POSTGRES_NON_ROOT_PASSWORD:-$POSTGRES_PASSWORD}
+      - N8N_DB
+      - UMAMI_DB
     volumes:
       - postgres_storage:/var/lib/postgresql/data
       - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
diff --git a/composes/umami/umami.yml b/composes/umami/umami.yml
index 972c677..dbfcd21 100644
--- a/composes/umami/umami.yml
+++ b/composes/umami/umami.yml
@@ -6,7 +6,7 @@ services:
     environment:
       DATABASE_URL: postgres://${POSTGRES_NON_ROOT_USER:-$ADMIN_USER}:${POSTGRES_NON_ROOT_PASSWORD:-$POSTGRES_PASSWORD}@postgres:5432/${UMAMI_DB:-umami}
       DATABASE_TYPE: postgresql
-      HASH_SALT: replace-me-with-a-random-string
+      HASH_SALT: ${HASH_SALT:-replace-me-with-a-random-string}
     depends_on:
       postgres:
         condition: service_healthy