diff --git a/.ci/android.sh b/.ci/android.sh
index 3cfa902fe..b1c4faf40 100755
--- a/.ci/android.sh
+++ b/.ci/android.sh
@@ -1,9 +1,7 @@
 #!/bin/bash -ex
 
 export NDK_CCACHE=$(which ccache)
-[ "$GITHUB_REPOSITORY" = "citra-emu/citra-canary" ] &&
-   BUILD_FLAVOR=canary ||
-   BUILD_FLAVOR=nightly
+BUILD_FLAVOR=nightly
 
 if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
     export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5c609e67d..ff6fe9736 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -198,7 +198,7 @@ jobs:
             ${{ runner.os }}-android-
       - name: Set tag name
         run: |
-          if [[ "$GITHUB_REF_NAME" =~ ^canary- ]] || [[ "$GITHUB_REF_NAME" =~ ^nightly- ]]; then
+          if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
               echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
           fi
           echo $GIT_TAG_NAME