diff --git a/roles/mailarchiver_db/tasks/main.yml b/roles/mailarchiver_db/tasks/main.yml
index 537030b..4a8c89a 100644
--- a/roles/mailarchiver_db/tasks/main.yml
+++ b/roles/mailarchiver_db/tasks/main.yml
@@ -1,8 +1,7 @@
-- name: Ensure PostgreSQL service is running
-  service:
-    name: postgresql
-    state: started
-    enabled: yes
+- name: Wait for PostgreSQL socket
+  wait_for:
+    path: "/var/run/postgresql/{{ pg_version }}-{{ pg_cluster }}/.s.PGSQL.5432"
+    timeout: 60
 
 - name: Create db user
   become: true
@@ -10,6 +9,7 @@
   postgresql_user:
     name: mailuser
     password: "{{ mailuser_password }}"
+    login_host: "/var/run/postgresql/{{ pg_version }}-{{ pg_cluster }}/.s.PGSQL.5432"
 
 - name: Create database
   become: true
@@ -17,12 +17,15 @@
   postgresql_db:
     name: mailarchiver
     owner: mailuser
+    login_host: "/var/run/postgresql/{{ pg_version }}-{{ pg_cluster }}/.s.PGSQL.5432"
 
 - name: Grant schema rights
+  become: true
   become_user: postgres
   postgresql_query:
     db: mailarchiver
     query: |
       GRANT ALL ON SCHEMA public TO mailuser;
       ALTER DEFAULT PRIVILEGES IN SCHEMA public
-      GRANT ALL ON TABLES TO mailuser;
\ No newline at end of file
+      GRANT ALL ON TABLES TO mailuser;
+    login_host: "/var/run/postgresql/{{ pg_version }}-{{ pg_cluster }}/.s.PGSQL.5432"