diff --git a/pkg/build/cmd/main.go b/pkg/build/cmd/main.go
index d8863710085..bf60c54e7e2 100644
--- a/pkg/build/cmd/main.go
+++ b/pkg/build/cmd/main.go
@@ -168,6 +168,10 @@ func main() {
 			Flags: []cli.Flag{
 				&jobsFlag,
 				&editionFlag,
+				&cli.BoolFlag{
+					Name:  "enterprise2",
+					Usage: "Declare if the edition is enterprise2",
+				},
 			},
 		},
 		{
diff --git a/pkg/build/cmd/uploadpackages.go b/pkg/build/cmd/uploadpackages.go
index 8da2c22b14e..581af791ebc 100644
--- a/pkg/build/cmd/uploadpackages.go
+++ b/pkg/build/cmd/uploadpackages.go
@@ -86,7 +86,7 @@ func UploadPackages(c *cli.Context) error {
 		distDir:     distDir,
 	}
 
-	if cfg.edition == config.EditionEnterprise2 {
+	if cfg.edition == config.EditionEnterprise2 || c.Bool("enterprise2") {
 		if releaseModeConfig.Buckets.ArtifactsEnterprise2 != "" {
 			cfg.Config.Bucket = releaseModeConfig.Buckets.ArtifactsEnterprise2
 		} else {