diff --git a/roles/postgresql-server/tasks/main.yml b/roles/postgresql-server/tasks/main.yml
index a4251fb..179dc48 100644
--- a/roles/postgresql-server/tasks/main.yml
+++ b/roles/postgresql-server/tasks/main.yml
@@ -4,18 +4,11 @@
     state=present
   tags:
   - install
+- name: ensure postgresql data directory exists
+  command:
+    postgresql-setup initdb
+    creates={{ pgdata_dir }}/PG_VERSION
 
-- name: ensure postgresql-setup unit is installed
-  template:
-    src=postgresql-setup.service.j2
-    dest=/etc/systemd/system/postgresql-setup.service
-    mode=0644
-  notify: reload systemd
-- meta: flush_handlers
-- name: ensure postgresql-setup has started
-  service:
-    name=postgresql-setup
-    state=started
 - name: ensure postgresql server certificate is installed
   copy:
     src: '{{ item }}'
diff --git a/roles/postgresql-server/templates/postgresql-setup.service.j2 b/roles/postgresql-server/templates/postgresql-setup.service.j2
deleted file mode 100644
index 7ceb640..0000000
--- a/roles/postgresql-server/templates/postgresql-setup.service.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Before=postgresql.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-Environment=PGDATA={{ pgdata_dir }}
-Environment=LANG={{ pg_locale }}
-User=postgres
-Group=postgres
-ExecStart=/bin/sh -c "[ -f ${PGDATA}/PG_VERSION ] || initdb -D ${PGDATA}"