diff --git a/qubes-anaconda-addon/firstboot-qubes-text b/qubes-anaconda-addon/firstboot-qubes-text
index 7194085..7bae1f3 100755
--- a/qubes-anaconda-addon/firstboot-qubes-text
+++ b/qubes-anaconda-addon/firstboot-qubes-text
@@ -91,7 +91,7 @@ done
 
 set -e
 
-for service in rdisc kdump libvirt-guests; do
+for service in rdisc kdump libvirt-guests salt-minion; do
     systemctl disable ${service}.service || :
     systemctl stop    ${service}.service || :
 done
@@ -114,7 +114,7 @@ if [ "$vms_service" == "yes" -o "$vms_app" == "yes" ]; then
         mv /var/log/salt/minion /var/log/salt/minion.install || :
     fi
 
-    qubesctl state.sls config -l quiet --out quiet
+    qubesctl saltutil.sync_all -l quiet --out quiet
 fi
 
 states=()
@@ -130,7 +130,7 @@ fi
 if [ "$vms_service" == "yes" -o "$vms_app" == "yes" ]; then
     for state in "${states[@]}"; do
         echo "-> Requesting creation of VM: ${state#qvm.}"
-        qubesctl top.enable "${state}" saltenv=dom0 -l quiet --out quiet
+        qubesctl top.enable "${state}" -l quiet --out quiet
     done
 
     echo "-> Creating VMs"
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 4fd61b4..bbeb55e 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
@@ -484,7 +484,7 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
     def configure_dom0(self):
         self.set_stage("Setting up administration VM (dom0)")
 
-        for service in [ 'rdisc', 'kdump', 'libvirt-guests' ]:
+        for service in [ 'rdisc', 'kdump', 'libvirt-guests', 'salt-minion' ]:
             self.run_command(['systemctl', 'disable', '{}.service'.format(service) ], ignore_failure=True)
             self.run_command(['systemctl', 'stop',    '{}.service'.format(service) ], ignore_failure=True)
 
@@ -498,11 +498,11 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
             pass
 
         # Refresh minion configuration to make sure all installed formulas are included
-        self.run_command(['qubesctl', 'state.sls', 'config', '-l', 'quiet', '--out', 'quiet'])
+        self.run_command(['qubesctl', 'saltutil.sync_all'])
 
         for state in QubesChoice.get_states():
             print("Setting up state: {}".format(state))
-            self.run_command(['qubesctl', 'top.enable', state, 'saltenv=dom0', '-l', 'quiet', '--out', 'quiet'])
+            self.run_command(['qubesctl', 'top.enable', state])
 
         try:
             self.run_command(['qubesctl', 'state.highstate'])