diff --git a/cmd/arduino-app-cli/config/config.go b/cmd/arduino-app-cli/config/config.go
index 635ad2bd..f6367fd3 100644
--- a/cmd/arduino-app-cli/config/config.go
+++ b/cmd/arduino-app-cli/config/config.go
@@ -29,7 +29,7 @@ import (
 func NewConfigCmd(cfg config.Configuration) *cobra.Command {
 	appCmd := &cobra.Command{
 		Use:   "config",
-		Short: "Manage arduino-app-cli config",
+		Short: "Manage Arduino App CLI config",
 	}
 
 	appCmd.AddCommand(newConfigGetCmd(cfg))
diff --git a/cmd/arduino-app-cli/daemon/daemon.go b/cmd/arduino-app-cli/daemon/daemon.go
index f96a4e0c..eeac105c 100644
--- a/cmd/arduino-app-cli/daemon/daemon.go
+++ b/cmd/arduino-app-cli/daemon/daemon.go
@@ -38,7 +38,7 @@ import (
 func NewDaemonCmd(cfg config.Configuration, version string) *cobra.Command {
 	daemonCmd := &cobra.Command{
 		Use:   "daemon",
-		Short: "Run an HTTP server to expose arduino-app-cli functionality through REST API",
+		Short: "Run the Arduino App CLI as an HTTP daemon",
 		Run: func(cmd *cobra.Command, args []string) {
 			daemonPort, _ := cmd.Flags().GetString("port")
 
diff --git a/cmd/arduino-app-cli/main.go b/cmd/arduino-app-cli/main.go
index e859aae2..c9dfddca 100644
--- a/cmd/arduino-app-cli/main.go
+++ b/cmd/arduino-app-cli/main.go
@@ -48,7 +48,7 @@ func run(configuration cfg.Configuration) error {
 	defer func() { _ = servicelocator.CloseDockerClient() }()
 	rootCmd := &cobra.Command{
 		Use:   "arduino-app-cli",
-		Short: "A CLI to manage the Python app",
+		Short: "A CLI to manage Arduino Apps",
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			format, ok := feedback.ParseOutputFormat(format)
 			if !ok {
diff --git a/cmd/arduino-app-cli/system/system.go b/cmd/arduino-app-cli/system/system.go
index dd9986de..54c89128 100644
--- a/cmd/arduino-app-cli/system/system.go
+++ b/cmd/arduino-app-cli/system/system.go
@@ -37,7 +37,8 @@ import (
 
 func NewSystemCmd(cfg config.Configuration) *cobra.Command {
 	cmd := &cobra.Command{
-		Use: "system",
+		Use:   "system",
+		Short: "Manage the board’s system configuration",
 	}
 
 	cmd.AddCommand(newDownloadImageCmd(cfg))