diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0361fb5ab..58d27e5bd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,10 +45,9 @@ jobs:
           tools/make-firefox.sh ${{ steps.release_info.outputs.VERSION }}
           tools/make-thunderbird.sh ${{ steps.release_info.outputs.VERSION }}
           tools/make-npm.sh ${{ steps.release_info.outputs.VERSION }}
-          tools/make-mv3.sh all
       - name: Build MV3 packages
         run: |
-          tools/make-mv3.sh
+          tools/make-mv3.sh all
           echo ::set-output name=MV3PACKAGE::$(basename $(ls dist/build/uBlock0_*.mv3.zip))
       - name: Upload Chromium package
         uses: actions/upload-release-asset@v1
diff --git a/Makefile b/Makefile
index 41b600af7..6765a1cef 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,9 @@ mv3: tools/make-mv3.sh $(sources) $(platform)
 
 mv3-quick: tools/make-mv3.sh $(sources) $(platform)
 	tools/make-mv3.sh quick
+	
+mv3-full: tools/make-mv3.sh $(sources) $(platform)
+	tools/make-mv3.sh all
 
 # Update submodules.
 update-submodules:
diff --git a/tools/make-mv3.sh b/tools/make-mv3.sh
index c584bf200..2eaebcc33 100755
--- a/tools/make-mv3.sh
+++ b/tools/make-mv3.sh
@@ -53,15 +53,17 @@ fi
 echo "*** uBlock0.mv3: extension ready"
 echo "Extension location: $DES/"
 
-echo "*** uBlock0.mv3: Creating webstore package..."
-PACKAGENAME=uBlock0_$(jq -r .version $DES/manifest.json).mv3.zip
-TMPDIR=$(mktemp -d)
-mkdir -p $TMPDIR
-cp -R $DES/* $TMPDIR/
-cd $TMPDIR > /dev/null
-rm log.txt
-zip $PACKAGENAME -qr ./*
-cp $PACKAGENAME $(dirname $DES/)/
-cd - > /dev/null
-rm -rf $TMPDIR
-echo "Package location: $(pwd)/$PACKAGENAME" 
+if [ "$1" = "all" ]; then
+    echo "*** uBlock0.mv3: Creating webstore package..."
+    PACKAGENAME=uBlock0_$(jq -r .version $DES/manifest.json).mv3.zip
+    TMPDIR=$(mktemp -d)
+    mkdir -p $TMPDIR
+    cp -R $DES/* $TMPDIR/
+    cd $TMPDIR > /dev/null
+    rm log.txt
+    zip $PACKAGENAME -qr ./*
+    cp $PACKAGENAME $(dirname $DES/)/
+    cd - > /dev/null
+    rm -rf $TMPDIR
+    echo "Package location: $(pwd)/$PACKAGENAME" 
+fi