diff --git a/handlers/main.yml b/handlers/main.yml
index 4f927bc..ea31ffd 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -10,3 +10,9 @@
     - skip_ansible_later
   become: True
   become_user: root
+
+- name: Clean metadata cache
+  command: dnf clean metadata
+  listen: __packages_clean_metadata
+  become: True
+  become_user: root
diff --git a/tasks/repository.yml b/tasks/repository.yml
index f1dcb8c..78066dc 100644
--- a/tasks/repository.yml
+++ b/tasks/repository.yml
@@ -7,6 +7,7 @@
       loop: "{{ packages_repofiles_remove }}"
       loop_control:
         label: "/etc/yum.repos.d/{{ item }}"
+      notify: __packages_clean_metadata
 
     - name: Add common repositories
       yum_repository:
@@ -22,7 +23,9 @@
       loop: "{{ packages_yum_repositories + packages_yum_repositories_extra }}"
       loop_control:
         label: "{{ item.name }}"
-      notify: __packages_upgrade
+      notify:
+        - __packages_upgrade
+        - __packages_clean_metadata
 
     - name: Uninstall packages
       package: