diff --git a/.github/workflows/build_benchmark.yml b/.github/workflows/build_benchmark.yml
index 85f9bd0fb..2f9dd1c4c 100644
--- a/.github/workflows/build_benchmark.yml
+++ b/.github/workflows/build_benchmark.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Prepare env
         id: prepare_env
         run: |
-          set -e
+          set -x
 
           commit_count=$(git rev-list --count HEAD)
           echo "COMMIT_COUNT=$commit_count"
@@ -45,7 +45,7 @@ jobs:
       - name: Tag name
         id: tag_name
         run: |
-          set -e
+          set -x
 
           if [ "${{ steps.get_tag.outputs.VERSION_TAG }}" = "master" ]; then
             tag_name=${{ steps.get_tag.outputs.VERSION_TAG }}-r${{ steps.prepare_env.outputs.COMMIT_COUNT }}
@@ -98,27 +98,12 @@ jobs:
       - name: Get SHA & clean up build artifacts
         id: get_sha
         run: |
-          set -e
-
+          set -ex
           mv app/build/outputs/apk/${{ needs.prepare-build.outputs.ARTIFACTS_PREFIX }}-universal-benchmark-signed.apk Komikku-${{ needs.prepare-build.outputs.TAG_NAME }}.apk
-          sha=`sha256sum Komikku-${{ needs.prepare-build.outputs.TAG_NAME }}.apk | awk '{ print $1 }'`
-          echo "APK_UNIVERSAL_SHA=$sha" >> $GITHUB_OUTPUT
-
           mv app/build/outputs/apk/${{ needs.prepare-build.outputs.ARTIFACTS_PREFIX }}-arm64-v8a-benchmark-signed.apk Komikku-arm64-v8a-${{ needs.prepare-build.outputs.TAG_NAME }}.apk
-          sha=`sha256sum Komikku-arm64-v8a-${{ needs.prepare-build.outputs.TAG_NAME }}.apk | awk '{ print $1 }'`
-          echo "APK_ARM64_V8A_SHA=$sha" >> $GITHUB_OUTPUT
-
           mv app/build/outputs/apk/${{ needs.prepare-build.outputs.ARTIFACTS_PREFIX }}-armeabi-v7a-benchmark-signed.apk Komikku-armeabi-v7a-${{ needs.prepare-build.outputs.TAG_NAME }}.apk
-          sha=`sha256sum Komikku-armeabi-v7a-${{ needs.prepare-build.outputs.TAG_NAME }}.apk | awk '{ print $1 }'`
-          echo "APK_ARMEABI_V7A_SHA=$sha" >> $GITHUB_OUTPUT
-
           mv app/build/outputs/apk/${{ needs.prepare-build.outputs.ARTIFACTS_PREFIX }}-x86-benchmark-signed.apk Komikku-x86-${{ needs.prepare-build.outputs.TAG_NAME }}.apk
-          sha=`sha256sum Komikku-x86-${{ needs.prepare-build.outputs.TAG_NAME }}.apk | awk '{ print $1 }'`
-          echo "APK_X86_SHA=$sha" >> $GITHUB_OUTPUT
-
           mv app/build/outputs/apk/${{ needs.prepare-build.outputs.ARTIFACTS_PREFIX }}-x86_64-benchmark-signed.apk Komikku-x86_64-${{ needs.prepare-build.outputs.TAG_NAME }}.apk
-          sha=`sha256sum Komikku-x86_64-${{ needs.prepare-build.outputs.TAG_NAME }}.apk | awk '{ print $1 }'`
-          echo "APK_X86_64_SHA=$sha" >> $GITHUB_OUTPUT
 
       - name: Upload artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
diff --git a/.github/workflows/build_dispatch_preview.yml b/.github/workflows/build_dispatch_preview.yml
index dfdb23383..7a962488e 100644
--- a/.github/workflows/build_dispatch_preview.yml
+++ b/.github/workflows/build_dispatch_preview.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Prepare build
         id: prepare_build
         run: |
-          set -e
+          set -x
 
           commit_count=$(git rev-list --count HEAD)
           echo "COMMIT_COUNT=$commit_count" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/build_preview.yml b/.github/workflows/build_preview.yml
index 420685fd1..ab393bc84 100644
--- a/.github/workflows/build_preview.yml
+++ b/.github/workflows/build_preview.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Curren commit
         id: current_commit
         run: |
-          set -e
+          set -x
 
           commit_count=$(git rev-list --count HEAD)
           echo "COMMIT_COUNT=$commit_count"
@@ -67,7 +67,7 @@ jobs:
       - name: Previous commit
         id: previous_commit
         run: |
-          set -e
+          set -x
 
           commit_count_diff=$(git rev-list --count "${{ steps.last_release.outputs.tag_name }}"..HEAD)
 
@@ -86,7 +86,7 @@ jobs:
       - name: Prepare env
         id: prepare_env
         run: |
-          set -e
+          set -x
 
           tag_prefix=r
           artifacts_prefix=preview/app
@@ -102,7 +102,7 @@ jobs:
       - name: Commit logs
         id: commit_logs
         run: |
-          set -e
+          set -x
 
           echo "COMMIT_LOGS<<{delimiter}
           $(curl -H "Accept: application/vnd.github.v3+json" \
diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index f80512a4e..a624388e9 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -37,6 +37,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Dependency Review
+        uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
+
       - name: Validate Gradle Wrapper
         uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
 
@@ -51,7 +54,7 @@ jobs:
         uses: DamianReeves/write-file-action@6929a9a6d1807689191dcc8bbe62b54d70a32b42 # v1.3
         with:
           path: app/google-services.json
-          contents: "${{ secrets.GOOGLE_SERVICES_JSON }}"
+          contents: ${{ secrets.GOOGLE_SERVICES_JSON }}
           write-mode: overwrite
 
       - name: Write client_secrets.json
@@ -59,7 +62,7 @@ jobs:
         uses: DamianReeves/write-file-action@6929a9a6d1807689191dcc8bbe62b54d70a32b42 # v1.3
         with:
           path: app/src/main/assets/client_secrets.json
-          contents: "${{ secrets.GOOGLE_CLIENT_SECRETS_JSON }}"
+          contents: ${{ secrets.GOOGLE_CLIENT_SECRETS_JSON }}
           write-mode: overwrite
 
       - name: Set up gradle
@@ -69,7 +72,12 @@ jobs:
         run: ./gradlew spotlessCheck
 
       - name: Build app
-        run: ./gradlew assembleRelease
+        if: github.repository == github.event.pull_request.head.repo.full_name
+        run: ./gradlew assemblePreview -Pinclude-telemetry -Penable-updater
+
+      - name: Build app
+        if: github.repository != github.event.pull_request.head.repo.full_name
+        run: ./gradlew assemblePreview
 
       - name: Run unit tests
         run: ./gradlew testReleaseUnitTest
@@ -78,7 +86,7 @@ jobs:
         if: github.repository == github.event.pull_request.head.repo.full_name
         uses: r0adkll/sign-android-release@f30bdd30588842ac76044ecdbd4b6d0e3e813478
         with:
-          releaseDirectory: app/build/outputs/apk/release
+          releaseDirectory: app/build/outputs/apk/preview
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -96,7 +104,7 @@ jobs:
       - name: Rename apk
         id: current_commit
         run: |
-          set -x
+          set -ex
           echo "The git ref is: ${{ github.ref }}"
           version_tag=p$(echo ${{ github.ref }} | cut -d '/' -f 3)
           commit_count=$(git rev-list --count HEAD)
@@ -104,7 +112,7 @@ jobs:
           echo "VERSION_TAG=$version_tag" >> $GITHUB_OUTPUT
           echo "COMMIT_COUNT=$commit_count"
           echo "COMMIT_COUNT=$commit_count" >> $GITHUB_OUTPUT
-          mv app/build/outputs/apk/release/app-universal-release-unsigned${{ steps.signed_filename.outputs.SIGNED_TRAIL }}.apk Komikku-$version_tag-r$commit_count.apk
+          mv app/build/outputs/apk/preview/app-universal-preview${{ steps.signed_filename.outputs.SIGNED_TRAIL }}.apk Komikku-$version_tag-r$commit_count.apk
 
       - name: Upload APK
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -116,4 +124,4 @@ jobs:
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/release
+          path: app/build/outputs/mapping/preview
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 1d22d99f7..69c1f640d 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -84,7 +84,7 @@ jobs:
       - name: Rename apk
         id: current_commit
         run: |
-          set -x
+          set -ex
           version_tag=$(echo ${GITHUB_REF/refs\/heads\//} | sed -r 's/[\/]+/_/g')
           commit_count=$(git rev-list --count HEAD)
           echo "VERSION_TAG=$version_tag"
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index 93b7ae3d7..1ec30cfee 100644
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Curren commit
         id: current_commit
         run: |
-          set -e
+          set -x
 
           commit_count=$(git rev-list --count HEAD)
           echo "COMMIT_COUNT=$commit_count"
@@ -55,7 +55,7 @@ jobs:
       - name: Previous commit
         id: previous_commit
         run: |
-          set -e
+          set -x
 
           commit_count_diff=$(git rev-list --count "${{ steps.last_release.outputs.tag_name }}"..HEAD)
 
@@ -74,7 +74,7 @@ jobs:
       - name: Commit logs
         id: commit_logs
         run: |
-          set -e
+          set -x
 
           echo "COMMIT_LOGS<<{delimiter}
           $(curl -H "Accept: application/vnd.github.v3+json" \
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c7cddfc87..e1fc93d1c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -329,14 +329,6 @@ dependencies {
 }
 
 androidComponents {
-    beforeVariants { variantBuilder ->
-        // Disables standardBenchmark
-        if (variantBuilder.buildType == "benchmark") {
-            variantBuilder.enable = variantBuilder.productFlavors.containsAll(
-                listOf("default" to "dev"),
-            )
-        }
-    }
     onVariants(selector().withFlavor("default" to "standard")) {
         // Only excluding in standard flavor because this breaks
         // Layout Inspector's Compose tree