diff --git a/.github/workflows/pr_pipeline.yml b/.github/workflows/pr_pipeline.yml
index 828f7428..3ed427c3 100644
--- a/.github/workflows/pr_pipeline.yml
+++ b/.github/workflows/pr_pipeline.yml
@@ -59,6 +59,11 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
 
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v4
+        with:
+          packages: 'build-tools;37.0.0'
+
       # Unified Gradle caching — reads the cache written by the formatting job
       # on PRs; pushes an updated cache on main.
       - name: Setup Gradle
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b1aa3827..38a36802 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,6 +20,10 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '21'
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v4
+        with:
+          packages: 'build-tools;37.0.0'
       - name: Decode Keystore
         id: decode_keystore
         uses: timheuer/base64-to-file@v2
@@ -36,7 +40,7 @@ jobs:
           SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
           SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
       - name: Verify Signature
-        run: $ANDROID_SDK_ROOT/build-tools/36.0.0/apksigner verify --print-certs app/build/outputs/apk/release/RecurringExpenseTracker_${{ steps.get_version.outputs.version-without-v }}.apk
+        run: $ANDROID_SDK_ROOT/build-tools/37.0.0/apksigner verify --print-certs app/build/outputs/apk/release/RecurringExpenseTracker_${{ steps.get_version.outputs.version-without-v }}.apk
       - name: Upload APK
         uses: actions/upload-artifact@v7
         with:
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 357a9570..81f67eb5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,9 +2,9 @@
 aboutLibraries = '14.2.0'
 accompanist-permissions = "0.37.3"
 agp = "9.2.1"
-android-compileSdk = "36"
+android-compileSdk = "37"
 android-minSdk = "26"
-android-targetSdk = "36"
+android-targetSdk = "37"
 androidx-activityCompose = "1.13.0"
 androidx-appcompat = "1.7.1"
 androidx-core = "1.18.0"