diff --git a/handlers/main.yml b/handlers/main.yml
index 9beebd5..0a15eae 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,26 +1,34 @@
 ---
 - name: Restart postgresql
-  service: name=postgresql state=restarted
+  ansible.builtin.service:
+    name: postgresql
+    state: restarted
   when: ansible_distribution_file_variety == "Debian"
-
 - name: Reload postgresql
-  service: name=postgresql state=reloaded
+  ansible.builtin.service:
+    name: postgresql
+    state: reloaded
   when: ansible_distribution_file_variety == "Debian"
-
 - name: Restart postgresql with pgpool config
-  service: name=postgresql state=restarted
+  ansible.builtin.service:
+    name: postgresql
+    state: restarted
   when:
     - ansible_distribution_file_variety == "Debian"
     - psql_restart_after_wal_enabling
-
 - name: Flush the APT cache
   ansible.builtin.apt:
     update_cache: true
-
 - name: Restart postgresql
-  service: name='postgresql-{{ psql_version }}' state=restarted
+  ansible.builtin.service:
+    name: 'postgresql-{{ psql_version }}'
+    state: restarted
   when: ansible_distribution_file_variety == "RedHat"
-
 - name: Reload postgresql
-  service: name='postgresql-{{ psql_version }}' state=reloaded
+  ansible.builtin.service:
+    name: 'postgresql-{{ psql_version }}'
+    state: reloaded
   when: ansible_distribution_file_variety == "RedHat"
+- name: Reload systemd
+  ansible.builtin.systemd:
+    daemon_reload: true
diff --git a/tasks/postgresql-packages.yml b/tasks/postgresql-packages.yml
index 3ec768a..b1fa6b0 100644
--- a/tasks/postgresql-packages.yml
+++ b/tasks/postgresql-packages.yml
@@ -65,6 +65,9 @@
         group: root
         mode: "644"
       when: psql_use_alternate_data_dir
+      notify: Reload systemd
+    - name: postgresql-packages | Postgresql install flush handlers
+      ansible.builtin.meta: flush_handlers
 
     - name: postgresql-packages | Init the db if needed on EL systems
       ansible.builtin.command: /usr/pgsql-{{ psql_version }}/bin/postgresql-{{ psql_version }}-setup initdb