diff --git a/buildimage.sh b/buildimage.sh
index ca75dc82307edaf2f4104ce524010ad9461ffc10..094d762018774a0c027645cc4b45565dfce2c5cb 100755
--- a/buildimage.sh
+++ b/buildimage.sh
@@ -31,9 +31,9 @@ if [ -n "$REG" ]; then
 	docker tag "$IMAGENAME-dev" "$2/$IMAGENAME-dev"
 	docker push "$2/$IMAGENAME-dev"
 	if [ -n "$3" ]; then
-		docker tag "$IMAGENAME" "$2/$IMAGENAME-$3"
+		docker tag "$IMAGENAME-dev" "$2/$IMAGENAME-$3"
 		docker push "$2/$IMAGENAME-$3"
-		docker tag "$IMAGENAME" "$2/$IMAGENAME-latest"
+		docker tag "$IMAGENAME-dev" "$2/$IMAGENAME-latest"
 		docker push "$2/$IMAGENAME-latest"
 	fi
 fi