diff --git a/tasks/database_postgres.yml b/tasks/database_postgres.yml
index 328f903..e6b7cc3 100644
--- a/tasks/database_postgres.yml
+++ b/tasks/database_postgres.yml
@@ -13,6 +13,7 @@
     name: "{{ nextcloud_db_name }}"
     lc_collate: fr_FR.UTF-8
     encoding: utf8
+    template: template0
     owner: "{{ nextcloud_db_user }}"
     state: present
   register: nextcloud_database_creation
diff --git a/tasks/main.yml b/tasks/main.yml
index 926f52b..f70589c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -78,7 +78,7 @@
   lineinfile:
     path: '{{ nextcloud_web_root }}/config/config.php'
     regexp: '^\s*''{{ item.option }}'''
-    line: '  ''{{ item.option }}'' => {{ item.value }},'
+    line: '  ''{{ item.option }}'' => ''{{ item.value }}'','
     insertafter: '\$CONFIG'
   with_items: '{{ nextcloud_db_options }}'
   when: nextcloud_config_options is defined
@@ -88,7 +88,7 @@
   lineinfile:
     path: '{{ nextcloud_web_root }}/config/config.php'
     regexp: '^\s*''{{ item.option }}'''
-    line: '  ''{{ item.option }}'' => {{ item.value }},'
+    line: '  ''{{ item.option }}'' => ''{{ item.value }}'','
     insertafter: '\$CONFIG'
   with_items: '{{ nextcloud_config_options }}'
   when: nextcloud_config_options is defined