diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml
index 7574c2fc9..e1b3a1ccc 100644
--- a/roles/postgresql/tasks/main.yml
+++ b/roles/postgresql/tasks/main.yml
@@ -44,12 +44,7 @@
 - name: Initialize the postgres db
   command:  su - postgres -c "/usr/lib/postgresql/{{ postgresql_version }}/bin/initdb -E 'UTF-8' --locale={{ postgresql_locale }}  -D /library/pgsql-iiab"
             creates=/library/pgsql-iiab/pg_hba.conf
-  when: is_debian
-
-- name: Initialize the postgres db
-  command:  su - postgres -c "/usr/lib/postgresql/9.5/bin/initdb -E 'UTF-8' --locale={{ postgresql_locale }}  -D /library/pgsql-iiab"
-            creates=/library/pgsql-iiab/pg_hba.conf
-  when: is_ubuntu
+  when: is_debuntu
 
 - name: Initialize the postgres db
   command:  su - postgres -c "/usr/bin/initdb -E 'UTF-8' --lc-collate={{ postgresql_locale }} --lc-ctype={{ postgresql_locale }}  -D /library/pgsql-iiab"
@@ -80,8 +75,8 @@
            enabled=yes
   when: postgresql_enabled
 
-- name: Stop and disable postgresql service if not postgresql_enabled
-  service: name=postgresql
+- name: Stop and disable postgresql-iiab service if not postgresql_enabled
+  service: name=postgresql-iiab
            state=stopped
            enabled=no
   when: not postgresql_enabled
diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact
index 54863bcd7..490fa2608 100755
--- a/scripts/local_facts.fact
+++ b/scripts/local_facts.fact
@@ -12,6 +12,7 @@ case $OS_VER in
 "debian-8"  | \
 "debian-9"  | \
 "ubuntu-16" | \
+"ubuntu-17" | \
 "centos-7"  | \
 "raspbian-8"| \
 "raspbian-9")
diff --git a/vars/ubuntu-17.yml b/vars/ubuntu-17.yml
new file mode 100644
index 000000000..73e4405b6
--- /dev/null
+++ b/vars/ubuntu-17.yml
@@ -0,0 +1,22 @@
+is_debuntu: True
+is_ubuntu: True
+dns_service: bind9
+dns_user: bind
+dhcp_service: isc-dhcp-server
+proxy: squid
+proxy_user: proxy
+apache_service: apache2
+apache_user: www-data
+apache_config_dir: apache2/sites-available
+apache_log_dir: /var/log/apache2
+smb_service: smbd
+nmb_service: nmbd
+systemctl_program: /bin/systemctl
+mysql_service: mysql
+apache_log: /var/log/apache2/access.log
+# cups lp module not available in raspbian, causes systemd-modueles-load to fail
+# which in turn cause netfilter-persistent to fail, which is essential
+sshd_service: ssh
+php_version: 7.0
+postgresql_version: 9.6
+systemd_location: /lib/systemd/system