diff --git a/postgresql/tasks/config.yml b/postgresql/tasks/config.yml
index dc3fc1b1..796e6bca 100644
--- a/postgresql/tasks/config.yml
+++ b/postgresql/tasks/config.yml
@@ -10,13 +10,13 @@
 
 - name: Allow conf.d/*.conf files to be included in PostgreSQL configuration
   lineinfile:
-    name: "/etc/postgresql/{{postgresql_version}}/main/postgresql.conf"
+    name: "/etc/postgresql/{{ postgresql_version }}/main/postgresql.conf"
     line: include_dir = 'conf.d'
   notify: restart postgresql
 
 - name: Create conf.d directory
   file:
-    name: "/etc/postgresql/{{postgresql_version}}/main/conf.d/"
+    name: "/etc/postgresql/{{ postgresql_version }}/main/conf.d/"
     state: directory
     owner: postgres
     group: postgres
@@ -25,7 +25,7 @@
 - name: Copy PostgreSQL config file
   template:
     src: postgresql.conf.j2
-    dest: "/etc/postgresql/{{postgresql_version}}/main/conf.d/zz-evolinux.conf"
+    dest: "/etc/postgresql/{{ postgresql_version }}/main/conf.d/zz-evolinux.conf"
     owner: postgres
     group: postgres
     mode: "0644"
diff --git a/postgresql/tasks/munin.yml b/postgresql/tasks/munin.yml
index e576b4cd..0b1ef152 100644
--- a/postgresql/tasks/munin.yml
+++ b/postgresql/tasks/munin.yml
@@ -12,8 +12,8 @@
 - name: Add Munin plugins for PostgreSQL
   file:
     state: link
-    src: '/usr/share/munin/plugins/{{item}}'
-    dest: '/etc/munin/plugins/{{item}}'
+    src: '/usr/share/munin/plugins/{{ item }}'
+    dest: '/etc/munin/plugins/{{ item }}'
   with_items:
   - postgres_bgwriter
   - postgres_checkpoints
@@ -26,10 +26,10 @@
 - name: Add Munin plugins for PostgreSQL (for specific databases)
   file:
     state: link
-    src: '/usr/share/munin/plugins/{{item[0]}}'
-    dest: '/etc/munin/plugins/{{item[0]}}{{item[1]}}'
+    src: '/usr/share/munin/plugins/{{ item[0] }}'
+    dest: '/etc/munin/plugins/{{ item[0] }}{{ item[1] }}'
   with_nested:
   - ['postgres_cache_', 'postgres_connections_', 'postgres_locks_', 'postgres_querylength_', 'postgres_scans_', 'postgres_size_', 'postgres_transactions_', 'postgres_tuples_']
-  - '{{postgresql_databases}}'
+  - '{{ postgresql_databases }}'
   notify: restart munin-node
   when: etc_munin_plugins.stat.exists and usr_share_munin_plugins.stat.exists
diff --git a/postgresql/tasks/nrpe.yml b/postgresql/tasks/nrpe.yml
index 8ce178e9..b9472b66 100644
--- a/postgresql/tasks/nrpe.yml
+++ b/postgresql/tasks/nrpe.yml
@@ -35,7 +35,7 @@
     lineinfile:
       name: /etc/nagios/nrpe.d/evolix.cfg
       regexp: '^command\[check_pgsql\]='
-      line: 'command[check_pgsql]=/usr/lib/nagios/plugins/check_pgsql -H localhost -l nrpe -p "{{postgresql_nrpe_password.stdout}}"'
+      line: 'command[check_pgsql]=/usr/lib/nagios/plugins/check_pgsql -H localhost -l nrpe -p "{{ postgresql_nrpe_password.stdout }}"'
     notify: restart nagios-nrpe-server
     when: postgresql_create_nrpe_user.changed
   when: nrpe_evolix_config.stat.exists
diff --git a/postgresql/tasks/packages_jessie.yml b/postgresql/tasks/packages_jessie.yml
index 3e21bc0e..a3142306 100644
--- a/postgresql/tasks/packages_jessie.yml
+++ b/postgresql/tasks/packages_jessie.yml
@@ -10,8 +10,8 @@
 
 - name: Install postgresql package
   apt:
-    name: '{{item}}'
+    name: '{{ item }}'
   with_items:
-  - "postgresql-{{postgresql_version}}"
+  - "postgresql-{{ postgresql_version }}"
   - ptop
   - libdbd-pg-perl
diff --git a/postgresql/tasks/pgdg-repo.yml b/postgresql/tasks/pgdg-repo.yml
index 8d937b82..bdabfed8 100644
--- a/postgresql/tasks/pgdg-repo.yml
+++ b/postgresql/tasks/pgdg-repo.yml
@@ -10,7 +10,7 @@
 
 - name: Add PGDG repository
   apt_repository:
-    repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_distribution_release}}-pgdg main"
+    repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main"
     update_cache: yes
 
 - name: Add GPG key for PGDG repository
diff --git a/postgresql/tasks/postgis.yml b/postgresql/tasks/postgis.yml
index 0c18cb51..f2300943 100644
--- a/postgresql/tasks/postgis.yml
+++ b/postgresql/tasks/postgis.yml
@@ -1,5 +1,5 @@
 ---
-- name: Install PostGIS extention 
+- name: Install PostGIS extention
   apt:
     name:
       - postgis