diff --git a/unshackle/core/commands.py b/unshackle/core/commands.py
index 0ea9b51..24bb7d2 100644
--- a/unshackle/core/commands.py
+++ b/unshackle/core/commands.py
@@ -59,7 +59,7 @@ def check_load_errors() -> None:
         raise click.ClickException(f"Failed to load {len(LOAD_ERRORS)} command(s):\n{joined}")
 
 
-class Commands(click.MultiCommand):
+class Commands(click.Group):
     """Lazy-loaded command group of project commands."""
 
     def list_commands(self, ctx: click.Context) -> list[str]:
diff --git a/unshackle/core/services.py b/unshackle/core/services.py
index 58afe82..7713eca 100644
--- a/unshackle/core/services.py
+++ b/unshackle/core/services.py
@@ -76,7 +76,7 @@ def check_load_errors() -> None:
         raise click.ClickException(f"Failed to load {len(LOAD_ERRORS)} service(s):\n{joined}")
 
 
-class Services(click.MultiCommand):
+class Services(click.Group):
     """Lazy-loaded command group of project services."""
 
     _remote_services_cache: list[dict] | None = None