diff --git a/dev-tools/mage/dockerbuilder.go b/dev-tools/mage/dockerbuilder.go
index 986209609d2..0fba00b4e26 100644
--- a/dev-tools/mage/dockerbuilder.go
+++ b/dev-tools/mage/dockerbuilder.go
@@ -195,17 +195,18 @@ func (b *dockerBuilder) expandDockerfile(templatesDir string, data map[string]in
 }
 
 func (b *dockerBuilder) dockerBuild(variant string) (string, error) {
-	tag := fmt.Sprintf("%s:%s", b.imageName, b.Version)
+	imageName := b.imageName
 	if variant != "" {
-		tag = fmt.Sprintf("%s-%s", tag, variant)
+		imageName = fmt.Sprintf("%s-%s", imageName, variant)
 	}
+	taggedImageName := fmt.Sprintf("%s:%s", imageName, b.Version)
 	if b.Snapshot {
-		tag = tag + "-SNAPSHOT"
+		taggedImageName = taggedImageName + "-SNAPSHOT"
 	}
 	if repository, _ := b.ExtraVars["repository"]; repository != "" {
-		tag = fmt.Sprintf("%s/%s", repository, tag)
+		taggedImageName = fmt.Sprintf("%s/%s", repository, taggedImageName)
 	}
-	return tag, sh.Run("docker", "build", "-t", tag, b.buildDir)
+	return taggedImageName, sh.Run("docker", "build", "-t", taggedImageName, b.buildDir)
 }
 
 func (b *dockerBuilder) dockerSave(tag string) error {