diff --git a/buildtools/cli.go b/buildtools/cli.go
index bb8e4d84d..bda336acf 100644
--- a/buildtools/cli.go
+++ b/buildtools/cli.go
@@ -965,7 +965,7 @@ func setupCmd(c *cli.Context) (err error) {
 	if err != nil {
 		return err
 	}
-	setupCmd.SetServerDetails(artDetails).SetRepoName(c.String("repo")).SetProjectKey(c.String(cliutils.Project))
+	setupCmd.SetServerDetails(artDetails).SetRepoName(c.String("repo")).SetProjectKey(cliutils.GetProject(c))
 	return commands.Exec(setupCmd)
 }