diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml
index 6e30c41..8cb1b2d 100644
--- a/postgres/codenamemap.yaml
+++ b/postgres/codenamemap.yaml
@@ -3,45 +3,37 @@ precise:
   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/defaults.yaml b/postgres/defaults.yaml
index 703a38e..7dd6013 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -8,8 +8,6 @@ postgres:
   service: postgresql
   conf_dir: /var/lib/pgsql/data
   data_dir: /var/lib/pgsql/data
-  create_cluster: False
-  init_db: False
   version: 9.1
   use_upstream_repo: False
   users: {}
@@ -19,9 +17,10 @@ postgres:
   postgresconf_backup: True
   postgresconf: ""
   pg_hba.conf: salt://postgres/pg_hba.conf
-  commands:
-    initdb: service postgresql initdb
+  initdb: True
   initdb_user: root
   initdb_args: --data-checksum
+  commands:
+    initdb: service postgresql initdb
   user: postgres
   group: postgres
diff --git a/postgres/init.sls b/postgres/init.sls
index b0d1347..6166576 100644
--- a/postgres/init.sls
+++ b/postgres/init.sls
@@ -28,34 +28,18 @@ postgresql-installed:
 # make sure the data directory and contents have been initialized
 postgresql-cluster-prepared:
   cmd.run:
-    - cwd: /
-{% 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
-    - require:
-      - pkg: postgresql-installed
-    - env:
-      LC_ALL: C.UTF-8
-
-postgresql-db-prepared:
-  cmd.run:
-{% if postgres.init_db != False %}
-    - user: {{ postgres.initdb_user }}
+    {% if postgres.initdb %}
     - name: {{ postgres.commands.initdb }} {{ postgres.initdb_args }} -D {{ postgres.data_dir }}
-
-{% else %}
-    - name: test -f {{ postgres.data_dir }}/PG_VERSION
-{% endif %}
+    {% elif grains.os_family == 'Debian' %}
+    - name: pg_createcluster {{ postgres.version }} main
+    {# else: TODO #}
+    {% endif %}
+    - cwd: /
+    - user: {{ postgres.initdb_user }}
     - unless:
       - test -f {{ postgres.data_dir }}/PG_VERSION
     - require:
       - pkg: postgresql-installed
-      - cmd: postgresql-cluster-prepared
     - env:
       LC_ALL: C.UTF-8
 
@@ -67,7 +51,6 @@ postgresql-running:
     - reload: true
     - require:
       - cmd: postgresql-cluster-prepared
-      - cmd: postgresql-db-prepared
 
 {% if postgres.pkgs_extra %}
 postgresql-extra-pkgs-installed:
diff --git a/postgres/osmap.yaml b/postgres/osmap.yaml
index 4ffbc62..72d4981 100644
--- a/postgres/osmap.yaml
+++ b/postgres/osmap.yaml
@@ -1,8 +1,7 @@
 RedHat:
-  init_db: True
+  initdb_user: postgres
   commands:
     initdb: initdb
-  initdb_user: postgres
   pkg: postgresql-server
   pkg_client: postgresql
   pkg_repo: pgdg94
@@ -10,20 +9,21 @@ RedHat:
 Arch:
   conf_dir: /var/lib/postgres/data
   data_dir: /var/lib/postgres/data
-  init_db: True
   initdb_user: postgres
+  initdb_args: --locale en_US.UTF8 -E UTF8
   commands:
-    initdb: initdb --locale en_US.UTF8 -E UTF8 -D "/var/lib/postgres/data"
+    initdb: initdb
   pkg_client: postgresql
   pkg_dev: postgresql
 Debian:
   pkg_repo_file: /etc/apt/sources.list.d/pgdg.list
+  pkg_dev: postgresql-server-dev-all
   pkg_libpq_dev: libpq-dev
+  initdb: False
 Suse:
-  init_db: True
+  initdb_user: postgres
   commands:
     initdb: initdb
-  initdb_user: postgres
   pkg: postgresql-server
   pkg_client: postgresql
 FreeBSD: