diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 89392a316..1ddd5046a 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -9,7 +9,7 @@ on:
     types: [opened, synchronize, reopened]
 
 env:
-  ANDROID_API: 36.1
+  ANDROID_API: 37
   ANDROID_BUILD_TOOLS: 37.0.0
   ADB_INSTALL_TIMEOUT: 5
 
@@ -48,12 +48,14 @@ jobs:
  
       - name: Setup Android SDK
         uses: android-actions/setup-android@v4
-
+        with:
+          # Accept SDK licenses and enable preview channel dependencies
+          cmdline-tools-version: 'latest'
       - name: Install Android SDK components
         run: |
           sdkmanager "tools"
           sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
-          sdkmanager "platforms;android-${ANDROID_API}"
+          yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --channel=3 "platforms;android-37"
           sdkmanager "extras;android;m2repository"
           sdkmanager "extras;google;m2repository"
           sdkmanager "extras;google;google_play_services"
diff --git a/build.gradle b/build.gradle
index 2f00f7334..d821e11dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ project.ext {
     //Common settings for most builds
     //Note that Android Studio does not know about the 'ext' module and will warn
     buildToolsVersion = '37.0.0' // also .github/workflows/actions.yml
-    compileSdk = 36.1 // also .github/workflows/actions.yml
-    targetSdk = 36.1
+    compileSdk = 37 // also .github/workflows/actions.yml
+    targetSdk = 37
     minSdk = 23
 
     appcompat_version = "1.7.1"