diff --git a/tasks/postgres.yml b/tasks/postgres.yml
index cbfe4c0..5ef6dce 100644
--- a/tasks/postgres.yml
+++ b/tasks/postgres.yml
@@ -1,6 +1,6 @@
 ---
 - name: "add postgres repository"
-  apt_repository: repo="deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main"
+  apt_repository: repo="deb http://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main"
 
 
 - name: "add postgres repository key"
@@ -10,7 +10,7 @@
 - name: "install postgres & libpq-dev"
   apt: name="{{ item }}" update_cache=yes state=present
   with_items:
-    - postgresql-9.4
+    - postgresql-{{ '9.4' if ansible_distribution_release == 'trusty' else '9.5' }}
     - libpq-dev