diff --git a/files/config.json.j2 b/files/config.json.j2
index b7139fa0fec1e0b48e7677d5ba2185bc27537452..79eb3fb84f6f34abaedad2d60b87081f8da5adaa 100644
--- a/files/config.json.j2
+++ b/files/config.json.j2
@@ -36,16 +36,16 @@
         },
         "cookiePolicy": "strict",
         "db": {
-            "username": "hedgedocs-user",
-            "password": "{{hedgedocs-sql-password}}",
-            "database": "hedgedoc",
+            "username": "{{ hedgedoc_db_user }}",
+            "password": "{{ hedgedocs-sql-password }}",
+            "database": "{{ hedgedoc_db_name }}",
             "host": "localhost",
             "port": "5432",
             "dialect": "postgres"
         },
         "linkifyHeaderStyle": "gfm",
         "allowAnonymous" : false,
-        "sessionSecret" : ,
+        "sessionSecret" : {{ hedgedoc_session_secret }},
         "allowEmailRegister" : false
     }
 }
diff --git a/tasks/install-database.yml b/tasks/install-database.yml
index 3632a747c38d630c8772e215ae67d82ed9bb55cf..f2e3161ec9ddd8baf08bff82f7b169dad6cf3913 100644
--- a/tasks/install-database.yml
+++ b/tasks/install-database.yml
@@ -6,12 +6,35 @@
     state: started
     enabled: yes
 
-- name: Creation de l'utilisateur pour pSQL
-  community.general.postgresql_user:
-    name: hedgedocs-user
-    password: "{{ hedgedoc_sql_password }}"
-    priv: "ALL" # NB: Est-ce que ce niveau de privilège est nécessire ?
-    comment: "Utilisateur pSQL pour le service hedgedocs"
-    db: hedgedoc
-    state: present
-    role_attr_flags: CREATEDB,NOSUPERUSER
+# - name: Creation de l'utilisateur pour pSQL
+#   community.general.postgresql_user:
+#     name: hedgedocs-user
+#     password: "{{ hedgedoc_sql_password }}"
+#     priv: "ALL" # NB: Est-ce que ce niveau de privilège est nécessire ?
+#     comment: "Utilisateur pSQL pour le service hedgedocs"
+#     db: hedgedoc
+#     state: present
+#     role_attr_flags: CREATEDB,NOSUPERUSER
+
+- name: Creation de la base de donnée
+  sudo_user: postgres
+  postgresql_db: name={{ hedgedoc_db_name }}
+             encoding='UTF-8'
+             lc_collate='en_US.UTF-8'
+             lc_ctype='en_US.UTF-8'
+             template='template0'
+             state=present
+
+- name: Creation de l'accès à la base de donnée
+  sudo_user: postgres
+  postgresql_user: db={{ hedgedoc_db_name }}
+               name={{ hedgedoc_db_user }}
+               password={{ hedgedoc_sql_password }}
+               priv=ALL
+               state=present
+
+- name: Vérification des privilèges sur la base de donnée
+  sudo_user: postgres
+  postgresql_user: name={{ hedgedoc_db_user }}
+               role_attr_flags=NOSUPERUSER,NOCREATEDB
+               state=pr