diff --git a/docker.go b/docker.go
index 7d840d1..7d5d612 100644
--- a/docker.go
+++ b/docker.go
@@ -202,12 +202,13 @@ func (p Plugin) Exec() error {
 		cmds = append(cmds, exec.Command(dockerExe, "image", "rm", p.Build.Name))
 		cmds = append(cmds, exec.Command("tar", "x", "-C", "plugin/rootfs", "-f", "tmp.tar"))
 		cmds = append(cmds, exec.Command("cp", p.Build.PluginConfig, "plugin/config.json"))
-		cmds = append(cmds, exec.Command(dockerExe, "plugin", "create", p.Build.Repo, "plugin"))
 	}
 
 	for _, tag := range p.Build.Tags {
 		if !p.Build.IsPlugin {
 			cmds = append(cmds, commandTag(p.Build, tag)) // docker tag
+		} else {
+			cmds = append(cmds, exec.Command(dockerExe, "plugin", "create", p.Build.Repo+":"+tag, "plugin"))
 		}
 
 		if !p.Dryrun {