diff --git a/homelab-services/postgresql-db/flake.nix b/homelab-services/postgresql-db/flake.nix
index 4fba749..dc3d23f 100644
--- a/homelab-services/postgresql-db/flake.nix
+++ b/homelab-services/postgresql-db/flake.nix
@@ -69,15 +69,12 @@
 
               psql_bin=${pkgs.postgresql}/bin/psql
 
-              # Create databases and users
               for db in ${lib.escapeShellArgs opts.databases}; do
-                # Uppercase database name
                 db_upper="''${db^^}"
 
                 user_var="PSQL_''${db_upper}_USER"
                 pass_var="PSQL_''${db_upper}_PASSWORD"
 
-                # Expand variable values (from EnvironmentFile)
                 user_val=$(eval "echo \''${$user_var:-}")
                 pass_val=$(eval "echo \''${$pass_var:-}")
 
@@ -88,28 +85,25 @@
 
                 echo "Bootstrapping PostgreSQL for database: $db"
 
-                # Create user if not exists
+                # CREATE USER (if not exists)
                 $psql_bin --tuples-only --no-align -c \
-                  "SELECT 1 FROM pg_roles WHERE rolname=$user_val" | grep -q 1 \
-                  || $psql_bin -c "CREATE USER $user_val WITH PASSWORD '$pass_val';"
+                  "SELECT 1 FROM pg_roles WHERE rolname='\$${user_val}'" | grep -q 1 \
+                  || $psql_bin -c "CREATE USER ''${user_val} WITH PASSWORD ''${pass_val};"
 
-                # Create database if not exists
+                # CREATE DATABASE (if not exists)
                 $psql_bin --tuples-only --no-align -c \
-                  "SELECT 1 FROM pg_database WHERE datname='$db'" | grep -q 1 \
-                  || $psql_bin -c "CREATE DATABASE $db OWNER $user_val;"
+                  "SELECT 1 FROM pg_database WHERE datname='\$${db}'" | grep -q 1 \
+                  || $psql_bin -c "CREATE DATABASE ''${db} OWNER ''${user_val};"
 
-                # Ensure user owns DB + grants
-                $psql_bin -c "ALTER DATABASE $db OWNER TO $user_val;"
-                $psql_bin -d "$db" -c "GRANT ALL PRIVILEGES ON DATABASE $db TO $user_val;"
+                # Privileges
+                $psql_bin -c "ALTER DATABASE ''${db} OWNER TO ''${user_val};"
+                $psql_bin -d "$db" -c "GRANT ALL PRIVILEGES ON DATABASE ''${db} TO ''${user_val};"
 
-                echo "Bootstrapped DB $db (user: $user_val)"
+                echo "Bootstrapped DB ''${db} (user: ''${user_val})"
               done
             '';
+            };
           };
-
-
-        };
-
       };
     };
   };