diff --git a/qubes-anaconda-addon/firstboot-qubes-text b/qubes-anaconda-addon/firstboot-qubes-text
index 7bae1f3..3b3a919 100755
--- a/qubes-anaconda-addon/firstboot-qubes-text
+++ b/qubes-anaconda-addon/firstboot-qubes-text
@@ -114,6 +114,7 @@ if [ "$vms_service" == "yes" -o "$vms_app" == "yes" ]; then
         mv /var/log/salt/minion /var/log/salt/minion.install || :
     fi
 
+    qubesctl saltutil.clear_cache -l quiet --out quiet
     qubesctl saltutil.sync_all -l quiet --out quiet
 fi
 
diff --git a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
index 7372b3b..1f2ee7b 100644
--- a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
+++ b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
@@ -499,6 +499,7 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
             pass
 
         # Refresh minion configuration to make sure all installed formulas are included
+        self.run_command(['qubesctl', 'saltutil.clear_cache'])
         self.run_command(['qubesctl', 'saltutil.sync_all'])
 
         for state in QubesChoice.get_states():