diff --git a/tasks/galera_install_apt.yml b/tasks/galera_install_apt.yml
index 4d65da77..cf92d112 100644
--- a/tasks/galera_install_apt.yml
+++ b/tasks/galera_install_apt.yml
@@ -64,10 +64,8 @@
     repo: "{{ galera_repo.repo }}"
     filename: "{{ galera_repo.filename | default(omit) }}"
     state: "{{ galera_repo.state }}"
-  register: add_repos
-  until: add_repos|success
-  retries: 5
-  delay: 2
+    update_cache: "no"
+  register: add_galera_repo
   tags:
     - galera-repos
 
@@ -76,10 +74,8 @@
     repo: "{{ galera_percona_xtrabackup_repo.repo }}"
     filename: "{{ galera_percona_xtrabackup_repo.filename | default(omit) }}"
     state: "{{ (use_percona_upstream | bool) | ternary('present','absent') }}"
-  register: add_repos
-  until: add_repos|success
-  retries: 5
-  delay: 2
+    update_cache: "no"
+  register: add_percona_repo
   tags:
     - percona-repos
 
@@ -105,7 +101,11 @@
     name: "{{ galera_install_packages_list | selectattr('enabled') | rejectattr('local_pkg') | sum(attribute='packages', start=[]) }}"
     state: "{{ galera_server_package_state }}"
     update_cache: yes
-    cache_valid_time: "{{ (add_repos | changed) | ternary('0', cache_timeout) }}"
+    cache_valid_time: "{{ (add_galera_repo | changed or add_percona_repo | changed) | ternary('0', cache_timeout) }}"
+  register: install_remote_apt_packages
+  until: install_remote_apt_packages|success
+  retries: 5
+  delay: 2
 
 - name: Install galera_server role local packages (apt)
   apt: