diff --git a/postgresql/defaults/main.yml b/postgresql/defaults/main.yml
index 543f1707..6ee57747 100644
--- a/postgresql/defaults/main.yml
+++ b/postgresql/defaults/main.yml
@@ -9,4 +9,4 @@ postgresql_random_page_cost: 1.5
 postgresql_effective_cache_size: "{{ (ansible_memtotal_mb * 0.5) | int }}MB"
 
 # PostgreSQL version
-postgresql_version: '9.4'
+postgresql_version: '9.6'
diff --git a/postgresql/tasks/main.yml b/postgresql/tasks/main.yml
index b090b09d..3bc1f904 100644
--- a/postgresql/tasks/main.yml
+++ b/postgresql/tasks/main.yml
@@ -1,9 +1,10 @@
 ---
 
-- include: pgdg-repo.yml
-  when: postgresql_version != '9.4'
+- include: packages_jessie.yml
+  when: ansible_distribution_release == "jessie"
 
-- include: packages.yml
+- include: packages_stretch.yml
+  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - include: config.yml
 
diff --git a/postgresql/tasks/packages.yml b/postgresql/tasks/packages.yml
deleted file mode 100644
index cd4f3efa..00000000
--- a/postgresql/tasks/packages.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-
-- name: Install postgresql package
-  apt:
-    name: '{{item}}'
-  with_items:
-  - "postgresql-{{postgresql_version}}"
-  - ptop
diff --git a/postgresql/templates/postgresql.conf b/postgresql/templates/postgresql.conf
index eafadeb9..ebb6dde2 100644
--- a/postgresql/templates/postgresql.conf
+++ b/postgresql/templates/postgresql.conf
@@ -3,7 +3,7 @@ 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', '<') %}
+{% if postgresql_version | version_compare('9.5', '<') %}
 checkpoint_segments = 30
 {% else %}
 max_wal_size = 15GB