diff --git a/defaults/main.yml b/defaults/main.yml
index f000fee..28302c5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -38,7 +38,7 @@ postgresql_pkgs:
 
 psql_el_install_scl_version: false
 psql_el_install_from_pgdg_repo: true
-psql_el_pgdg_repo_url: "https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
+psql_el_pgdg_repo_url: "https://download.postgresql.org/pub/repos/yum/reporpms/EL-{{ ansible_distribution_major_version }}-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
 psql_scl_base_dir: '/var/opt/rh/rh-postgresql{{ psql_version }}/lib/pgsql'
 psql_el_base_dir: '/var/lib/pgsql/{{ psql_version }}'
 psql_el_data_dir: '{{ psql_el_base_dir }}/data'
diff --git a/handlers/main.yml b/handlers/main.yml
index 546b220..9beebd5 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -13,6 +13,10 @@
     - 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
   when: ansible_distribution_file_variety == "RedHat"
diff --git a/tasks/postgresql_org_repo.yml b/tasks/postgresql_org_repo.yml
index bde0107..17bdd65 100644
--- a/tasks/postgresql_org_repo.yml
+++ b/tasks/postgresql_org_repo.yml
@@ -30,11 +30,9 @@
         signed_by: "{{ postgresql_deb_repo_key }}"
         state: present
         enabled: true
-      register: postgresql_org_repo
-    - name: postgresql_org_repo | Update the apt cache
-      ansible.builtin.apt:
-        update_cache: yes
-      when: postgresql_org_repo is changed
+      notify: Flush the APT cache
+    - name: postgresql_org_repo | Postgresql repo flush handlers
+      ansible.builtin.meta: flush_handlers
 
 - name: postgresql_org_repo | Manage the EL repository
   when: