diff --git a/Makefile b/Makefile
index cab100d..798fcb8 100644
--- a/Makefile
+++ b/Makefile
@@ -83,9 +83,10 @@ install:
 
 .PHONY: apply
 apply:
-	run0 install -D -oroot -groot -m0644 conf/z_user.conf /etc/salt/minion.d/z_user.conf
-	run0 install -D -oroot -groot -m0644 conf/overrides.conf /usr/local/etc/salt/minion.d/overrides.conf
+	install -D -oroot -groot -m0644 conf/z_user.conf /etc/salt/minion.d/z_user.conf
+	install -D -oroot -groot -m0644 conf/overrides.conf /usr/local/etc/salt/minion.d/overrides.conf
 	
-	run0 qubesctl top.enable --show-output --force-color $(APPLY_ARGS)
-	run0 qubesctl --show-output --force-color --targets $(APPLY_ARGS) state.apply -l debug
-
+	qubesctl top.enable topd
+	qubesctl top.enable $(APPLY_ARGS)
+	qubesctl --show-output --force-color --targets templates state.apply $(APPLY_ARGS)
+	qubesctl top.disable $(APPLY_ARGS)