diff --git a/defaults/main.yml b/defaults/main.yml
index 07a2164..fe376ed 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,14 +7,11 @@ php_extra_packages: []
 
 # php.ini config
 php_ini:
-  - key: 'date.timezone'
-    value: 'Europe/Paris'
-  - key: 'expose_php'
-    value: 'Off'
-  - key: 'memory_limit'
-    value: '256M'
-php_ini_fpm: []
-php_ini_cli: []
+  'date.timezone': 'Europe/Paris'
+  'expose_php': 'Off'
+  'memory_limit': '256M'
+php_ini_fpm: {}
+php_ini_cli: {}
 
 # OpCache settings
 php_opcache_enable: "1"
diff --git a/tasks/fpm.yml b/tasks/fpm.yml
index 05b347c..4d818b5 100644
--- a/tasks/fpm.yml
+++ b/tasks/fpm.yml
@@ -4,13 +4,11 @@
   apt: pkg={{ php_fpm_service }} state=present
 
 - name: LINEINFILE | PHP configuration
-  lineinfile: >
-    dest='{{ php_etc_dir }}/fpm/php.ini'
-    regexp='^;?{{ item.key }}'
-    line='{{ item.key }} = {{ item.value }}'
-  with_flattened:
-    - "{{ php_ini }}"
-    - "{{ php_ini_fpm }}"
+  lineinfile:
+    dest: '{{ php_etc_dir }}/fpm/php.ini'
+    regexp: '^;?{{ item.key }}'
+    line: '{{ item.key }} = {{ item.value }}'
+  with_dict: "{{ php_ini | combine(php_ini_fpm) }}"
   notify: restart php-fpm
 
 - name: TEMPLATE | Deploy pool configuration
diff --git a/tasks/main.yml b/tasks/main.yml
index e62b8b0..49555e5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -26,13 +26,11 @@
   when: php_install_fpm
 
 - name: LINEINFILE | PHP configuration
-  lineinfile: >
-    dest='{{ php_etc_dir }}/cli/php.ini'
-    regexp='^;?{{ item.key }}'
-    line='{{ item.key }} = {{ item.value }}'
-  with_flattened:
-    - "{{ php_ini }}"
-    - "{{ php_ini_cli }}"
+  lineinfile:
+    dest: '{{ php_etc_dir }}/cli/php.ini'
+    regexp: '^;?{{ item.key }}'
+    line: '{{ item.key }} = {{ item.value }}'
+  with_dict: "{{ php_ini_cli }}"
 
 - name: INCLUDE | Xdebug
   include: xdebug.yml
diff --git a/tests/test.yml b/tests/test.yml
index 4c87560..cce5a5f 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -6,6 +6,10 @@
     php_extra_packages:
       - '{{ php_apt_prefix }}recode'
     php_install_xdebug: true
+    php_ini_fpm:
+      display_errors: 'Off'
+    php_ini_cli:
+      error_reporting: 'E_ALL'
 
   pre_tasks: