diff --git a/ansible/base.yml b/ansible/base.yml
index d3845f27..6e455581 100755
--- a/ansible/base.yml
+++ b/ansible/base.yml
@@ -2,6 +2,10 @@
 ---
 
 - hosts: bde-nk20-beta.adh.crans.org
+  vars_prompt:
+    - name: DB_PASSWORD
+      prompt: "Password of the database"
+      private: yes
   roles:
     - 1-apt-basic
     - 2-nk20
diff --git a/ansible/roles/6-psql/tasks/main.yml b/ansible/roles/6-psql/tasks/main.yml
index ba313ee1..90ed8096 100644
--- a/ansible/roles/6-psql/tasks/main.yml
+++ b/ansible/roles/6-psql/tasks/main.yml
@@ -17,7 +17,7 @@
 - name: Create role note
   postgresql_user:
     name: note
-    password: "CHANGE_ME"
+    password: "{{ DB_PASSWORD }}"
   become_user: postgres
 
 - name: Create NK20 database
diff --git a/ansible/roles/7-postinstall/tasks/main.yml b/ansible/roles/7-postinstall/tasks/main.yml
index b1615a0b..34a9011b 100644
--- a/ansible/roles/7-postinstall/tasks/main.yml
+++ b/ansible/roles/7-postinstall/tasks/main.yml
@@ -9,7 +9,7 @@
   command: /var/www/note_kfet/env/bin/python manage.py migrate
   args:
     chdir: /var/www/note_kfet
-  become_user: www-data
+  become_user: postgres
 
 - name: Compile messages
   command: /var/www/note_kfet/env/bin/python manage.py compilemessages
@@ -21,4 +21,4 @@
   command: /var/www/note_kfet/env/bin/python manage.py loaddata initial
   args:
     chdir: /var/www/note_kfet
-  become_user: www-data
+  become_user: postgres