diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
index 3bf6abc2f8..c177cc25b6 100644
--- a/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
+++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
@@ -19,10 +19,10 @@ object AndroidCommon {
   fun configure(project: Project) {
     // Configure Application projects
     project.extensions.findByType<ApplicationExtension>()?.apply {
-      compileSdk = 37
+      compileSdk = 36
       defaultConfig {
         minSdk = 26
-        targetSdk = 37
+        targetSdk = 36
       }
 
       packaging {
@@ -42,7 +42,7 @@ object AndroidCommon {
 
     // Configure Library projects
     project.extensions.findByType<LibraryExtension>()?.apply {
-      compileSdk = 37
+      compileSdk = 36
       defaultConfig { minSdk = 26 }
 
       packaging {
diff --git a/gradle.properties b/gradle.properties
index 44cf639b0b..c53ef29820 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -41,7 +41,7 @@ android.disableEarlyManifestParsing=true
 
 # Disable warnings about unsupported features
 android.suppressUnsupportedOptionWarnings=android.dependencyResolutionAtConfigurationTime.disallow,android.disableEarlyManifestParsing,android.suppressUnsupportedOptionWarnings
-android.suppressUnsupportedCompileSdk=37
+android.suppressUnsupportedCompileSdk=36
 
 org.gradle.jvmargs=-Xmx3072m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options=-Xmx1500m,Xms500m