diff --git a/Justfile b/Justfile
index 3447457..9a765eb 100644
--- a/Justfile
+++ b/Justfile
@@ -1,29 +1,31 @@
-default:
+[default]
+_default:
     @just --list
 
-all:
-	@echo "No command provided"
-
-home:
-	echo "HOME is: '${HOME}'"
-
+[group("utils")]
 machine:
 	@echo "${HOSTNAME}"
 
+[group("maintenance")]
 switch:
 	nh os switch -a -H "${HOSTNAME}" . 
 
+[group("setup")]
 new-machine:
 	sudo nixos-rebuild switch --flake .#${HOSTNAME}
 
+[group("maintenance")]
 test:
 	nh os test -a -H "${HOSTNAME}" .
 
+[group("maintenance")]
 update:
 	sudo nix flake update
 
+[group("maintenance")]
 upgrade: update switch
 
+[group("maintenance")]
 clean:
 	sudo nix-collect-garbage -d
 	sudo nix-store --optimise