diff --git a/deploy/sql/10-dwh-roles.sql b/deploy/sql/10-dwh-roles.sql
index 3d27573b..4b26fd6d 100644
--- a/deploy/sql/10-dwh-roles.sql
+++ b/deploy/sql/10-dwh-roles.sql
@@ -5,10 +5,11 @@
 DO $$
 BEGIN
   IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'thoth_dwh_reader') THEN
-    CREATE ROLE thoth_dwh_reader LOGIN PASSWORD :'PWD';
+    CREATE ROLE thoth_dwh_reader LOGIN;
   END IF;
 END $$;
-
+-- :'PWD' va fuori dal DO (psql non interpola nelle stringhe dollar-quoted)
+ALTER ROLE thoth_dwh_reader PASSWORD :'PWD';
 GRANT USAGE ON SCHEMA datawarehouse TO thoth_dwh_reader;
 GRANT SELECT ON ALL TABLES IN SCHEMA datawarehouse TO thoth_dwh_reader;
 ALTER DEFAULT PRIVILEGES IN SCHEMA datawarehouse
diff --git a/deploy/sql/20-vector-roles.sql b/deploy/sql/20-vector-roles.sql
index 1753db7f..9d4d5730 100644
--- a/deploy/sql/20-vector-roles.sql
+++ b/deploy/sql/20-vector-roles.sql
@@ -5,9 +5,11 @@
 DO $$
 BEGIN
   IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'thoth_vector_rw') THEN
-    CREATE ROLE thoth_vector_rw LOGIN PASSWORD :'PWD';
+    CREATE ROLE thoth_vector_rw LOGIN;
   END IF;
 END $$;
+-- :'PWD' va fuori dal DO (psql non interpola nelle stringhe dollar-quoted)
+ALTER ROLE thoth_vector_rw PASSWORD :'PWD';
 
 CREATE SCHEMA IF NOT EXISTS vectors;