diff --git a/cli/cdsctl/action.go b/cli/cdsctl/action.go
index 3d65c70724..425fb80690 100644
--- a/cli/cdsctl/action.go
+++ b/cli/cdsctl/action.go
@@ -20,8 +20,9 @@ import (
 const actionPathArg = "action-path"
 
 var actionCmd = cli.Command{
-	Name:  "action",
-	Short: "Manage CDS action",
+	Name:    "action",
+	Aliases: []string{"actions"},
+	Short:   "Manage CDS action",
 }
 
 var actionBuiltinCmd = cli.Command{
diff --git a/cli/cdsctl/admin_broadcasts.go b/cli/cdsctl/admin_broadcasts.go
index 80296be4be..e6b2038f60 100644
--- a/cli/cdsctl/admin_broadcasts.go
+++ b/cli/cdsctl/admin_broadcasts.go
@@ -12,8 +12,9 @@ import (
 )
 
 var adminBroadcastsCmd = cli.Command{
-	Name:  "broadcasts",
-	Short: "Manage CDS broadcasts",
+	Name:    "broadcasts",
+	Aliases: []string{"broadcast"},
+	Short:   "Manage CDS broadcasts",
 }
 
 func adminBroadcasts() *cobra.Command {
diff --git a/cli/cdsctl/admin_feature.go b/cli/cdsctl/admin_feature.go
index 46ef1dce86..32e3cebca3 100644
--- a/cli/cdsctl/admin_feature.go
+++ b/cli/cdsctl/admin_feature.go
@@ -11,8 +11,9 @@ import (
 )
 
 var adminFeaturesCmd = cli.Command{
-	Name:  "features",
-	Short: "Manage CDS feature flipping rules",
+	Name:    "features",
+	Aliases: []string{"feature"},
+	Short:   "Manage CDS feature flipping rules",
 }
 
 func adminFeatures() *cobra.Command {
diff --git a/cli/cdsctl/admin_migrations.go b/cli/cdsctl/admin_migrations.go
index 92b403682c..cb6cee5fe0 100644
--- a/cli/cdsctl/admin_migrations.go
+++ b/cli/cdsctl/admin_migrations.go
@@ -10,8 +10,9 @@ import (
 )
 
 var adminMigrationsCmd = cli.Command{
-	Name:  "migration",
-	Short: "Manage CDS Migrations",
+	Name:    "migration",
+	Aliases: []string{"migrations"},
+	Short:   "Manage CDS Migrations",
 	Long: `Theses commands manage CDS Migration and DO NOT concern database migrations.
 	
 A CDS Migration is an internal routine. This helps manage a complex data migration with code included
diff --git a/cli/cdsctl/admin_plugin.go b/cli/cdsctl/admin_plugin.go
index 17b37baf19..3ecd22bafa 100644
--- a/cli/cdsctl/admin_plugin.go
+++ b/cli/cdsctl/admin_plugin.go
@@ -16,8 +16,9 @@ import (
 )
 
 var adminPluginsCmd = cli.Command{
-	Name:  "plugins",
-	Short: "Manage CDS Plugins",
+	Name:    "plugins",
+	Short:   "Manage CDS Plugins",
+	Aliases: []string{"plugin"},
 }
 
 func adminPlugins() *cobra.Command {
diff --git a/cli/cdsctl/application.go b/cli/cdsctl/application.go
index 53d9353dff..4f7ae572e5 100644
--- a/cli/cdsctl/application.go
+++ b/cli/cdsctl/application.go
@@ -13,8 +13,9 @@ import (
 )
 
 var applicationCmd = cli.Command{
-	Name:  "application",
-	Short: "Manage CDS application",
+	Name:    "application",
+	Aliases: []string{"applications"},
+	Short:   "Manage CDS application",
 }
 
 func application() *cobra.Command {
diff --git a/cli/cdsctl/application_key.go b/cli/cdsctl/application_key.go
index d35f801f66..2ed8cf3276 100644
--- a/cli/cdsctl/application_key.go
+++ b/cli/cdsctl/application_key.go
@@ -10,8 +10,9 @@ import (
 )
 
 var applicationKeyCmd = cli.Command{
-	Name:  "keys",
-	Short: "Manage CDS application keys",
+	Name:    "keys",
+	Aliases: []string{"key"},
+	Short:   "Manage CDS application keys",
 }
 
 func applicationKey() *cobra.Command {
diff --git a/cli/cdsctl/application_variable.go b/cli/cdsctl/application_variable.go
index a1d2c22941..2536cddeba 100644
--- a/cli/cdsctl/application_variable.go
+++ b/cli/cdsctl/application_variable.go
@@ -8,8 +8,9 @@ import (
 )
 
 var applicationVariableCmd = cli.Command{
-	Name:  "variable",
-	Short: "Manage CDS application variables",
+	Name:    "variable",
+	Aliases: []string{"variables"},
+	Short:   "Manage CDS application variables",
 }
 
 func applicationVariable() *cobra.Command {
diff --git a/cli/cdsctl/consumer.go b/cli/cdsctl/consumer.go
index 9a789a477b..6c25231c8b 100644
--- a/cli/cdsctl/consumer.go
+++ b/cli/cdsctl/consumer.go
@@ -14,8 +14,9 @@ const consumerIDArg = "consumer-id"
 
 func consumer() *cobra.Command {
 	cmd := cli.Command{
-		Name:  "consumer",
-		Short: "Manage CDS auth consumers",
+		Name:    "consumer",
+		Aliases: []string{"consumers"},
+		Short:   "Manage CDS auth consumers",
 	}
 
 	return cli.NewCommand(cmd, nil,
diff --git a/cli/cdsctl/environment.go b/cli/cdsctl/environment.go
index c4af899b4b..f45af76c94 100644
--- a/cli/cdsctl/environment.go
+++ b/cli/cdsctl/environment.go
@@ -17,6 +17,7 @@ var environmentCmd = cli.Command{
 	Short: "Manage CDS environment",
 	Aliases: []string{
 		"env",
+		"environments",
 	},
 }
 
diff --git a/cli/cdsctl/environment_key.go b/cli/cdsctl/environment_key.go
index 47f86252cb..347c0ef628 100644
--- a/cli/cdsctl/environment_key.go
+++ b/cli/cdsctl/environment_key.go
@@ -10,8 +10,9 @@ import (
 )
 
 var environmentKeyCmd = cli.Command{
-	Name:  "keys",
-	Short: "Manage CDS environment keys",
+	Name:    "keys",
+	Aliases: []string{"key"},
+	Short:   "Manage CDS environment keys",
 }
 
 func environmentKey() *cobra.Command {
diff --git a/cli/cdsctl/environment_variable.go b/cli/cdsctl/environment_variable.go
index 77057c889a..5711019c1d 100644
--- a/cli/cdsctl/environment_variable.go
+++ b/cli/cdsctl/environment_variable.go
@@ -8,8 +8,9 @@ import (
 )
 
 var environmentVariableCmd = cli.Command{
-	Name:  "variable",
-	Short: "Manage CDS environment variables",
+	Name:    "variable",
+	Aliases: []string{"variables"},
+	Short:   "Manage CDS environment variables",
 }
 
 func environmentVariable() *cobra.Command {
diff --git a/cli/cdsctl/events.go b/cli/cdsctl/events.go
index 5658b98616..36204b8917 100644
--- a/cli/cdsctl/events.go
+++ b/cli/cdsctl/events.go
@@ -11,8 +11,9 @@ import (
 )
 
 var eventsCmd = cli.Command{
-	Name:  "events",
-	Short: "Listen CDS Events",
+	Name:    "events",
+	Aliases: []string{"event"},
+	Short:   "Listen CDS Events",
 }
 
 func events() *cobra.Command {
diff --git a/cli/cdsctl/group.go b/cli/cdsctl/group.go
index c582436e04..ef89d8e13e 100644
--- a/cli/cdsctl/group.go
+++ b/cli/cdsctl/group.go
@@ -11,8 +11,9 @@ import (
 )
 
 var groupCmd = cli.Command{
-	Name:  "group",
-	Short: "Manage CDS group",
+	Name:    "group",
+	Aliases: []string{"groups"},
+	Short:   "Manage CDS group",
 }
 
 func group() *cobra.Command {
diff --git a/cli/cdsctl/group_user.go b/cli/cdsctl/group_user.go
index 910678e5eb..77132a01a6 100644
--- a/cli/cdsctl/group_user.go
+++ b/cli/cdsctl/group_user.go
@@ -8,8 +8,9 @@ import (
 )
 
 var groupMemberCmd = cli.Command{
-	Name:  "member",
-	Short: "Manage group's member",
+	Name:    "member",
+	Aliases: []string{"members"},
+	Short:   "Manage group's member",
 }
 
 func groupMember() *cobra.Command {
diff --git a/cli/cdsctl/pipeline.go b/cli/cdsctl/pipeline.go
index 87f2cbd227..99065a5726 100644
--- a/cli/cdsctl/pipeline.go
+++ b/cli/cdsctl/pipeline.go
@@ -14,8 +14,9 @@ import (
 )
 
 var pipelineCmd = cli.Command{
-	Name:  "pipeline",
-	Short: "Manage CDS pipeline",
+	Name:    "pipeline",
+	Aliases: []string{"pipelines"},
+	Short:   "Manage CDS pipeline",
 }
 
 func pipeline() *cobra.Command {
diff --git a/cli/cdsctl/project.go b/cli/cdsctl/project.go
index d71dd6ec4e..1056ea09a8 100644
--- a/cli/cdsctl/project.go
+++ b/cli/cdsctl/project.go
@@ -14,8 +14,9 @@ import (
 )
 
 var projectCmd = cli.Command{
-	Name:  "project",
-	Short: "Manage CDS project",
+	Name:    "project",
+	Aliases: []string{"projects"},
+	Short:   "Manage CDS project",
 }
 
 func projectCommands() []*cobra.Command {
diff --git a/cli/cdsctl/project_favorite.go b/cli/cdsctl/project_favorite.go
index 38aa013496..052d658c64 100644
--- a/cli/cdsctl/project_favorite.go
+++ b/cli/cdsctl/project_favorite.go
@@ -8,8 +8,9 @@ import (
 )
 
 var projectFavoriteCmd = cli.Command{
-	Name:  "favorite",
-	Short: "Add or delete a CDS project to your personal bookmarks",
+	Name:    "favorite",
+	Aliases: []string{"favorites"},
+	Short:   "Add or delete a CDS project to your personal bookmarks",
 	Ctx: []cli.Arg{
 		{Name: _ProjectKey},
 	},
diff --git a/cli/cdsctl/project_group.go b/cli/cdsctl/project_group.go
index 0d5914cdcc..02886c18ae 100644
--- a/cli/cdsctl/project_group.go
+++ b/cli/cdsctl/project_group.go
@@ -13,8 +13,9 @@ import (
 )
 
 var projectGroupCmd = cli.Command{
-	Name:  "group",
-	Short: "Manage CDS group linked to a project",
+	Name:    "group",
+	Aliases: []string{"groups"},
+	Short:   "Manage CDS group linked to a project",
 }
 
 func projectGroup() *cobra.Command {
diff --git a/cli/cdsctl/project_integration.go b/cli/cdsctl/project_integration.go
index f9571fb454..6d33c927e6 100644
--- a/cli/cdsctl/project_integration.go
+++ b/cli/cdsctl/project_integration.go
@@ -12,8 +12,9 @@ import (
 )
 
 var projectIntegrationCmd = cli.Command{
-	Name:  "integration",
-	Short: "Manage CDS integrations",
+	Name:    "integration",
+	Aliases: []string{"integrations"},
+	Short:   "Manage CDS integrations",
 }
 
 func projectIntegration() *cobra.Command {
diff --git a/cli/cdsctl/project_key.go b/cli/cdsctl/project_key.go
index a3e5779ecf..e0890eb6f6 100644
--- a/cli/cdsctl/project_key.go
+++ b/cli/cdsctl/project_key.go
@@ -10,8 +10,9 @@ import (
 )
 
 var projectKeyCmd = cli.Command{
-	Name:  "keys",
-	Short: "Manage CDS project keys",
+	Name:    "keys",
+	Aliases: []string{"key"},
+	Short:   "Manage CDS project keys",
 }
 
 func projectKey() *cobra.Command {
diff --git a/cli/cdsctl/project_variable.go b/cli/cdsctl/project_variable.go
index 882a1649a7..aa96a1c45f 100644
--- a/cli/cdsctl/project_variable.go
+++ b/cli/cdsctl/project_variable.go
@@ -8,8 +8,9 @@ import (
 )
 
 var projectVariableCmd = cli.Command{
-	Name:  "variable",
-	Short: "Manage CDS project variables",
+	Name:    "variable",
+	Aliases: []string{"variables"},
+	Short:   "Manage CDS project variables",
 }
 
 func projectVariable() *cobra.Command {
diff --git a/cli/cdsctl/template.go b/cli/cdsctl/template.go
index b5ec1c46b3..6f7871dbda 100644
--- a/cli/cdsctl/template.go
+++ b/cli/cdsctl/template.go
@@ -17,8 +17,9 @@ import (
 )
 
 var templateCmd = cli.Command{
-	Name:  "template",
-	Short: "Manage CDS workflow template",
+	Name:    "template",
+	Aliases: []string{"templates"},
+	Short:   "Manage CDS workflow template",
 }
 
 func template() *cobra.Command {
diff --git a/cli/cdsctl/tools.go b/cli/cdsctl/tools.go
index 75700bcefc..848989f4ac 100644
--- a/cli/cdsctl/tools.go
+++ b/cli/cdsctl/tools.go
@@ -17,8 +17,9 @@ const (
 )
 
 var toolsCmd = cli.Command{
-	Name:  "tools",
-	Short: "Some tooling for CDS",
+	Name:    "tools",
+	Aliases: []string{"tool"},
+	Short:   "Some tooling for CDS",
 }
 
 func tools() *cobra.Command {
diff --git a/cli/cdsctl/user.go b/cli/cdsctl/user.go
index 398aad57c4..b588e44649 100644
--- a/cli/cdsctl/user.go
+++ b/cli/cdsctl/user.go
@@ -10,8 +10,9 @@ import (
 )
 
 var userCmd = cli.Command{
-	Name:  "user",
-	Short: "Manage CDS user",
+	Name:    "user",
+	Aliases: []string{"users"},
+	Short:   "Manage CDS user",
 }
 
 func usr() *cobra.Command {
diff --git a/cli/cdsctl/worker_model.go b/cli/cdsctl/worker_model.go
index fdc10dfeba..5a4c9ddee6 100644
--- a/cli/cdsctl/worker_model.go
+++ b/cli/cdsctl/worker_model.go
@@ -13,8 +13,9 @@ import (
 )
 
 var workerModelCmd = cli.Command{
-	Name:  "model",
-	Short: "Manage Worker Model",
+	Name:    "model",
+	Aliases: []string{"models"},
+	Short:   "Manage Worker Model",
 }
 
 func workerModel() *cobra.Command {
diff --git a/cli/cdsctl/workflow.go b/cli/cdsctl/workflow.go
index 97689c2aa2..43a850a66c 100644
--- a/cli/cdsctl/workflow.go
+++ b/cli/cdsctl/workflow.go
@@ -11,8 +11,9 @@ import (
 )
 
 var workflowCmd = cli.Command{
-	Name:  "workflow",
-	Short: "Manage CDS workflow",
+	Name:    "workflow",
+	Aliases: []string{"workflows"},
+	Short:   "Manage CDS workflow",
 }
 
 func workflow() *cobra.Command {
diff --git a/cli/cdsctl/workflow_artifact.go b/cli/cdsctl/workflow_artifact.go
index d5a5acf274..5a0f9ce7de 100644
--- a/cli/cdsctl/workflow_artifact.go
+++ b/cli/cdsctl/workflow_artifact.go
@@ -13,8 +13,9 @@ import (
 )
 
 var workflowArtifactCmd = cli.Command{
-	Name:  "artifact",
-	Short: "Manage Workflow Artifact",
+	Name:    "artifact",
+	Aliases: []string{"artifacts"},
+	Short:   "Manage Workflow Artifact",
 }
 
 func workflowArtifact() *cobra.Command {