diff --git a/defaults/main.yml b/defaults/main.yml
index 4f5fb3a..2313426 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -94,4 +94,29 @@ phpfpm_php_variables:
   - { prop: 'session.cache_expire', value: 180 }
 
 phpfpm_pools:
-  - { pool_name: '{{ phpfpm_default_pool_name }}', app_context: '{{ phpfpm_default_context }}', user: '{{ phpfpm_default_user }}', group: '{{ phpfpm_default_group }}', listen: '{{ phpfpm_default_listen }}', listen_backlog: '{{ phpfpm_default_listen_backlog }}', allowed_clients: '{{ phpfpm_default_allowed_clients }}', pm: '{{ phpfpm_default_pm }}', pm_max_children: '{{ phpfpm_default_pm_max_children }}', pm_start_servers: '{{ phpfpm_default_pm_start_servers }}', pm_min_spare: '{{ phpfpm_default_pm_min_spare_servers }}', pm_max_spare: '{{ phpfpm_default_pm_max_spare_servers }}', pm_max_requests: '{{ phpfpm_default_pm_max_requests }}', pm_status_enabled: '{{ phpfpm_default_pm_status_enabled }}', pm_status_path: '{{ phpfpm_default_pm_status_path }}', ping_enabled: '{{ phpfpm_default_ping_enabled }}', ping_path: '{{ phpfpm_default_ping_path }}', ping_response: '{{ phpfpm_default_ping_response }}', display_errors: '{{ phpfpm_default_display_errors }}', log_errors: '{{ phpfpm_default_log_errors }}', memory_limit: '{{ phpfpm_default_memory_limit }}', slowlog_timeout: '{{ phpfpm_default_slowlog_timeout }}', rlimit_files: '{{ phpfpm_default_rlimit_files }}', php_extensions: '{{ phpfpm_default_extensions }}', define_custom_variables: '{{ phpfpm_default_define_custom_variables }}' }
+  - pool_name: '{{ phpfpm_default_pool_name }}'
+    app_context: '{{ phpfpm_default_context }}'
+    user: '{{ phpfpm_default_user }}'
+    group: '{{ phpfpm_default_group }}'
+    listen: '{{ phpfpm_default_listen }}'
+    listen_backlog: '{{ phpfpm_default_listen_backlog }}'
+    allowed_clients: '{{ phpfpm_default_allowed_clients }}'
+    pm: '{{ phpfpm_default_pm }}'
+    pm_max_children: '{{ phpfpm_default_pm_max_children }}'
+    pm_start_servers: '{{ phpfpm_default_pm_start_servers }}'
+    pm_min_spare: '{{ phpfpm_default_pm_min_spare_servers }}'
+    pm_max_spare: '{{ phpfpm_default_pm_max_spare_servers }}'
+    pm_max_requests: '{{ phpfpm_default_pm_max_requests }}'
+    pm_status_enabled: '{{ phpfpm_default_pm_status_enabled }}'
+    pm_status_path: '{{ phpfpm_default_pm_status_path }}'
+    ping_enabled: '{{ phpfpm_default_ping_enabled }}'
+    ping_path: '{{ phpfpm_default_ping_path }}'
+    ping_response: '{{ phpfpm_default_ping_response }}'
+    display_errors: '{{ phpfpm_default_display_errors }}'
+    log_errors: '{{ phpfpm_default_log_errors }}'
+    memory_limit: '{{ phpfpm_default_memory_limit }}'
+    slowlog_timeout: '{{ phpfpm_default_slowlog_timeout }}'
+    rlimit_files: '{{ phpfpm_default_rlimit_files }}'
+    php_extensions: '{{ phpfpm_default_extensions }}'
+    define_custom_variables: '{{ phpfpm_default_define_custom_variables }}'
+
diff --git a/tasks/main.yml b/tasks/main.yml
index bb5606f..2e6baf5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -26,12 +26,21 @@
     notify: Reload php-fpm
 
   - name: Modify the global php settings
-    ini_file: dest={{ phpfpm_base_dir }}/php.ini section={{ item.section | default('PHP') }} option={{ item.option }} value={{ item.value }} state={{ item.state | default('present') }}
+    ini_file:
+      dest: '{{ phpfpm_base_dir }}/php.ini'
+      section: '{{ item.section | default("PHP") }}'
+      option: '{{ item.option }}'
+      value: '{{ item.value }}'
+      state: '{{ item.state | default("present") }}'
     with_items: '{{ php_global_settings | default([]) }}'
     notify: Reload php-fpm
 
   - name: Modify the global php cli settings
-    ini_file: dest={{ phpfpm_cli_dir }}/php.ini section={{ item.section | default('PHP') }} option={{ item.option }} value={{ item.value }} state={{ item.state | default('present') }}
+    ini_file:
+      dest: '{{ phpfpm_cli_dir }}/php.ini'
+      section: "{{ item.section | default('PHP') }}"
+      option: '{{ item.option }} value={{ item.value }}'
+      state: "{{ item.state | default('present') }}"
     with_items: '{{ php_cli_global_settings | default([]) }}'
 
   - name: Activate the memcache sessions support and redundancy if required
@@ -54,7 +63,7 @@
 
   - name: Create the directories where to store the sessions files. One for each pool
     file: dest={{ phpfpm_session_prefix }}/{{ item.pool_name }} owner={{ item.user }} group=root mode=0750 state=directory
-    with_items: '{{ phpfpm_pools }}' 
+    with_items: '{{ phpfpm_pools }}'
     when:
       - phpfpm_session_prefix is defined
       - phpfpm_use_default_template