diff --git a/postgresql/tasks/packages.yml b/postgresql/tasks/packages.yml
index 12f543c9..cd4f3efa 100644
--- a/postgresql/tasks/packages.yml
+++ b/postgresql/tasks/packages.yml
@@ -3,4 +3,6 @@
 - name: Install postgresql package
   apt:
     name: '{{item}}'
-  with_items: ['postgresql-{{postgresql_version}}', 'ptop']
+  with_items:
+  - "postgresql-{{postgresql_version}}"
+  - ptop
diff --git a/postgresql/templates/postgresql.conf b/postgresql/templates/postgresql.conf
index 5ef87e87..eafadeb9 100644
--- a/postgresql/templates/postgresql.conf
+++ b/postgresql/templates/postgresql.conf
@@ -1,22 +1,22 @@
 # Tuning
-shared_buffers = {{postgresql_shared_buffers}}
-work_mem = {{postgresql_work_mem}}
+shared_buffers = {{ postgresql_shared_buffers }}
+work_mem = {{ postgresql_work_mem }}
 #shared_preload_libraries = 'pg_stat_statements'
 #synchronous_commit = off
 {% if postgresql_version |version_compare('9.5', '<') %}
-checkpoint_segments = 30                
+checkpoint_segments = 30
 {% else %}
 max_wal_size = 15GB
 {% endif %}
 
 checkpoint_completion_target = 0.9
-random_page_cost = {{postgresql_random_page_cost}}
-effective_cache_size = {{postgresql_effective_cache_size}}
+random_page_cost = {{ postgresql_random_page_cost }}
+effective_cache_size = {{ postgresql_effective_cache_size }}
 
 # Loging
 log_min_duration_statement = 1s
 log_checkpoints = on
-log_lock_waits = on                     
+log_lock_waits = on
 log_temp_files = 5MB
 log_autovacuum_min_duration = 1s