diff --git a/dev-tools/mage/dockerbuilder.go b/dev-tools/mage/dockerbuilder.go
index 4439f9cc75e..89d1a926f6e 100644
--- a/dev-tools/mage/dockerbuilder.go
+++ b/dev-tools/mage/dockerbuilder.go
@@ -190,7 +190,9 @@ func (b *dockerBuilder) dockerBuild() (string, error) {
 	}
 	if repository, _ := b.ExtraVars["repository"]; repository != "" {
 		tag = fmt.Sprintf("%s/%s", repository, tag)
-		aliasTag = fmt.Sprintf("%s/%s", repository, aliasTag)
+		if b.Snapshot {
+				aliasTag = fmt.Sprintf("%s/%s", repository, aliasTag)
+		}
 	}
 
 	args := []string{