diff --git a/immich/.env.example b/immich/.env.example
index 9ccc73a..6852f61 100644
--- a/immich/.env.example
+++ b/immich/.env.example
@@ -1,8 +1,10 @@
 UPLOAD_LOCATION=
+IMMICH_VERSION=
 IMMICH_DB_LOCATION=
 
-DB_USERNAME=
-DB_PASSWORD=
-DB_DATABASE_NAME=
+IMMICH_DB_HOSTNAME=
+IMMICH_POSTGRES_DB=
+IMMICH_POSTGRES_USER=
+IMMICH_POSTGRES_PASSWORD=
 
-REDIS_HOSTNAME=
\ No newline at end of file
+REDIS_HOSTNAME=
diff --git a/immich/docker-compose.updated.yml b/immich/docker-compose.updated.yml
index f21402d..475f152 100644
--- a/immich/docker-compose.updated.yml
+++ b/immich/docker-compose.updated.yml
@@ -10,9 +10,9 @@ services:
     environment:
       DB_HOSTNAME: shared-postgres
       DB_PORT: 5432
-      DB_USERNAME: ${IMMICH_DB_USERNAME}
-      DB_PASSWORD: ${IMMICH_DB_PASSWORD}
-      DB_DATABASE_NAME: ${IMMICH_DB_DATABASE_NAME}
+      DB_USERNAME: ${IMMICH_POSTGRES_USER}
+      DB_PASSWORD: ${IMMICH_POSTGRES_PASSWORD}
+      DB_DATABASE_NAME: ${IMMICH_POSTGRES_DB}
     ports:
       - '2283:2283'
     depends_on:
diff --git a/immich/docker-compose.yml b/immich/docker-compose.yml
index dcec168..914572e 100644
--- a/immich/docker-compose.yml
+++ b/immich/docker-compose.yml
@@ -13,9 +13,9 @@ services:
       - .env
     environment:
       DB_HOSTNAME: ${IMMICH_DB_HOSTNAME}
-      DB_USERNAME: ${IMMICH_DB_USERNAME}
-      DB_PASSWORD: ${IMMICH_DB_PASSWORD}
-      DB_DATABASE_NAME: ${IMMICH_DB_DATABASE_NAME}
+      DB_USERNAME: ${IMMICH_POSTGRES_USER}
+      DB_PASSWORD: ${IMMICH_POSTGRES_PASSWORD}
+      DB_DATABASE_NAME: ${IMMICH_POSTGRES_DB}
     ports:
       - '2283:2283'
     depends_on:
diff --git a/postgres/init-scripts/01-init-databases.sh b/postgres/init-scripts/01-init-databases.sh
index 45cf233..4f58793 100755
--- a/postgres/init-scripts/01-init-databases.sh
+++ b/postgres/init-scripts/01-init-databases.sh
@@ -16,19 +16,19 @@ create_db_and_user() {
 
     psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
         -- Create database
-        CREATE DATABASE $db_name;
+        CREATE DATABASE $($db_name);
 
         -- Create user with password
         CREATE USER $db_user WITH ENCRYPTED PASSWORD '$db_password';
 
         -- Grant connection to the specific database only
-        GRANT CONNECT ON DATABASE $db_name TO $db_user;
+        GRANT CONNECT ON DATABASE $($db_name) TO $db_user;
 
         -- Make user owner of the database
-        ALTER DATABASE $db_name OWNER TO $db_user;
+        ALTER DATABASE $($db_name) OWNER TO $db_user;
 
         -- Connect to the specific database to set schema permissions
-        \c $db_name
+        \c $($db_name)
 
         -- Grant schema permissions
         GRANT ALL ON SCHEMA public TO $db_user;
@@ -56,7 +56,7 @@ create_db_and_user "${SPLIIT_POSTGRES_DB}" "${SPLIIT_POSTGRES_USER}" "${SPLIIT_P
 create_db_and_user "${SHLINK_POSTGRES_DB}" "${SHLINK_POSTGRES_USER}" "${SHLINK_POSTGRES_PASSWORD}"
 
 # Immich
-create_db_and_user "${IMMICH_DB_DATABASE_NAME}" "${IMMICH_DB_USERNAME}" "${IMMICH_DB_PASSWORD}"
+create_db_and_user "${IMMICH_POSTGRES_DB}" "${IMMICH_POSTGRES_USER}" "${IMMICH_POSTGRES_PASSWORD}"
 
 # Nextcloud
 create_db_and_user "${NEXTCLOUD_POSTGRES_DB}" "${NEXTCLOUD_POSTGRES_USER}" "${NEXTCLOUD_POSTGRES_PASSWORD}"