diff --git a/.ci/scripts/android/eabuild.sh b/.ci/scripts/android/eabuild.sh
index 1672f2948..d0cfa8c56 100644
--- a/.ci/scripts/android/eabuild.sh
+++ b/.ci/scripts/android/eabuild.sh
@@ -1,18 +1,30 @@
 #!/bin/bash -ex
 
-# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 export NDK_CCACHE="$(which ccache)"
 ccache -s
 
-export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
-export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
-export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
-export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
-base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
-./gradlew "publishEaReleaseBundle"
+BUILD_FLAVOR="ea"
+
+BUILD_TYPE="release"
+if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
+    BUILD_TYPE="relWithDebInfo"
+fi
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
+    base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+    export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
+    export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
+    export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
+    base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
+fi
+
+cd src/android
+chmod +x ./gradlew
+./gradlew "assemble${BUILD_FLAVOR}${BUILD_TYPE}" "bundle${BUILD_FLAVOR}${BUILD_TYPE}"
 
 ccache -s