diff --git a/.github/workflows/github_action_build.yml b/.github/workflows/github_action_build.yml
index f5c96d3..ff0dd3e 100644
--- a/.github/workflows/github_action_build.yml
+++ b/.github/workflows/github_action_build.yml
@@ -43,7 +43,7 @@ jobs:
 
           APK_DIR_PATH="./app/build/outputs/apk/debug"
           APK_VERSION_TAG="$RELEASE_VERSION_NAME.github.debug" # Note the ".", GITHUB_SHA will already have "+" before it
-          APK_BASENAME_PREFIX="termux-boot_$APK_VERSION_TAG"
+          APK_BASENAME_PREFIX="termux-boot-app_$APK_VERSION_TAG"
 
           # Used by upload step later
           echo "APK_DIR_PATH=$APK_DIR_PATH" >> $GITHUB_ENV
diff --git a/.github/workflows/github_release_build.yml b/.github/workflows/github_release_build.yml
index 19fbbf5..7a8b44a 100644
--- a/.github/workflows/github_release_build.yml
+++ b/.github/workflows/github_release_build.yml
@@ -39,7 +39,7 @@ jobs:
 
           APK_DIR_PATH="./app/build/outputs/apk/debug"
           APK_VERSION_TAG="$RELEASE_VERSION_NAME+github.debug"
-          APK_BASENAME_PREFIX="termux-boot_$APK_VERSION_TAG"
+          APK_BASENAME_PREFIX="termux-boot-app_$APK_VERSION_TAG"
 
           echo "Building APK file for '$RELEASE_VERSION_NAME' release with '$APK_VERSION_TAG' tag"
           export TERMUX_BOOT_APP_BUILD__APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
diff --git a/app/build.gradle b/app/build.gradle
index e98e735..88ab4f3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,11 +47,8 @@ android {
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            if (variant.buildType.name == "debug") {
-                outputFileName = new File("termux-boot_" + (apkVersionTag ? apkVersionTag : "debug") + ".apk")
-            } else if (variant.buildType.name == "release") {
-                outputFileName = new File("termux-boot_" + (apkVersionTag ? apkVersionTag : "release") + ".apk")
-            }
+            outputFileName = new File("termux-boot-app_" +
+                    (apkVersionTag ? apkVersionTag : "v" + versionName + "+" + variant.buildType.name) + ".apk")
         }
     }
 }