diff --git a/.github/workflows/builds.yaml b/.github/workflows/builds.yaml
index 3d3cd1e..a63a1ac 100644
--- a/.github/workflows/builds.yaml
+++ b/.github/workflows/builds.yaml
@@ -21,10 +21,18 @@ jobs:
       - name: Create the package
         shell: bash
         run: |
-          ./bin/build-addon.sh
+          ./bin/build-addon.sh nightly.zip
+
+      - name: Repackaging
+        shell: bash
+        run: |
+          cd src/web-ext-artifacts
+          mkdir nightly
+          cd nightly
+          unzip ../nightly.zip
 
       - name: Uploading
         uses: actions/upload-artifact@v1
         with:
             name: ${{matrix.config.name}} Build
-            path: src/web-ext-artifacts
+            path: src/web-ext-artifacts/nightly
diff --git a/bin/build-addon.sh b/bin/build-addon.sh
index afb5b84..333c651 100755
--- a/bin/build-addon.sh
+++ b/bin/build-addon.sh
@@ -18,4 +18,9 @@ npm test
 
 print Y "Creating the final package..."
 cd src || die
-$(npm bin)/web-ext build --overwrite-dest || die
+
+if [[ $# -gt 0 ]]; then
+  EXTRA_PARAMS="--filename $1"
+fi
+
+$(npm bin)/web-ext build --overwrite-dest $EXTRA_PARAMS || die