diff --git a/buildx.sh b/buildx.sh
index 057942f..ddc7993 100755
--- a/buildx.sh
+++ b/buildx.sh
@@ -75,9 +75,12 @@ main() {
         sed -e 's/^FROM alpine:.*$/FROM alpine:edge/' Dockerfile > Dockerfile.edge
         BUILD_ARGS="-f Dockerfile.edge  --tag $IMAGE:edge $BUILD_ARGS"
         IMAGE="$IMAGE:edge"
-    else
+    elif [ "$EVENT" = push ] ; then
         BUILD_ARGS="--tag $IMAGE:latest --tag $IMAGE:$TAG --tag ${IMAGE}:${TAG%%-*} --tag ${IMAGE}:stable $BUILD_ARGS"
         IMAGE="$IMAGE:latest"
+    else
+        BUILD_ARGS="--tag $IMAGE:latest --tag $IMAGE:$TAG --tag ${IMAGE}:${TAG%%-*} $BUILD_ARGS"
+        IMAGE="$IMAGE:latest"
     fi
     build_image "$BUILD_ARGS"