diff --git a/pkg/cmd/issue/issue.go b/pkg/cmd/issue/issue.go
index b306b6830..eceea35c6 100644
--- a/pkg/cmd/issue/issue.go
+++ b/pkg/cmd/issue/issue.go
@@ -51,15 +51,15 @@ func NewCmdIssue(f *cmdutil.Factory) *cobra.Command {
 	cmdutil.AddGroup(cmd, "Targeted commands",
 		cmdView.NewCmdView(f, nil),
 		cmdComment.NewCmdComment(f, nil),
-		cmdEdit.NewCmdEdit(f, nil),
 		cmdClose.NewCmdClose(f, nil),
 		cmdReopen.NewCmdReopen(f, nil),
+		cmdEdit.NewCmdEdit(f, nil),
 		cmdDevelop.NewCmdDevelop(f, nil),
-		cmdTransfer.NewCmdTransfer(f, nil),
 		cmdLock.NewCmdLock(f, cmd.Name(), nil),
 		cmdLock.NewCmdUnlock(f, cmd.Name(), nil),
 		cmdPin.NewCmdPin(f, nil),
 		cmdUnpin.NewCmdUnpin(f, nil),
+		cmdTransfer.NewCmdTransfer(f, nil),
 		cmdDelete.NewCmdDelete(f, nil),
 	)
 
diff --git a/pkg/cmd/pr/pr.go b/pkg/cmd/pr/pr.go
index bdd004d15..401177755 100644
--- a/pkg/cmd/pr/pr.go
+++ b/pkg/cmd/pr/pr.go
@@ -44,22 +44,27 @@ func NewCmdPR(f *cmdutil.Factory) *cobra.Command {
 
 	cmdutil.EnableRepoOverride(cmd, f)
 
-	cmd.AddCommand(cmdCheckout.NewCmdCheckout(f, nil))
-	cmd.AddCommand(cmdClose.NewCmdClose(f, nil))
-	cmd.AddCommand(cmdCreate.NewCmdCreate(f, nil))
-	cmd.AddCommand(cmdDiff.NewCmdDiff(f, nil))
-	cmd.AddCommand(cmdList.NewCmdList(f, nil))
-	cmd.AddCommand(cmdLock.NewCmdLock(f, cmd.Name(), nil))
-	cmd.AddCommand(cmdMerge.NewCmdMerge(f, nil))
-	cmd.AddCommand(cmdReady.NewCmdReady(f, nil))
-	cmd.AddCommand(cmdReopen.NewCmdReopen(f, nil))
-	cmd.AddCommand(cmdReview.NewCmdReview(f, nil))
-	cmd.AddCommand(cmdStatus.NewCmdStatus(f, nil))
-	cmd.AddCommand(cmdLock.NewCmdUnlock(f, cmd.Name(), nil))
-	cmd.AddCommand(cmdView.NewCmdView(f, nil))
-	cmd.AddCommand(cmdChecks.NewCmdChecks(f, nil))
-	cmd.AddCommand(cmdComment.NewCmdComment(f, nil))
-	cmd.AddCommand(cmdEdit.NewCmdEdit(f, nil))
+	cmdutil.AddGroup(cmd, "General commands",
+		cmdList.NewCmdList(f, nil),
+		cmdCreate.NewCmdCreate(f, nil),
+		cmdStatus.NewCmdStatus(f, nil),
+	)
+
+	cmdutil.AddGroup(cmd, "Targeted commands",
+		cmdView.NewCmdView(f, nil),
+		cmdDiff.NewCmdDiff(f, nil),
+		cmdCheckout.NewCmdCheckout(f, nil),
+		cmdChecks.NewCmdChecks(f, nil),
+		cmdReview.NewCmdReview(f, nil),
+		cmdMerge.NewCmdMerge(f, nil),
+		cmdReady.NewCmdReady(f, nil),
+		cmdComment.NewCmdComment(f, nil),
+		cmdClose.NewCmdClose(f, nil),
+		cmdReopen.NewCmdReopen(f, nil),
+		cmdEdit.NewCmdEdit(f, nil),
+		cmdLock.NewCmdLock(f, cmd.Name(), nil),
+		cmdLock.NewCmdUnlock(f, cmd.Name(), nil),
+	)
 
 	return cmd
 }
diff --git a/pkg/cmd/release/release.go b/pkg/cmd/release/release.go
index 19916fcce..6805b09eb 100644
--- a/pkg/cmd/release/release.go
+++ b/pkg/cmd/release/release.go
@@ -22,14 +22,19 @@ func NewCmdRelease(f *cmdutil.Factory) *cobra.Command {
 
 	cmdutil.EnableRepoOverride(cmd, f)
 
-	cmd.AddCommand(cmdCreate.NewCmdCreate(f, nil))
-	cmd.AddCommand(cmdDelete.NewCmdDelete(f, nil))
-	cmd.AddCommand(cmdDeleteAsset.NewCmdDeleteAsset(f, nil))
-	cmd.AddCommand(cmdDownload.NewCmdDownload(f, nil))
-	cmd.AddCommand(cmdList.NewCmdList(f, nil))
-	cmd.AddCommand(cmdUpdate.NewCmdEdit(f, nil))
-	cmd.AddCommand(cmdView.NewCmdView(f, nil))
-	cmd.AddCommand(cmdUpload.NewCmdUpload(f, nil))
+	cmdutil.AddGroup(cmd, "General commands",
+		cmdList.NewCmdList(f, nil),
+		cmdCreate.NewCmdCreate(f, nil),
+	)
+
+	cmdutil.AddGroup(cmd, "Targeted commands",
+		cmdView.NewCmdView(f, nil),
+		cmdUpdate.NewCmdEdit(f, nil),
+		cmdUpload.NewCmdUpload(f, nil),
+		cmdDownload.NewCmdDownload(f, nil),
+		cmdDelete.NewCmdDelete(f, nil),
+		cmdDeleteAsset.NewCmdDeleteAsset(f, nil),
+	)
 
 	return cmd
 }
diff --git a/pkg/cmd/repo/repo.go b/pkg/cmd/repo/repo.go
index 7f3125cd1..888e7f83f 100644
--- a/pkg/cmd/repo/repo.go
+++ b/pkg/cmd/repo/repo.go
@@ -40,20 +40,25 @@ func NewCmdRepo(f *cmdutil.Factory) *cobra.Command {
 		GroupID: "core",
 	}
 
-	cmd.AddCommand(repoViewCmd.NewCmdView(f, nil))
-	cmd.AddCommand(repoForkCmd.NewCmdFork(f, nil))
-	cmd.AddCommand(repoCloneCmd.NewCmdClone(f, nil))
-	cmd.AddCommand(repoCreateCmd.NewCmdCreate(f, nil))
-	cmd.AddCommand(repoEditCmd.NewCmdEdit(f, nil))
-	cmd.AddCommand(repoListCmd.NewCmdList(f, nil))
-	cmd.AddCommand(repoSyncCmd.NewCmdSync(f, nil))
-	cmd.AddCommand(creditsCmd.NewCmdRepoCredits(f, nil))
-	cmd.AddCommand(gardenCmd.NewCmdGarden(f, nil))
-	cmd.AddCommand(deployKeyCmd.NewCmdDeployKey(f))
-	cmd.AddCommand(repoRenameCmd.NewCmdRename(f, nil))
-	cmd.AddCommand(repoDeleteCmd.NewCmdDelete(f, nil))
-	cmd.AddCommand(repoArchiveCmd.NewCmdArchive(f, nil))
-	cmd.AddCommand(repoDefaultCmd.NewCmdSetDefault(f, nil))
+	cmdutil.AddGroup(cmd, "General commands",
+		repoListCmd.NewCmdList(f, nil),
+		repoCreateCmd.NewCmdCreate(f, nil),
+	)
+
+	cmdutil.AddGroup(cmd, "Targeted commands",
+		repoViewCmd.NewCmdView(f, nil),
+		repoCloneCmd.NewCmdClone(f, nil),
+		repoForkCmd.NewCmdFork(f, nil),
+		repoDefaultCmd.NewCmdSetDefault(f, nil),
+		repoSyncCmd.NewCmdSync(f, nil),
+		repoEditCmd.NewCmdEdit(f, nil),
+		deployKeyCmd.NewCmdDeployKey(f),
+		repoRenameCmd.NewCmdRename(f, nil),
+		repoArchiveCmd.NewCmdArchive(f, nil),
+		repoDeleteCmd.NewCmdDelete(f, nil),
+		creditsCmd.NewCmdRepoCredits(f, nil),
+		gardenCmd.NewCmdGarden(f, nil),
+	)
 
 	return cmd
 }