diff --git a/defaults/main.yaml b/defaults/main.yaml
index 5a838ee..658e2cf 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -1,7 +1,7 @@
 pgbouncer_conf_dir: "/etc/pgbouncer"
 pgbouncer_conf_name: "pgbouncer.ini"
 pgbouncer_log_dir: "/var/log/pgbouncer"
-pgbouncer_pid_dir: "/var/run/pgbouncer"
+pgbouncer_pid_dir: "/var/run"
 pgbouncer_pid_name: "pgbouncer.pid"
 pgbouncer_log_name: "pgbouncer.log"
 pgbouncer_listen_port: 6432
diff --git a/tasks/main.yaml b/tasks/main.yaml
index c0fefe3..1d92ac2 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -118,7 +118,6 @@
   loop:
     - "{{ pgbouncer_conf_dir }}"
     - "{{ pgbouncer_log_dir }}"
-    - "{{ pgbouncer_pid_dir }}"
 
 - name: Ping PostgreSQL server
   community.postgresql.postgresql_ping:
@@ -160,15 +159,3 @@
     masked: no
   register: pgbouncer_enable_and_start
   tags: pgbouncer, pgbouncer_start
-
-- name: Ensure user and group applied to all files and dirs one more time
-  file: 
-    path: "{{ item }}"
-    owner: "{{ pgbouncer_systemd_user }}"
-    group: "{{ pgbouncer_systemd_group }}"
-    recurse: yes
-    state: directory
-  loop:
-    - "{{ pgbouncer_conf_dir }}"
-    - "{{ pgbouncer_log_dir }}"
-    - "{{ pgbouncer_pid_dir }}"