diff --git a/justfile b/justfile
index 318e88d..16c0c22 100644
--- a/justfile
+++ b/justfile
@@ -10,14 +10,12 @@ test hostname=(HOSTNAME):
 switch hostname=(HOSTNAME):
   @nixfmt . &> nixos-switch.log || ( cat nixos-switch.log && false )
   @rm -f nixos-switch.log
-  @colmena --impure exec --on {{hostname}} "locate home-manager-backup | sort -u | xargs rm -f"
   @colmena --impure apply --on {{hostname}}
 
 # Apply config on hostname at next reboot
 boot:
   @nixfmt . &> nixos-switch.log || ( cat nixos-switch.log && false )
   @rm -f nixos-switch.log
-  @colmena --impure exec --on {{HOSTNAME}} "locate home-manager-backup | sort -u | xargs rm -f"
   @doas nixos-rebuild switch --impure --flake .#{{HOSTNAME}}
 
 # Build and install the world!
@@ -80,6 +78,7 @@ update:
 # Clean up
 clean hostname=(HOSTNAME):
   @echo "Cleaning old entries and store"
+  @colmena --impure exec --on {{hostname}} "locate home-manager-backup | sort -u | xargs rm -f"
   @# @ssh {{hostname}} 'home-manager expire-generations "-5 days"'
   @colmena --impure exec --on {{hostname}} 'home-manager expire-generations "-5 days"'
   @echo "Garbage Collection"
@@ -90,6 +89,7 @@ clean hostname=(HOSTNAME):
 # Clean up the world
 clean-world:
   @echo "Cleaning old entries and store"
+  @colmena --impure exec "locate home-manager-backup | sort -u | xargs rm -f"
   @colmena --impure exec 'home-manager expire-generations "-5 days"'
   @echo "Garbage Collection"
   @colmena --impure exec 'nix-collect-garbage --quiet --log-format bar --no-build-output --delete-old'