diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 350eebb..afae26f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,12 +36,13 @@ jobs:
         version: ${{ matrix.ghidra }}
 
     - name: Build the extension for Ghidra ${{ matrix.ghidra }}
-      run: gradle -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }} -p GhidraNes
+      run: gradle -PGHIDRA_INSTALL_DIR="${GHIDRA_INSTALL_DIR}" -p GhidraNes
 
     - name: Prepare artifact
       id: prepare
       run: |
-        (cd GhidraNes/dist && unzip *.zip)
+        mkdir -p GhidraNes/dist/artifact
+        (cd GhidraNes/dist/artifact && unzip ../*.zip)
         echo "short_sha=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
         echo "date=$(date -u +'%Y%m%d')" >> "$GITHUB_OUTPUT"
 
@@ -49,4 +50,4 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: ghidra_${{ matrix.ghidra }}_${{ steps.prepare.outputs.short_sha }}_${{ steps.prepare.outputs.date }}_GhidraNes
-        path: GhidraNes/dist/GhidraNes
+        path: GhidraNes/dist/artifact