diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 7c32cf8e35..b702969569 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -16,10 +16,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -32,9 +32,13 @@ jobs:
       - name: Build
         run: ./gradlew assembleArmv8Debug
 
+      - name: Determine the latest Build Tools version installed
+        shell: bash
+        run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
+
       - name: Sign APK
         id: sign_app
-        uses: tiann/zipalign-sign-android-release@v1.1.4
+        uses: kevin-david/zipalign-sign-android-release@main
         with:
           releaseDirectory: app/build/outputs/apk/armv8/debug/
           signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
@@ -43,13 +47,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
           zipAlign: true
         env:
-          BUILD_TOOLS_VERSION: "34.0.0"
-
-      - name: Delete unsigned file
-        run: |
-          cd app/build/outputs/apk/armv8/debug/
-          shopt -s extglob
-          rm -rf !(*-signed*)
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
       - name: Build Version
         run: ./gradlew getVersion
@@ -64,9 +62,10 @@ jobs:
         id: git-branch-name
         uses: EthanSK/git-branch-name-action@main
 
-      - name: Rename APK file
+      - name: Delete unsigned APK file and rename signed APK file
         run: |
-          mv app/build/outputs/apk/armv8/debug/*.apk app/build/outputs/apk/armv8/debug/snapenhance-${{ env.version }}-armv8-${{ steps.version-env.outputs.sha_short }}.apk
+          find app/build/outputs/apk/armv8/debug/ -type f ! -name '*-signed*' -delete
+          mv ${{steps.sign_app.outputs.signedReleaseFile}} app/build/outputs/apk/armv8/debug/snapenhance-${{ env.version }}-armv8-${{ steps.version-env.outputs.sha_short }}.apk
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -82,10 +81,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -98,9 +97,13 @@ jobs:
       - name: Build
         run: ./gradlew assembleArmv7Debug
 
+      - name: Determine the latest Build Tools version installed
+        shell: bash
+        run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
+
       - name: Sign APK
         id: sign_app
-        uses: tiann/zipalign-sign-android-release@v1.1.4
+        uses: kevin-david/zipalign-sign-android-release@main
         with:
           releaseDirectory: app/build/outputs/apk/armv7/debug/
           signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
@@ -109,13 +112,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
           zipAlign: true
         env:
-          BUILD_TOOLS_VERSION: "34.0.0"
-
-      - name: Delete unsigned file
-        run: |
-          cd app/build/outputs/apk/armv7/debug/
-          shopt -s extglob
-          rm -rf !(*-signed*)
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
       - name: Build Version
         run: ./gradlew getVersion
@@ -130,9 +127,10 @@ jobs:
         id: git-branch-name
         uses: EthanSK/git-branch-name-action@main
 
-      - name: Rename APK file
+      - name: Delete unsigned APK file and rename signed APK file
         run: |
-          mv app/build/outputs/apk/armv7/debug/*.apk app/build/outputs/apk/armv7/debug/snapenhance-${{ env.version }}-armv7-${{ steps.version-env.outputs.sha_short }}.apk
+          find app/build/outputs/apk/armv7/debug/ -type f ! -name '*-signed*' -delete
+          mv ${{steps.sign_app.outputs.signedReleaseFile}} app/build/outputs/apk/armv7/debug/snapenhance-${{ env.version }}-armv7-${{ steps.version-env.outputs.sha_short }}.apk
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -148,10 +146,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -164,9 +162,13 @@ jobs:
       - name: Build
         run: ./gradlew assembleAllDebug
 
+      - name: Determine the latest Build Tools version installed
+        shell: bash
+        run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
+
       - name: Sign APK
         id: sign_app
-        uses: tiann/zipalign-sign-android-release@v1.1.4
+        uses: kevin-david/zipalign-sign-android-release@main
         with:
           releaseDirectory: app/build/outputs/apk/all/debug/
           signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
@@ -175,13 +177,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
           zipAlign: true
         env:
-          BUILD_TOOLS_VERSION: "34.0.0"
-
-      - name: Delete unsigned file
-        run: |
-          cd app/build/outputs/apk/all/debug/
-          shopt -s extglob
-          rm -rf !(*-signed*)
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
       - name: Build Version
         run: ./gradlew getVersion
@@ -196,9 +192,10 @@ jobs:
         id: git-branch-name
         uses: EthanSK/git-branch-name-action@main
 
-      - name: Rename APK files
+      - name: Delete unsigned APK file and rename signed APK file
         run: |
-          mv app/build/outputs/apk/all/debug/*.apk app/build/outputs/apk/all/debug/snapenhance-${{ env.version }}-universal-${{ steps.version-env.outputs.sha_short }}.apk
+          find app/build/outputs/apk/all/debug/ -type f ! -name '*-signed*' -delete
+          mv ${{steps.sign_app.outputs.signedReleaseFile}} app/build/outputs/apk/all/debug/snapenhance-${{ env.version }}-universal-${{ steps.version-env.outputs.sha_short }}.apk
 
       - name: Upload universal
         uses: actions/upload-artifact@v4
@@ -214,10 +211,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -241,10 +238,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -258,4 +255,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: core
-          path: app/build/outputs/apk/core/debug/*.apk
\ No newline at end of file
+          path: app/build/outputs/apk/core/debug/*.apk
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 882bf68183..8244a46bea 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -35,6 +35,10 @@ jobs:
 
       - name: Build
         run: ./gradlew assembleArmv8Release
+
+      - name: Determine the latest Build Tools version installed
+        shell: bash
+        run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
         
       - name: Sign APK
         id: sign_app
@@ -45,18 +49,15 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-
-      - name: Delete unsigned file
-        run: |
-          cd app/build/outputs/apk/armv8/release/
-          shopt -s extglob
-          rm !(*-signed*)
+          zipAlign: true
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
       
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: snapenhance-armv8-release
-          path: app/build/outputs/apk/armv8/release/*.apk
+          path: ${{steps.sign_app.outputs.signedReleaseFile}}
           
   job_armv7:
     runs-on: macos-latest
@@ -66,10 +67,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -82,6 +83,10 @@ jobs:
       - name: Build
         run: ./gradlew assembleArmv7Release
 
+      - name: Determine the latest Build Tools version installed
+        shell: bash
+        run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
+
       - name: Sign APK
         id: sign_app
         uses: kevin-david/zipalign-sign-android-release@main
@@ -91,18 +96,15 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-
-      - name: Delete unsigned file
-        run: |
-          cd app/build/outputs/apk/armv7/release/
-          shopt -s extglob
-          rm !(*-signed*)
+          zipAlign: true
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: snapenhance-armv7-release
-          path: app/build/outputs/apk/armv7/release/*.apk
+          path: ${{steps.sign_app.outputs.signedReleaseFile}}
 
   job_universal:
     runs-on: macos-latest
@@ -112,10 +114,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -127,7 +129,11 @@ jobs:
 
       - name: Build
         run: ./gradlew assembleAllRelease
-        
+
+      - name: Determine the latest Build Tools version installed
+        shell: bash
+        run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
+
       - name: Sign APK
         id: sign_app
         uses: kevin-david/zipalign-sign-android-release@main
@@ -137,18 +143,15 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-
-      - name: Delete unsigned file
-        run: |
-          cd app/build/outputs/apk/all/release/
-          shopt -s extglob
-          rm !(*-signed*)
+          zipAlign: true
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
       - name: Upload universal
         uses: actions/upload-artifact@v4
         with:
           name: snapenhance-universal-release
-          path: app/build/outputs/apk/all/release/*.apk
+          path: ${{steps.sign_app.outputs.signedReleaseFile}}
 
   job_manager:
     runs-on: ubuntu-latest
@@ -158,10 +161,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -171,6 +174,10 @@ jobs:
       - name: Build
         run: ./gradlew manager:assembleRelease
 
+      - name: Determine the latest Build Tools version installed
+        shell: bash
+        run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
+
       - name: Sign APK
         id: sign_app
         uses: kevin-david/zipalign-sign-android-release@main
@@ -180,18 +187,15 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-
-      - name: Delete unsigned file
-        run: |
-          cd manager/build/outputs/apk/release/
-          shopt -s extglob
-          rm !(*-signed*)
+          zipAlign: true
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: manager
-          path: manager/build/outputs/apk/release/*.apk
+          path: ${{steps.sign_app.outputs.signedReleaseFile}}
 
   job_release:
     runs-on: ubuntu-latest
@@ -203,10 +207,10 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -234,4 +238,4 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: ${{ inputs.prerelease }}
           files: bins/*.apk
-          automatic_release_tag: v${{ env.version }}
\ No newline at end of file
+          automatic_release_tag: v${{ env.version }}