diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml
index edeab12..6e30c41 100644
--- a/postgres/codenamemap.yaml
+++ b/postgres/codenamemap.yaml
@@ -2,29 +2,46 @@ precise:
   version: 9.4
   pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main
   conf_dir: /etc/postgresql/9.4/main
+  data_dir: /var/lib/postgresql/9.4/main
   pkg_dev: postgresql-server-dev-9.4
 wheezy:
   pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main
   conf_dir: /etc/postgresql/9.1/main
+  data_dir: /var/lib/postgresql/9.1/main
   pkg_dev: postgresql-server-dev-9.1
 jessie:
   version: 9.4
   pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main
   conf_dir: /etc/postgresql/9.4/main
+  data_dir: /var/lib/postgresql/9.4/main
   pkg_dev: postgresql-server-dev-9.4
 trusty:
   version: 9.3
   pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main
   conf_dir: /etc/postgresql/9.3/main
+  data_dir: /var/lib/postgresql/9.3/main
+  pkg_dev: postgresql-server-dev-9.3
 utopic:
   version: 9.4
   pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main
   conf_dir: /etc/postgresql/9.4/main
+  data_dir: /var/lib/postgresql/9.4/main
+  pkg_dev: postgresql-server-dev-9.4
 vivid:
   version: 9.4
   pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main
   conf_dir: /etc/postgresql/9.4/main
+  data_dir: /var/lib/postgresql/9.4/main
+  pkg_dev: postgresql-server-dev-9.4
+wily:
+  version: 9.4
+  pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wily-pgdg main
+  conf_dir: /etc/postgresql/9.4/main
+  data_dir: /var/lib/postgresql/9.4/main
+  pkg_dev: postgresql-server-dev-9.4
 xenial:
   version: 9.5
   pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main
   conf_dir: /etc/postgresql/9.5/main
+  data_dir: /var/lib/postgresql/9.5/main
+  pkg_dev: postgresql-server-dev-9.5
diff --git a/postgres/init.sls b/postgres/init.sls
index 2dfe606..b0d1347 100644
--- a/postgres/init.sls
+++ b/postgres/init.sls
@@ -32,17 +32,30 @@ postgresql-cluster-prepared:
 {% if postgres.create_cluster != False %}
     - user: root
     - name: pg_createcluster {{ postgres.version }} main
+{% else %}
+    - name: test -f {{ postgres.conf_dir }}/environment
+{% endif %}
     - unless:
       - test -f {{ postgres.conf_dir }}/environment
-{% endif %}
+    - require:
+      - pkg: postgresql-installed
+    - env:
+      LC_ALL: C.UTF-8
+
+postgresql-db-prepared:
+  cmd.run:
 {% if postgres.init_db != False %}
     - user: {{ postgres.initdb_user }}
     - name: {{ postgres.commands.initdb }} {{ postgres.initdb_args }} -D {{ postgres.data_dir }}
+
+{% else %}
+    - name: test -f {{ postgres.data_dir }}/PG_VERSION
+{% endif %}
     - unless:
       - test -f {{ postgres.data_dir }}/PG_VERSION
-{% endif %}
     - require:
       - pkg: postgresql-installed
+      - cmd: postgresql-cluster-prepared
     - env:
       LC_ALL: C.UTF-8
 
@@ -54,6 +67,7 @@ postgresql-running:
     - reload: true
     - require:
       - cmd: postgresql-cluster-prepared
+      - cmd: postgresql-db-prepared
 
 {% if postgres.pkgs_extra %}
 postgresql-extra-pkgs-installed: