diff --git a/docs/buildtools/setup/help.go b/docs/buildtools/setup/help.go
index d80931995..67a4dfe32 100644
--- a/docs/buildtools/setup/help.go
+++ b/docs/buildtools/setup/help.go
@@ -1,7 +1,16 @@
 package setup
 
-var Usage = []string{"setmeup [command options]"}
+import (
+	"fmt"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/setup"
+)
+
+var Usage = []string{"setup [command options]",
+	"setup <package manager> [command options]"}
 
 func GetDescription() string {
-	return "Select a package manager to configure to work with JFrog Artifactory."
+	return fmt.Sprintf(
+		`An interactive command to set up your local package manager to work with JFrog Artifactory.
+						 Supported package managers are: %v`,
+		setup.GetSupportedPackageManagersList())
 }
diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go
index 286926c76..baad61109 100644
--- a/utils/cliutils/commandsflags.go
+++ b/utils/cliutils/commandsflags.go
@@ -587,6 +587,7 @@ const (
 	lcDryRun             = lifecyclePrefix + dryRun
 	lcIncludeRepos       = lifecyclePrefix + IncludeRepos
 	lcExcludeRepos       = lifecyclePrefix + ExcludeRepos
+	setupRepo            = repo
 )
 
 var flagsMap = map[string]cli.Flag{
@@ -1723,6 +1724,10 @@ var flagsMap = map[string]cli.Flag{
 		Name:  Reference,
 		Usage: "[Default: false] Generate a Reference Token (alias to Access Token) in addition to the full token (available from Artifactory 7.38.10)` `",
 	},
+	setupRepo: cli.StringFlag{
+		Name:  repo,
+		Usage: "[Optional] Specifies the Artifactory repository name for the selected package manager, replacing the interactive repository selection.` `",
+	},
 }
 
 var commandFlags = map[string][]string{
@@ -2092,7 +2097,7 @@ var commandFlags = map[string][]string{
 		branch, repository, serverId,
 	},
 	Setup: {
-		serverId, url, user, password, accessToken, Project, repo,
+		serverId, url, user, password, accessToken, Project, setupRepo,
 	},
 }