diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index aabd321..9d584bb 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -79,7 +79,6 @@ jobs:
               run: |
                   DOWNLOAD_DIR=../download
                   DOWNLOAD_CONF_NAME=download.list
-                  OUTPUT_DIR=../output
 
                   declare -A opts=( ["ARCH,X86_64"]="x64" ["ARCH,AArch64"]="arm64" ["RELEASE_TYPE,General Availability Channel"]="retail" ["RELEASE_TYPE,Release Preview Channel"]="release preview" ["RELEASE_TYPE,Beta Channel"]="insider slow" ["RELEASE_TYPE,Dev Channel"]="insider fast" ["MAGISK_VER,Stable"]="stable" ["MAGISK_VER,Beta"]="beta" ["MAGISK_VER,Canary"]="canary" ["MAGISK_VER,Debug"]="debug" ["GAPPS_VAR,None"]="none" ["GAPPS_VAR,Pico"]="pico" ["GAPPS_VAR,Full"]="full" ["GAPPS_VAR,MindTheGapps (URL)"]="MindTheGapps" ["REMOVE_AMAZON,true"]="--remove-amazon" ["REMOVE_AMAZON,false"]="" ["OFFLINE_MODE,true"]="--offline" ["OFFLINE_MODE,false"]="" )
 
@@ -109,6 +108,8 @@ jobs:
                   if [ "$ARCH" != "arm64" ]; then
                     GAPPS_VAR="${opts[GAPPS_VAR,${{ inputs.gapps_var }}]}"
                   else
+                    # TODO: keep it 11.0 since official opengapps does not support 12+ yet
+                    # As soon as opengapps is available for 12+, we need to get the sdk/release from build.prop and download the corresponding version
                     GAPPS_VAR="pico"
                   fi
 
@@ -136,7 +137,8 @@ jobs:
                   ./build.sh "${COMMAND_LINE[@]}"
             - name: Generate Release Asset Name
               run: |
-                  cd ../output
+                  OUTPUT_DIR=../output
+                  cd $OUTPUT_DIR
 
                   magisk_ver="${{ inputs.magisk_ver }}"
                   gapps_var="${{ inputs.gapps_var }}"
@@ -166,6 +168,7 @@ jobs:
                   echo "release_asset_name=WSA_${{ env.WSA_VER }}$magiskVer$gappsVar$amazon_${{ inputs.arch }}" >> $GITHUB_ENV
             - name: Compress Asset
               run: |
+                  find ./ -maxdepth 1 -type d -not -path './' -exec mv "{}" WSA \;
                   zip -qrv "${{ env.release_asset_name }}.zip" ./*
             - name: Upload Asset
               uses: softprops/action-gh-release@v1