diff --git a/buildtools/cli.go b/buildtools/cli.go
index 509defd9d..df8c3867f 100644
--- a/buildtools/cli.go
+++ b/buildtools/cli.go
@@ -1042,7 +1042,7 @@ func buildCmd(c *cli.Context) error {
 	}
 
 	// Extract build configuration and arguments
-	_, rtDetails, _, _, _, cleanArgs, buildConfiguration, err := extractDockerOptionsFromArgs(c.Args())
+	_, rtDetails, _, skipLogin, _, cleanArgs, buildConfiguration, err := extractDockerOptionsFromArgs(c.Args())
 	if err != nil {
 		return err
 	}
@@ -1051,12 +1051,14 @@ func buildCmd(c *cli.Context) error {
 		return err
 	}
 
-	// Login to the docker registry
-	err = loginCmd(c)
-	if err != nil {
-		return err
+	if !skipLogin {
+		// Login to the docker registry
+		err = loginCmd(c)
+		if err != nil {
+			return err
+		}
 	}
-
+	
 	dockerOptions := strategies.DockerBuildOptions{
 		DockerFilePath: dockerFilePath,
 		PushExpected:   pushOption,