diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index faf9e99..bf7a440 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -23,9 +23,17 @@ jobs:
         id: branch_check
         run: |
           REPO_URL="https://git.citron-emu.org/Citron/Emulator.git"
-          BRANCH_NAME="fix/audio-biquad-filter-metroid-prime-4"
-          FULL_HASH=$(git ls-remote "$REPO_URL" "refs/heads/$BRANCH_NAME" | cut -f1)
-          echo "✅ Using branch: $BRANCH_NAME"
+          FEATURE="NULL"
+
+          if git ls-remote --heads "$REPO_URL" "$FEATURE" | grep -q "$FEATURE"; then
+            BRANCH_NAME="$FEATURE"
+            FULL_HASH=$(git ls-remote "$REPO_URL" "$FEATURE" | cut -f1)
+            echo "✅ Using feature branch: $BRANCH_NAME"
+          else
+            BRANCH_NAME="main"
+            FULL_HASH=$(git ls-remote "$REPO_URL" HEAD | cut -f1)
+            echo "⚠️ Feature branch not found, falling back to: $BRANCH_NAME"
+          fi
 
           SHORT_HASH=$(echo "$FULL_HASH" | cut -c1-7)
           echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
@@ -89,9 +97,15 @@ jobs:
       - name: Clone Citron Source Code
         run: |
           REPO_URL="https://git.citron-emu.org/Citron/Emulator.git"
-          BRANCH_NAME="fix/audio-biquad-filter-metroid-prime-4"
-          echo "🌿 Cloning branch: $BRANCH_NAME"
-          git clone --recursive --depth 1 -b "$BRANCH_NAME" "$REPO_URL" citron_source
+          FEATURE="feature/android-game-file-extraction"
+          
+          if [ "${{ needs.check-version.outputs.branch_name }}" = "$FEATURE" ]; then
+            echo "🌿 Cloning feature branch: ${{ needs.check-version.outputs.branch_name }}"
+            git clone --recursive --depth 1 -b "$FEATURE" "$REPO_URL" citron_source
+          else
+            echo "📦 Cloning main branch"
+            git clone --recursive --depth 1 "$REPO_URL" citron_source
+          fi
 
       - name: Clean and Force-Update Submodules
         working-directory: ./citron_source
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 93d81dc..f12f86a 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -25,8 +25,7 @@ jobs:
         id: upstream
         run: |
           REPO_URL="https://git.citron-emu.org/Citron/Emulator.git"
-          BRANCH="fix/audio-biquad-filter-metroid-prime-4"
-          FULL_HASH=$(git ls-remote "$REPO_URL" "refs/heads/$BRANCH" | cut -f1)
+          FULL_HASH=$(git ls-remote "$REPO_URL" HEAD | cut -f1)
           SHORT_HASH=$(echo "$FULL_HASH" | cut -c1-7)
           echo "hash_short=$SHORT_HASH" >> $GITHUB_OUTPUT
           echo "hash_full=$FULL_HASH" >> $GITHUB_OUTPUT
@@ -104,7 +103,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Checkout Upstream Source Code
-        run: git clone --recurse-submodules -b fix/audio-biquad-filter-metroid-prime-4 https://git.citron-emu.org/Citron/Emulator.git emulator
+        run: git clone --recurse-submodules https://git.citron-emu.org/Citron/Emulator.git emulator
 
       - name: Prepare Build Environment
         run: |
@@ -160,7 +159,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Checkout Upstream Repository
-        run: git clone -b fix/audio-biquad-filter-metroid-prime-4 https://git.citron-emu.org/Citron/Emulator.git upstream_repo
+        run: git clone https://git.citron-emu.org/Citron/Emulator.git upstream_repo
 
       - name: Set Version
         id: version
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index a27387d..9d3a23a 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -24,8 +24,7 @@ jobs:
         id: upstream
         run: |
           REPO_URL="https://git.citron-emu.org/Citron/Emulator.git"
-          BRANCH="fix/audio-biquad-filter-metroid-prime-4"
-          FULL_HASH=$(git ls-remote "$REPO_URL" "refs/heads/$BRANCH" | cut -f1)
+          FULL_HASH=$(git ls-remote "$REPO_URL" HEAD | cut -f1)
           SHORT_HASH=$(echo "$FULL_HASH" | cut -c1-7)
           echo "hash_short=$SHORT_HASH" >> $GITHUB_OUTPUT
           echo "hash_full=$FULL_HASH" >> $GITHUB_OUTPUT
@@ -72,7 +71,7 @@ jobs:
           brew install ninja boost catch2 cmake enet fmt ffmpeg glslang hidapi libvpx lld llvm mbedtls nasm nlohmann-json openal-soft sdl2 molten-vk vulkan-headers vulkan-loader webp
 
       - name: Clone Citron Source
-        run: git clone --recursive -b fix/audio-biquad-filter-metroid-prime-4 "https://git.citron-emu.org/Citron/Emulator.git" citron
+        run: git clone --recursive "https://git.citron-emu.org/Citron/Emulator.git" citron
 
       - name: Patch CMakeLists for macOS Compatibility
         working-directory: ./citron
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index da3ac5c..d11f33f 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -24,8 +24,7 @@ jobs:
         id: upstream
         run: |
           REPO_URL="https://git.citron-emu.org/Citron/Emulator.git"
-          BRANCH="fix/audio-biquad-filter-metroid-prime-4"
-          FULL_HASH=$(git ls-remote "$REPO_URL" "refs/heads/$BRANCH" | cut -f1)
+          FULL_HASH=$(git ls-remote "$REPO_URL" HEAD | cut -f1)
           SHORT_HASH=$(echo "$FULL_HASH" | cut -c1-7)
           echo "hash_short=$SHORT_HASH" >> $GITHUB_OUTPUT
           echo "hash_full=$FULL_HASH" >> $GITHUB_OUTPUT
@@ -83,7 +82,7 @@ jobs:
           echo "C:\VulkanSDK\1.3.283.0\Bin" | Out-File -FilePath $env:GITHUB_PATH -Append
       - name: Clone Citron Source
         shell: bash
-        run: git clone --recursive -b fix/audio-biquad-filter-metroid-prime-4 "https://git.citron-emu.org/Citron/Emulator.git" citron
+        run: git clone --recursive "https://git.citron-emu.org/Citron/Emulator.git" citron
       - name: Get Nightly Version
         id: version
         working-directory: ./citron
diff --git a/PKGBUILD b/PKGBUILD
index 5eedc5c..9f1c57e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ makedepends=(
 )
 
 # This points to the source code repository
-source=("git+https://git.citron-emu.org/Citron/Emulator.git#branch=fix/audio-biquad-filter-metroid-prime-4")
+source=("git+https://git.citron-emu.org/citron/emulator.git")
 sha256sums=('SKIP')
 
 # This function automatically generates a version string based on the latest git commit
diff --git a/build-citron.sh b/build-citron.sh
index 1a91b0f..985bd59 100644
--- a/build-citron.sh
+++ b/build-citron.sh
@@ -13,7 +13,7 @@ else
 fi
 
 # --- Source Code Checkout and Versioning ---
-git clone --recursive -b fix/audio-biquad-filter-metroid-prime-4 "https://git.citron-emu.org/Citron/Emulator.git" ./citron
+git clone --recursive "https://git.citron-emu.org/citron/emulator.git" ./citron
 cd ./citron
 
 if [ "$DEVEL" = 'true' ]; then