diff --git a/cli/app/app.go b/cli/app/app.go
index a0391496..f7b07c5e 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -10,5 +10,5 @@ var AppCommand = &cobra.Command{
 	Use:     i18n.G("app [cmd] [args] [flags]"),
 	Aliases: []string{i18n.G("a")},
 	// translators: Short description for `app` command group
-	Short:   i18n.G("Manage apps"),
+	Short: i18n.G("Manage apps"),
 }
diff --git a/cli/app/backup.go b/cli/app/backup.go
index 508ab64c..916d3ebd 100644
--- a/cli/app/backup.go
+++ b/cli/app/backup.go
@@ -16,8 +16,8 @@ var AppBackupListCommand = &cobra.Command{
 	Use:     i18n.G("list <domain> [flags]"),
 	Aliases: []string{i18n.G("ls")},
 	// translators: Short description for `app backup list` command
-	Short:   i18n.G("List the contents of a snapshot"),
-	Args:    cobra.ExactArgs(1),
+	Short: i18n.G("List the contents of a snapshot"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -68,7 +68,7 @@ var AppBackupDownloadCommand = &cobra.Command{
 	Use:     i18n.G("download <domain> [flags]"),
 	Aliases: []string{i18n.G("d")},
 	// translators: Short description for `app backup download` command
-	Short:   i18n.G("Download a snapshot"),
+	Short: i18n.G("Download a snapshot"),
 	Long: i18n.G(`Downloads a backup.tar.gz to the current working directory.
 
 "--volumes/-v" includes data contained in volumes alongide paths specified in
@@ -139,8 +139,8 @@ var AppBackupCreateCommand = &cobra.Command{
 	Use:     i18n.G("create <domain> [flags]"),
 	Aliases: []string{i18n.G("c")},
 	// translators: Short description for `app backup create` command
-	Short:   i18n.G("Create a new snapshot"),
-	Args:    cobra.ExactArgs(1),
+	Short: i18n.G("Create a new snapshot"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -185,8 +185,8 @@ var AppBackupSnapshotsCommand = &cobra.Command{
 	Use:     i18n.G("snapshots <domain> [flags]"),
 	Aliases: []string{i18n.G("s")},
 	// translators: Short description for `app backup snapshots` command
-	Short:   i18n.G("List all snapshots"),
-	Args:    cobra.ExactArgs(1),
+	Short: i18n.G("List all snapshots"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -222,7 +222,7 @@ var AppBackupCommand = &cobra.Command{
 	Use:     i18n.G("backup [cmd] [args] [flags]"),
 	Aliases: []string{i18n.G("b")},
 	// translators: Short description for `app backup` command group
-	Short:   i18n.G("Manage app backups"),
+	Short: i18n.G("Manage app backups"),
 }
 
 var (
diff --git a/cli/app/check.go b/cli/app/check.go
index 25e1fb41..9375c78f 100644
--- a/cli/app/check.go
+++ b/cli/app/check.go
@@ -18,7 +18,7 @@ var AppCheckCommand = &cobra.Command{
 	Use:     i18n.G("check <domain> [flags]"),
 	Aliases: []string{i18n.G("chk")},
 	// translators: Short description for `app check` command
-	Short:   i18n.G("Ensure an app is well configured"),
+	Short: i18n.G("Ensure an app is well configured"),
 	Long: i18n.G(`Compare env vars in both the app ".env" and recipe ".env.sample" file.
 
 The goal is to ensure that recipe ".env.sample" env vars are defined in your
diff --git a/cli/app/cmd.go b/cli/app/cmd.go
index ff0c03e1..e447fdbf 100644
--- a/cli/app/cmd.go
+++ b/cli/app/cmd.go
@@ -23,7 +23,7 @@ var AppCmdCommand = &cobra.Command{
 	Use:     i18n.G("command <domain> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]"),
 	Aliases: []string{i18n.G("cmd")},
 	// translators: Short description for `app cmd` command
-	Short:   i18n.G("Run app commands"),
+	Short: i18n.G("Run app commands"),
 	Long: i18n.G(`Run an app specific command.
 
 These commands are bash functions, defined in the abra.sh of the recipe itself.
@@ -199,8 +199,8 @@ var AppCmdListCommand = &cobra.Command{
 	Use:     i18n.G("list <domain> [flags]"),
 	Aliases: []string{i18n.G("ls")},
 	// translators: Short description for `app cmd list` command
-	Short:   i18n.G("List all available commands"),
-	Args:    cobra.MinimumNArgs(1),
+	Short: i18n.G("List all available commands"),
+	Args:  cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
diff --git a/cli/app/cp.go b/cli/app/cp.go
index daba881a..e1678bce 100644
--- a/cli/app/cp.go
+++ b/cli/app/cp.go
@@ -30,7 +30,7 @@ var AppCpCommand = &cobra.Command{
 	Use:     i18n.G("cp <domain> <src> <dst> [flags]"),
 	Aliases: []string{i18n.G("c")},
 	// translators: Short description for `app cp` command
-	Short:   i18n.G("Copy files to/from a deployed app service"),
+	Short: i18n.G("Copy files to/from a deployed app service"),
 	Example: i18n.G(`  # copy myfile.txt to the root of the app service
   abra app cp 1312.net myfile.txt app:/
 
diff --git a/cli/app/deploy.go b/cli/app/deploy.go
index 45fbbe0d..d88f5087 100644
--- a/cli/app/deploy.go
+++ b/cli/app/deploy.go
@@ -29,7 +29,7 @@ var AppDeployCommand = &cobra.Command{
 	Use:     i18n.G("deploy <domain> [version] [flags]"),
 	Aliases: []string{i18n.G("d")},
 	// translators: Short description for `app deploy` command
-	Short:   i18n.G("Deploy an app"),
+	Short: i18n.G("Deploy an app"),
 	Long: i18n.G(`Deploy an app.
 
 This command supports chaos operations. Use "--chaos/-C" to deploy your recipe
diff --git a/cli/app/list.go b/cli/app/list.go
index 648dedbe..132e86fd 100644
--- a/cli/app/list.go
+++ b/cli/app/list.go
@@ -44,7 +44,7 @@ var AppListCommand = &cobra.Command{
 	Use:     i18n.G("list [flags]"),
 	Aliases: []string{i18n.G("ls")},
 	// translators: Short description for `app list` command
-	Short:   i18n.G("List all managed apps"),
+	Short: i18n.G("List all managed apps"),
 	Long: i18n.G(`Generate a report of all managed apps.
 
 Use "--status/-S" flag to query all servers for the live deployment status.`),
diff --git a/cli/app/logs.go b/cli/app/logs.go
index 9dd57660..bb5b011e 100644
--- a/cli/app/logs.go
+++ b/cli/app/logs.go
@@ -19,8 +19,8 @@ var AppLogsCommand = &cobra.Command{
 	Use:     i18n.G("logs <domain> [service] [flags]"),
 	Aliases: []string{i18n.G("l")},
 	// translators: Short description for `app logs` command
-	Short:   i18n.G("Tail app logs"),
-	Args:    cobra.RangeArgs(1, 2),
+	Short: i18n.G("Tail app logs"),
+	Args:  cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
diff --git a/cli/app/new.go b/cli/app/new.go
index ee62eb8b..be1dc0d9 100644
--- a/cli/app/new.go
+++ b/cli/app/new.go
@@ -47,9 +47,9 @@ var AppNewCommand = &cobra.Command{
 	Use:     i18n.G("new [recipe] [version] [flags]"),
 	Aliases: []string{i18n.G("n")},
 	// translators: Short description for `app new` command
-	Short:   i18n.G("Create a new app"),
-	Long:    appNewDescription,
-	Args:    cobra.RangeArgs(0, 2),
+	Short: i18n.G("Create a new app"),
+	Long:  appNewDescription,
+	Args:  cobra.RangeArgs(0, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
diff --git a/cli/app/ps.go b/cli/app/ps.go
index d93a22f4..38245f80 100644
--- a/cli/app/ps.go
+++ b/cli/app/ps.go
@@ -29,8 +29,8 @@ var AppPsCommand = &cobra.Command{
 	Use:     i18n.G("ps <domain> [flags]"),
 	Aliases: []string{i18n.G("p")},
 	// translators: Short description for `app ps` command
-	Short:   i18n.G("Check app deployment status"),
-	Args:    cobra.ExactArgs(1),
+	Short: i18n.G("Check app deployment status"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
diff --git a/cli/app/remove.go b/cli/app/remove.go
index f953d6b1..c49db1e2 100644
--- a/cli/app/remove.go
+++ b/cli/app/remove.go
@@ -20,7 +20,7 @@ var AppRemoveCommand = &cobra.Command{
 	Use:     i18n.G("remove <domain> [flags]"),
 	Aliases: []string{i18n.G("rm")},
 	// translators: Short description for `app remove` command
-	Short:   i18n.G("Remove all app data, locally and remotely"),
+	Short: i18n.G("Remove all app data, locally and remotely"),
 	Long: i18n.G(`Remove everything related to an app which is already undeployed.
 
 By default, it will prompt for confirmation before proceeding. All secrets,
diff --git a/cli/app/restart.go b/cli/app/restart.go
index 29356ab1..aaae1477 100644
--- a/cli/app/restart.go
+++ b/cli/app/restart.go
@@ -22,7 +22,7 @@ var AppRestartCommand = &cobra.Command{
 	Use:     i18n.G("restart <domain> [[service] | --all-services] [flags]"),
 	Aliases: []string{i18n.G("re")},
 	// translators: Short description for `app restart` command
-	Short:   i18n.G("Restart an app"),
+	Short: i18n.G("Restart an app"),
 	Long: i18n.G(`This command restarts services within a deployed app.
 
 Run "abra app ps <domain>" to see a list of service names.
diff --git a/cli/app/restore.go b/cli/app/restore.go
index d7656271..55a447dd 100644
--- a/cli/app/restore.go
+++ b/cli/app/restore.go
@@ -17,7 +17,7 @@ var AppRestoreCommand = &cobra.Command{
 	Use:     i18n.G("restore <domain> [flags]"),
 	Aliases: []string{i18n.G("rs")},
 	// translators: Short description for `app restore` command
-	Short:   i18n.G("Restore a snapshot"),
+	Short: i18n.G("Restore a snapshot"),
 	Long: i18n.G(`Snapshots are restored while apps are deployed.
 
 Some restore scenarios may require service / app restarts.`),
diff --git a/cli/app/rollback.go b/cli/app/rollback.go
index 91ddc820..fb85f67f 100644
--- a/cli/app/rollback.go
+++ b/cli/app/rollback.go
@@ -26,7 +26,7 @@ var AppRollbackCommand = &cobra.Command{
 	Use:     i18n.G("rollback <domain> [version] [flags]"),
 	Aliases: []string{i18n.G("rl")},
 	// translators: Short description for `app rollback` command
-	Short:   i18n.G("Roll an app back to a previous version"),
+	Short: i18n.G("Roll an app back to a previous version"),
 	Long: i18n.G(`This command rolls an app back to a previous version.
 
 Unlike "abra app deploy", chaos operations are not supported here. Only recipe
diff --git a/cli/app/run.go b/cli/app/run.go
index db76902a..6450d0d9 100644
--- a/cli/app/run.go
+++ b/cli/app/run.go
@@ -22,7 +22,7 @@ var AppRunCommand = &cobra.Command{
 	Use:     i18n.G("run <domain> <service> <cmd> [[args] [flags] | [flags] -- [args]]"),
 	Aliases: []string{i18n.G("r")},
 	// translators: Short description for `app run` command
-	Short:   i18n.G("Run a command inside a service container"),
+	Short: i18n.G("Run a command inside a service container"),
 	Example: i18n.G(`  # run <cmd> with args/flags
   abra app run 1312.net app -- ls -lha
 
diff --git a/cli/app/secret.go b/cli/app/secret.go
index e153e819..7670e5ff 100644
--- a/cli/app/secret.go
+++ b/cli/app/secret.go
@@ -29,8 +29,8 @@ var AppSecretGenerateCommand = &cobra.Command{
 	Use:     i18n.G("generate <domain> [[secret] [version] | --all] [flags]"),
 	Aliases: []string{i18n.G("g")},
 	// translators: Short description for `app secret generate` command
-	Short:   i18n.G("Generate secrets"),
-	Args:    cobra.RangeArgs(1, 3),
+	Short: i18n.G("Generate secrets"),
+	Args:  cobra.RangeArgs(1, 3),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -151,7 +151,7 @@ var AppSecretInsertCommand = &cobra.Command{
 	Use:     i18n.G("insert <domain> <secret> <version> [<data>] [flags]"),
 	Aliases: []string{i18n.G("i")},
 	// translators: Short description for `app secret insert` command
-	Short:   i18n.G("Insert secret"),
+	Short: i18n.G("Insert secret"),
 	Long: i18n.G(`This command inserts a secret into an app environment.
 
 Arbitrary secret insertion is not supported. Secrets that are inserted must
@@ -326,7 +326,7 @@ var AppSecretRmCommand = &cobra.Command{
 	Use:     i18n.G("remove <domain> [[secret] | --all] [flags]"),
 	Aliases: []string{i18n.G("rm")},
 	// translators: Short description for `app secret remove` command
-	Short:   i18n.G("Remove a secret"),
+	Short: i18n.G("Remove a secret"),
 	Long: i18n.G(`This command removes a secret from an app environment.
 
 Arbitrary secret removal is not supported. Secrets that are removed must
@@ -441,8 +441,8 @@ var AppSecretLsCommand = &cobra.Command{
 	Use:     i18n.G("list <domain>"),
 	Aliases: []string{i18n.G("ls")},
 	// translators: Short description for `app secret list` command
-	Short:   i18n.G("List all secrets"),
-	Args:    cobra.MinimumNArgs(1),
+	Short: i18n.G("List all secrets"),
+	Args:  cobra.MinimumNArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -518,7 +518,7 @@ var AppSecretCommand = &cobra.Command{
 	Use:     i18n.G("secret [cmd] [args] [flags]"),
 	Aliases: []string{i18n.G("s")},
 	// translators: Short description for `app secret` command group
-	Short:   i18n.G("Manage app secrets"),
+	Short: i18n.G("Manage app secrets"),
 }
 
 var (
diff --git a/cli/app/services.go b/cli/app/services.go
index 1c1f5518..5b7e313b 100644
--- a/cli/app/services.go
+++ b/cli/app/services.go
@@ -22,8 +22,8 @@ var AppServicesCommand = &cobra.Command{
 	Use:     i18n.G("services <domain> [flags]"),
 	Aliases: []string{i18n.G("sr")},
 	// translators: Short description for `app services` command
-	Short:   i18n.G("Display all services of an app"),
-	Args:    cobra.ExactArgs(1),
+	Short: i18n.G("Display all services of an app"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
diff --git a/cli/app/undeploy.go b/cli/app/undeploy.go
index fd182068..8695ede8 100644
--- a/cli/app/undeploy.go
+++ b/cli/app/undeploy.go
@@ -23,7 +23,7 @@ var AppUndeployCommand = &cobra.Command{
 	Use:     i18n.G("undeploy <domain> [flags]"),
 	Aliases: []string{i18n.G("un")},
 	// translators: Short description for `app undeploy` command
-	Short:   i18n.G("Undeploy an app"),
+	Short: i18n.G("Undeploy an app"),
 	Long: i18n.G(`This does not destroy any application data.
 
 However, you should remain vigilant, as your swarm installation will consider
diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go
index d050b8ab..af2ff047 100644
--- a/cli/app/upgrade.go
+++ b/cli/app/upgrade.go
@@ -30,7 +30,7 @@ var AppUpgradeCommand = &cobra.Command{
 	Use:     i18n.G("upgrade <domain> [version] [flags]"),
 	Aliases: []string{i18n.G("up")},
 	// translators: Short description for `app upgrade` command
-	Short:   i18n.G("Upgrade an app"),
+	Short: i18n.G("Upgrade an app"),
 	Long: i18n.G(`Upgrade an app.
 
 Unlike "abra app deploy", chaos operations are not supported here. Only recipe
diff --git a/cli/app/volume.go b/cli/app/volume.go
index 6d000d53..d455b9a9 100644
--- a/cli/app/volume.go
+++ b/cli/app/volume.go
@@ -20,8 +20,8 @@ var AppVolumeListCommand = &cobra.Command{
 	Use:     i18n.G("list <domain> [flags]"),
 	Aliases: []string{i18n.G("ls")},
 	// translators: Short description for `app list` command
-	Short:   i18n.G("List volumes associated with an app"),
-	Args:    cobra.ExactArgs(1),
+	Short: i18n.G("List volumes associated with an app"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -76,7 +76,7 @@ var AppVolumeListCommand = &cobra.Command{
 
 var AppVolumeRemoveCommand = &cobra.Command{
 	// translators: `app volume remove` command
-	Use:   i18n.G("remove <domain> [volume] [flags]"),
+	Use: i18n.G("remove <domain> [volume] [flags]"),
 	// translators: Short description for `app volume remove` command
 	Short: i18n.G("Remove volume(s) associated with an app"),
 	Long: i18n.G(`Remove volumes associated with an app.
diff --git a/cli/catalogue/catalogue.go b/cli/catalogue/catalogue.go
index b7d1e022..82cc007c 100644
--- a/cli/catalogue/catalogue.go
+++ b/cli/catalogue/catalogue.go
@@ -26,8 +26,8 @@ var CatalogueSyncCommand = &cobra.Command{
 	Use:     i18n.G("sync [flags]"),
 	Aliases: []string{i18n.G("g")},
 	// translators: Short description for `catalogue sync` command
-	Short:   i18n.G("Sync recipe catalogue for latest changes"),
-	Args:    cobra.NoArgs,
+	Short: i18n.G("Sync recipe catalogue for latest changes"),
+	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := catalogue.EnsureCatalogue(); err != nil {
 			log.Fatal(err)
@@ -46,7 +46,7 @@ var CatalogueGenerateCommand = &cobra.Command{
 	Use:     i18n.G("generate [recipe] [flags]"),
 	Aliases: []string{i18n.G("g")},
 	// translators: Short description for `catalogue generate` command
-	Short:   i18n.G("Generate the recipe catalogue"),
+	Short: i18n.G("Generate the recipe catalogue"),
 	Long: i18n.G(`Generate a new copy of the recipe catalogue.
 
 N.B. this command **will** wipe local unstaged changes from your local recipes
@@ -267,7 +267,7 @@ your private key and enter your passphrase beforehand.
 // CatalogueCommand defines the `abra catalogue` command and sub-commands.
 var CatalogueCommand = &cobra.Command{
 	// translators: `catalogue` command group
-	Use:     i18n.G("catalogue [cmd] [args] [flags]"),
+	Use: i18n.G("catalogue [cmd] [args] [flags]"),
 	// translators: Short description for `catalogue` command group
 	Short:   i18n.G("Manage the recipe catalogue"),
 	Aliases: []string{"c"},
diff --git a/cli/complete.go b/cli/complete.go
index 731d601b..50c94428 100644
--- a/cli/complete.go
+++ b/cli/complete.go
@@ -9,7 +9,7 @@ import (
 
 var AutocompleteCommand = &cobra.Command{
 	// translators: `autocomplete` command
-	Use:   i18n.G("autocomplete [bash|zsh|fish|powershell]"),
+	Use: i18n.G("autocomplete [bash|zsh|fish|powershell]"),
 	// translators: Short description for `autocomplete` command
 	Short: i18n.G("Generate autocompletion script"),
 	Long: i18n.G(`To load completions:
diff --git a/cli/recipe/diff.go b/cli/recipe/diff.go
index 00095bb8..1166e895 100644
--- a/cli/recipe/diff.go
+++ b/cli/recipe/diff.go
@@ -14,9 +14,9 @@ var RecipeDiffCommand = &cobra.Command{
 	Use:     i18n.G("diff <recipe> [flags]"),
 	Aliases: []string{i18n.G("d")},
 	// translators: Short description for `recipe diff` command
-	Short:   i18n.G("Show unstaged changes in recipe config"),
-	Long:    i18n.G("This command requires /usr/bin/git."),
-	Args:    cobra.MinimumNArgs(1),
+	Short: i18n.G("Show unstaged changes in recipe config"),
+	Long:  i18n.G("This command requires /usr/bin/git."),
+	Args:  cobra.MinimumNArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
diff --git a/cli/recipe/fetch.go b/cli/recipe/fetch.go
index d51d212b..470e8cb6 100644
--- a/cli/recipe/fetch.go
+++ b/cli/recipe/fetch.go
@@ -19,9 +19,9 @@ var RecipeFetchCommand = &cobra.Command{
 	Use:     i18n.G("fetch [recipe | --all] [flags]"),
 	Aliases: []string{i18n.G("f")},
 	// translators: Short description for `recipe fetch` command
-	Short:   i18n.G("Clone recipe(s) locally"),
-	Long:    i18n.G(`Using "--force/-f" Git syncs an existing recipe. It does not erase unstaged changes.`),
-	Args:    cobra.RangeArgs(0, 1),
+	Short: i18n.G("Clone recipe(s) locally"),
+	Long:  i18n.G(`Using "--force/-f" Git syncs an existing recipe. It does not erase unstaged changes.`),
+	Args:  cobra.RangeArgs(0, 1),
 	Example: i18n.G(`  # fetch from recipe catalogue
   abra recipe fetch gitea
 
diff --git a/cli/recipe/lint.go b/cli/recipe/lint.go
index 97df226d..cb376717 100644
--- a/cli/recipe/lint.go
+++ b/cli/recipe/lint.go
@@ -12,7 +12,7 @@ import (
 
 var RecipeLintCommand = &cobra.Command{
 	// translators: `recipe lint` command
-	Use:     i18n.G("lint <recipe> [flags]"),
+	Use: i18n.G("lint <recipe> [flags]"),
 	// translators: Short description for `recipe lint` command
 	Short:   i18n.G("Lint a recipe"),
 	Aliases: []string{i18n.G("l")},
diff --git a/cli/recipe/list.go b/cli/recipe/list.go
index e057fa67..b33b3e9e 100644
--- a/cli/recipe/list.go
+++ b/cli/recipe/list.go
@@ -16,7 +16,7 @@ import (
 
 var RecipeListCommand = &cobra.Command{
 	// translators: `recipe list` command
-	Use:     i18n.G("list"),
+	Use: i18n.G("list"),
 	// translators: Short description for `recipe list` command
 	Short:   i18n.G("List recipes"),
 	Aliases: []string{i18n.G("ls")},
diff --git a/cli/recipe/recipe.go b/cli/recipe/recipe.go
index d470be35..9a2991d1 100644
--- a/cli/recipe/recipe.go
+++ b/cli/recipe/recipe.go
@@ -11,7 +11,7 @@ var RecipeCommand = &cobra.Command{
 	Use:     i18n.G("recipe [cmd] [args] [flags]"),
 	Aliases: []string{i18n.G("r")},
 	// translators: Short description for `recipe` command group
-	Short:   i18n.G("Manage recipes"),
+	Short: i18n.G("Manage recipes"),
 	Long: i18n.G(`A recipe is a blueprint for an app.
 
 It is a bunch of config files which describe how to deploy and maintain an app.
diff --git a/cli/recipe/release.go b/cli/recipe/release.go
index cda46e18..2615c121 100644
--- a/cli/recipe/release.go
+++ b/cli/recipe/release.go
@@ -28,7 +28,7 @@ var RecipeReleaseCommand = &cobra.Command{
 	Use:     i18n.G("release <recipe> [version] [flags]"),
 	Aliases: []string{i18n.G("rl")},
 	// translators: Short description for `recipe release` command
-	Short:   i18n.G("Release a new recipe version"),
+	Short: i18n.G("Release a new recipe version"),
 	Long: i18n.G(`Create a new version of a recipe.
 
 These versions are then published on the Co-op Cloud recipe catalogue. These
diff --git a/cli/recipe/reset.go b/cli/recipe/reset.go
index 9583c7e1..786d1d6a 100644
--- a/cli/recipe/reset.go
+++ b/cli/recipe/reset.go
@@ -14,9 +14,9 @@ var RecipeResetCommand = &cobra.Command{
 	Use:     i18n.G("reset <recipe> [flags]"),
 	Aliases: []string{i18n.G("rs")},
 	// translators: Short description for `recipe reset` command
-	Short:   i18n.G("Remove all unstaged changes from recipe config"),
-	Long:    i18n.G("WARNING: this will delete your changes. Be Careful."),
-	Args:    cobra.ExactArgs(1),
+	Short: i18n.G("Remove all unstaged changes from recipe config"),
+	Long:  i18n.G("WARNING: this will delete your changes. Be Careful."),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
diff --git a/cli/recipe/sync.go b/cli/recipe/sync.go
index 08b76c18..c865e530 100644
--- a/cli/recipe/sync.go
+++ b/cli/recipe/sync.go
@@ -23,7 +23,7 @@ var RecipeSyncCommand = &cobra.Command{
 	Use:     i18n.G("sync <recipe> [version] [flags]"),
 	Aliases: []string{i18n.G("s")},
 	// translators: Short description for `recipe sync` command
-	Short:   i18n.G("Sync recipe version label"),
+	Short: i18n.G("Sync recipe version label"),
 	Long: i18n.G(`Generate labels for the main recipe service.
 
 By convention, the service named "app" using the following format:
diff --git a/cli/recipe/upgrade.go b/cli/recipe/upgrade.go
index c48daf5c..ae91a149 100644
--- a/cli/recipe/upgrade.go
+++ b/cli/recipe/upgrade.go
@@ -42,7 +42,7 @@ var RecipeUpgradeCommand = &cobra.Command{
 	Use:     i18n.G("upgrade <recipe> [flags]"),
 	Aliases: []string{i18n.G("u")},
 	// translators: Short description for `recipe upgrade` command
-	Short:   i18n.G("Upgrade recipe image tags"),
+	Short: i18n.G("Upgrade recipe image tags"),
 	Long: i18n.G(`Upgrade a given <recipe> configuration.
 
 It will update the relevant compose file tags on the local file system.
diff --git a/cli/recipe/version.go b/cli/recipe/version.go
index 0d1b2079..22600d0d 100644
--- a/cli/recipe/version.go
+++ b/cli/recipe/version.go
@@ -18,8 +18,8 @@ var RecipeVersionCommand = &cobra.Command{
 	Use:     i18n.G("versions <recipe> [flags]"),
 	Aliases: []string{i18n.G("v")},
 	// translators: Short description for `recipe versions` command
-	Short:   i18n.G("List recipe versions"),
-	Args:    cobra.ExactArgs(1),
+	Short: i18n.G("List recipe versions"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
diff --git a/cli/run.go b/cli/run.go
index bde1f2d9..beb3f454 100644
--- a/cli/run.go
+++ b/cli/run.go
@@ -22,7 +22,7 @@ import (
 func Run(version, commit string) {
 	rootCmd := &cobra.Command{
 		// translators: `abra` binary name
-		Use:     i18n.G("abra [cmd] [args] [flags]"),
+		Use: i18n.G("abra [cmd] [args] [flags]"),
 		// translators: Short description for `abra` binary
 		Short:   i18n.G("The Co-op Cloud command-line utility belt 🎩🐇"),
 		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
@@ -84,7 +84,7 @@ func Run(version, commit string) {
 		Use:     i18n.G("man [flags]"),
 		Aliases: []string{"m"},
 		// translators: Short description for `man` command
-		Short:   i18n.G("Generate manpage"),
+		Short: i18n.G("Generate manpage"),
 		Example: i18n.G(`  # generate the man pages into /usr/local/share/man/man1
   abra_path=$(which abra)  # pass abra absolute path to sudo below
   sudo $abra_path man
diff --git a/cli/server/add.go b/cli/server/add.go
index e58b4153..45733572 100644
--- a/cli/server/add.go
+++ b/cli/server/add.go
@@ -21,8 +21,8 @@ var ServerAddCommand = &cobra.Command{
 	// translators: `server add` command
 	Use:     i18n.G("add [[server] | --local] [flags]"),
 	Aliases: []string{i18n.G("a")},
-		// translators: Short description for `server add` command
-	Short:   i18n.G("Add a new server"),
+	// translators: Short description for `server add` command
+	Short: i18n.G("Add a new server"),
 	Long: i18n.G(`Add a new server to your configuration so that it can be managed by Abra.
 
 Abra relies on the standard SSH command-line and ~/.ssh/config for client
diff --git a/cli/server/list.go b/cli/server/list.go
index bb0825ee..6620e244 100644
--- a/cli/server/list.go
+++ b/cli/server/list.go
@@ -18,9 +18,9 @@ var ServerListCommand = &cobra.Command{
 	// translators: `server list` command
 	Use:     i18n.G("list [flags]"),
 	Aliases: []string{i18n.G("ls")},
-		// translators: Short description for `server list` command
-	Short:   i18n.G("List managed servers"),
-	Args:    cobra.NoArgs,
+	// translators: Short description for `server list` command
+	Short: i18n.G("List managed servers"),
+	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		dockerContextStore := contextPkg.NewDefaultDockerContextStore()
 		contexts, err := dockerContextStore.Store.List()
diff --git a/cli/server/prune.go b/cli/server/prune.go
index 71c4f017..e08f8bf5 100644
--- a/cli/server/prune.go
+++ b/cli/server/prune.go
@@ -16,7 +16,7 @@ var ServerPruneCommand = &cobra.Command{
 	Use:     i18n.G("prune <server> [flags]"),
 	Aliases: []string{i18n.G("p")},
 	// translators: Short description for `server prune` command
-	Short:   i18n.G("Prune resources on a server"),
+	Short: i18n.G("Prune resources on a server"),
 	Long: i18n.G(`Prunes unused containers, networks, and dangling images.
 
 Use "--volumes/-v" to remove volumes that are not associated with a deployed
diff --git a/cli/server/remove.go b/cli/server/remove.go
index cccb607b..ea8a9407 100644
--- a/cli/server/remove.go
+++ b/cli/server/remove.go
@@ -18,7 +18,7 @@ var ServerRemoveCommand = &cobra.Command{
 	Use:     i18n.G("remove <server> [flags]"),
 	Aliases: []string{i18n.G("rm")},
 	// translators: Short description for `server remove` command
-	Short:   i18n.G("Remove a managed server"),
+	Short: i18n.G("Remove a managed server"),
 	Long: i18n.G(`Remove a managed server.
 
 Abra will remove the internal bookkeeping ($ABRA_DIR/servers/...) and
diff --git a/cli/server/server.go b/cli/server/server.go
index e4f4c8c6..b0f41a87 100644
--- a/cli/server/server.go
+++ b/cli/server/server.go
@@ -11,5 +11,5 @@ var ServerCommand = &cobra.Command{
 	Use:     i18n.G("server [cmd] [args] [flags]"),
 	Aliases: []string{i18n.G("s")},
 	// translators: Short description for `server` command group
-	Short:   i18n.G("Manage servers"),
+	Short: i18n.G("Manage servers"),
 }
diff --git a/cli/updater/updater.go b/cli/updater/updater.go
index 958dbb8f..2b01e1d2 100644
--- a/cli/updater/updater.go
+++ b/cli/updater/updater.go
@@ -36,7 +36,7 @@ var NotifyCommand = &cobra.Command{
 	Use:     i18n.G("notify [flags]"),
 	Aliases: []string{i18n.G("n")},
 	// translators: Short description for `notify` command
-	Short:   i18n.G("Check for available upgrades"),
+	Short: i18n.G("Check for available upgrades"),
 	Long: i18n.G(`Notify on new versions for deployed apps.
 
 If a new patch/minor version is available, a notification is printed.
@@ -77,7 +77,7 @@ var UpgradeCommand = &cobra.Command{
 	Use:     i18n.G("upgrade [[stack] [recipe] | --all] [flags]"),
 	Aliases: []string{i18n.G("u")},
 	// translators: Short description for `app upgrade` command
-	Short:   i18n.G("Upgrade apps"),
+	Short: i18n.G("Upgrade apps"),
 	Long: i18n.G(`Upgrade an app by specifying stack name and recipe. 
 
 Use "--all" to upgrade every deployed app.
@@ -476,7 +476,7 @@ func newKadabraApp(version, commit string) *cobra.Command {
 		Use:     i18n.G("kadabra [cmd] [flags]"),
 		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
 		// translators: Short description for `kababra` binary
-		Short:   i18n.G("The Co-op Cloud auto-updater 🤖 🚀"),
+		Short: i18n.G("The Co-op Cloud auto-updater 🤖 🚀"),
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			log.Logger.SetStyles(charmLog.DefaultStyles())
 			charmLog.SetDefault(log.Logger)
diff --git a/cli/upgrade.go b/cli/upgrade.go
index 9a54da1c..ffb6d776 100644
--- a/cli/upgrade.go
+++ b/cli/upgrade.go
@@ -17,7 +17,7 @@ var UpgradeCommand = &cobra.Command{
 	Use:     i18n.G("upgrade [flags]"),
 	Aliases: []string{"u"},
 	// translators: Short description for `upgrade` command
-	Short:   i18n.G("Upgrade abra"),
+	Short: i18n.G("Upgrade abra"),
 	Long: i18n.G(`Upgrade abra in-place with the latest stable or release candidate.
 
 By default, the latest stable release is downloaded.