diff --git a/scripts/downloadGapps.py b/scripts/downloadGapps.py
index a81fd46..a96f999 100644
--- a/scripts/downloadGapps.py
+++ b/scripts/downloadGapps.py
@@ -15,8 +15,8 @@ if not os.path.exists(Path.cwd().parent / "download"):
 download_dir = Path.cwd().parent / "download"
 
 arch = sys.argv[1]
-# TODO: Keep it pico since other variants of opengapps are unable to boot successfully
-variant = sys.argv[2] if 0 else "pico"
+
+variant = sys.argv[2]
 abi_map = {"x64": "x86_64", "arm64": "arm64"}
 # TODO: keep it 11.0 since 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
diff --git a/scripts/run.sh b/scripts/run.sh
index b87d0d1..3e6fc6a 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -164,6 +164,7 @@ if [ -f "$WSA_WORK_ENV" ]; then rm -f "${WSA_WORK_ENV:?}"; fi
 export WSA_WORK_ENV
 python3 extractWSA.py "$ARCH" "$WORK_DIR" || abort
 echo -e "Extract done\n"
+source "${WORK_DIR:?}/ENV"
 
 echo "Download Magisk"
 python3 downloadMagisk.py "$ARCH" "$MAGISK_VER" "$WORK_DIR" || abort
@@ -172,7 +173,11 @@ echo -e "done\n"
 if [ $GAPPS_VARIANT != 'none' ] && [ $GAPPS_VARIANT != '' ]; then
     if [ $GAPPS_BRAND = "OpenGapps" ]; then
         echo "Download OpenGApps"
-        python3 downloadGapps.py "$ARCH" "$MAGISK_VER" || abort
+        if [ "$WSA_MAIN_VER" -ge 2204 ]; then
+            python3 downloadGapps.py "$ARCH" "pico" || abort # TODO: Keep it pico since other variants of opengapps are unable to boot successfully
+        else
+            python3 downloadGapps.py "$ARCH" "$GAPPS_VARIANT" || abort
+        fi
         echo -e "Download done\n"
     fi
     echo "Extract GApps"
@@ -546,7 +551,7 @@ EOF
 echo -e "Remove signature and add scripts done\n"
 
 echo "Generate info"
-source "${WORK_DIR:?}/ENV"
+
 if [[ "$ROOT_SOL" = "none" ]]; then
     name1=""
 elif [[ "$ROOT_SOL" = "" ]]; then