diff --git a/cli/command/config/cmd.go b/cli/command/config/cmd.go
index 19120348bb..7defe2a61e 100644
--- a/cli/command/config/cmd.go
+++ b/cli/command/config/cmd.go
@@ -10,11 +10,14 @@ import (
 // NewConfigCommand returns a cobra command for `config` subcommands
 func NewConfigCommand(dockerCli command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:         "config",
-		Short:       "Manage Docker configs",
-		Args:        cli.NoArgs,
-		RunE:        command.ShowHelp(dockerCli.Err()),
-		Annotations: map[string]string{"version": "1.30"},
+		Use:   "config",
+		Short: "Manage Docker configs",
+		Args:  cli.NoArgs,
+		RunE:  command.ShowHelp(dockerCli.Err()),
+		Annotations: map[string]string{
+			"version": "1.30",
+			"swarm":   "",
+		},
 	}
 	cmd.AddCommand(
 		newConfigListCommand(dockerCli),
diff --git a/cli/command/node/cmd.go b/cli/command/node/cmd.go
index 4ae0f4f094..f5d194352f 100644
--- a/cli/command/node/cmd.go
+++ b/cli/command/node/cmd.go
@@ -14,11 +14,14 @@ import (
 // NewNodeCommand returns a cobra command for `node` subcommands
 func NewNodeCommand(dockerCli command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:         "node",
-		Short:       "Manage Swarm nodes",
-		Args:        cli.NoArgs,
-		RunE:        command.ShowHelp(dockerCli.Err()),
-		Annotations: map[string]string{"version": "1.24"},
+		Use:   "node",
+		Short: "Manage Swarm nodes",
+		Args:  cli.NoArgs,
+		RunE:  command.ShowHelp(dockerCli.Err()),
+		Annotations: map[string]string{
+			"version": "1.24",
+			"swarm":   "",
+		},
 	}
 	cmd.AddCommand(
 		newDemoteCommand(dockerCli),
diff --git a/cli/command/secret/cmd.go b/cli/command/secret/cmd.go
index f50f9818c3..a29d2def37 100644
--- a/cli/command/secret/cmd.go
+++ b/cli/command/secret/cmd.go
@@ -10,11 +10,14 @@ import (
 // NewSecretCommand returns a cobra command for `secret` subcommands
 func NewSecretCommand(dockerCli command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:         "secret",
-		Short:       "Manage Docker secrets",
-		Args:        cli.NoArgs,
-		RunE:        command.ShowHelp(dockerCli.Err()),
-		Annotations: map[string]string{"version": "1.25"},
+		Use:   "secret",
+		Short: "Manage Docker secrets",
+		Args:  cli.NoArgs,
+		RunE:  command.ShowHelp(dockerCli.Err()),
+		Annotations: map[string]string{
+			"version": "1.25",
+			"swarm":   "",
+		},
 	}
 	cmd.AddCommand(
 		newSecretListCommand(dockerCli),
diff --git a/cli/command/service/cmd.go b/cli/command/service/cmd.go
index 1c33440591..98af9852ab 100644
--- a/cli/command/service/cmd.go
+++ b/cli/command/service/cmd.go
@@ -10,11 +10,14 @@ import (
 // NewServiceCommand returns a cobra command for `service` subcommands
 func NewServiceCommand(dockerCli command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:         "service",
-		Short:       "Manage services",
-		Args:        cli.NoArgs,
-		RunE:        command.ShowHelp(dockerCli.Err()),
-		Annotations: map[string]string{"version": "1.24"},
+		Use:   "service",
+		Short: "Manage services",
+		Args:  cli.NoArgs,
+		RunE:  command.ShowHelp(dockerCli.Err()),
+		Annotations: map[string]string{
+			"version": "1.24",
+			"swarm":   "",
+		},
 	}
 	cmd.AddCommand(
 		newCreateCommand(dockerCli),
diff --git a/cli/command/swarm/cmd.go b/cli/command/swarm/cmd.go
index 425b83939e..89bf5c3c73 100644
--- a/cli/command/swarm/cmd.go
+++ b/cli/command/swarm/cmd.go
@@ -10,11 +10,14 @@ import (
 // NewSwarmCommand returns a cobra command for `swarm` subcommands
 func NewSwarmCommand(dockerCli command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:         "swarm",
-		Short:       "Manage Swarm",
-		Args:        cli.NoArgs,
-		RunE:        command.ShowHelp(dockerCli.Err()),
-		Annotations: map[string]string{"version": "1.24"},
+		Use:   "swarm",
+		Short: "Manage Swarm",
+		Args:  cli.NoArgs,
+		RunE:  command.ShowHelp(dockerCli.Err()),
+		Annotations: map[string]string{
+			"version": "1.24",
+			"swarm":   "",
+		},
 	}
 	cmd.AddCommand(
 		newInitCommand(dockerCli),