diff --git a/ansible/deploy.yaml b/ansible/deploy.yaml
index adbfe27cb5b599fba644037f1753bf0a10c2ccf4..1a00b8a8b073f6abaee11cb1e21e13da297ba05c 100644
--- a/ansible/deploy.yaml
+++ b/ansible/deploy.yaml
@@ -2,6 +2,10 @@
 - hosts: all
   become: yes
   gather_facts: yes
+  vars:
+    dbname: ippidb
+    dbuser: ippidb
+    dbpassword: 'LeroyMerlin'
   tasks:
     #
     # Install basic non-virtualenv requirements
@@ -72,22 +76,14 @@
                   insertbefore=BOF
     - name: restart postgresql service
       systemd: state=restarted name=postgresql enabled=yes
-    - become: yes
-      become_user: ippidb
-      gather_facts: no
-      vars:
-        dbname: ippidb
-        dbuser: ippidb
-        dbpassword: 'LeroyMerlin'
-      tasks:
-      - name: ensure database is created
-        postgresql_db: name={{dbname}}
-      - name: ensure user has access to database
-        postgresql_user: db={{dbname}} name={{dbuser}} password={{dbpassword}} priv=ALL
-      - name: ensure user does not have unnecessary privilege
-        postgresql_user: name={{dbuser}} role_attr_flags=NOSUPERUSER,NOCREATEDB
-      - name: ensure no other user can access the database
-        postgresql_privs: db={{dbname}} role=PUBLIC type=database priv=ALL state=absent
+    - name: ensure database is created
+      postgresql_db: name={{dbname}}
+    - name: ensure user has access to database
+      postgresql_user: db={{dbname}} name={{dbuser}} password={{dbpassword}} priv=ALL
+    - name: ensure user does not have unnecessary privilege
+      postgresql_user: name={{dbuser}} role_attr_flags=NOSUPERUSER,NOCREATEDB
+    - name: ensure no other user can access the database
+      postgresql_privs: db={{dbname}} role=PUBLIC type=database priv=ALL state=absent
     #
     # Stop web server(s)
     #