diff --git a/homelab-services/postgresql-db/flake.nix b/homelab-services/postgresql-db/flake.nix
index fc9af65..6e4ccdb 100644
--- a/homelab-services/postgresql-db/flake.nix
+++ b/homelab-services/postgresql-db/flake.nix
@@ -116,16 +116,16 @@
                 echo $dev_pass_val
 
                 # Create databases
-                #$psql_bin -c "CREATE DATABASE "$db";"
-                #$psql_bin -c "CREATE DATABASE "$db"_dev;"
+                $psql_bin -c "CREATE DATABASE "$db";"
+                $psql_bin -c "CREATE DATABASE "$db"_dev;"
 
                 # Create users if not exists
-                $psql_bin -c "CREATE ROLE "$user_val" WITH LOGIN PASSWORD "$pass_val";"
-                $psql_bin -c "CREATE ROLE "$dev_user_val" WITH LOGIN PASSWORD "$dev_pass_val";"
+                $psql_bin -c "CREATE ROLE "$user_val" WITH LOGIN PASSWORD \"$pass_val\";"
+                $psql_bin -c "CREATE ROLE "$dev_user_val" WITH LOGIN PASSWORD \"$dev_pass_val\";"
 
                 # Give users privileges on databases
-                $psql_bin -c "GRANT ALL PRIVELEGES ON DATABASE "$db" TO '$user_val';"
-                $psql_bin -c "GRANT ALL PRIVELEGES ON DATABASE "$db"_dev TO '$dev_user_val';"
+                $psql_bin -c "GRANT ALL PRIVELEGES ON DATABASE "$db" TO "$user_val";"
+                $psql_bin -c "GRANT ALL PRIVELEGES ON DATABASE "$db"_dev TO "$dev_user_val";"
 
               done
             '';