diff --git a/app/build.gradle b/app/build.gradle
index cb92a36e..06e24348 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,8 +5,8 @@ android {
     compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "org.mapcomplete"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        minSdk 30
+        targetSdkVersion targetSdkVersion
         versionCode 9
         versionName "debug"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 817307d1..1bebc67d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+    <uses-sdk tools:overrideLibrary="com.getcapacitor.android, capacitor.cordova.android.plugins" />
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/org/mapcomplete/MainActivity.java b/app/src/main/java/org/mapcomplete/MainActivity.java
index 114cb8eb..85b61c6c 100644
--- a/app/src/main/java/org/mapcomplete/MainActivity.java
+++ b/app/src/main/java/org/mapcomplete/MainActivity.java
@@ -79,16 +79,33 @@ public class MainActivity extends BridgeActivity {
             Databridge.sendAnswerTo(responder, json);
         });
 
-        getOnBackInvokedDispatcher().registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_OVERLAY,
-                () -> {
-                    System.out.println("Back button pressed");
-                    if (this.backbutton != null) {
-                        Databridge.sendAnswerTo(this.backbutton, "backbutton pressed");
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            getOnBackInvokedDispatcher().registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_OVERLAY,
+                    () -> {
+                        System.out.println("Back button pressed");
+                        if (this.backbutton != null) {
+                            Databridge.sendAnswerTo(this.backbutton, "backbutton pressed");
+                        }
                     }
-                }
-        );
+            );
+        }
     }
 
+    @Override
+    public void onBackPressed() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            System.out.println("Back button pressed (old)");
+            if (this.backbutton != null) {
+                Databridge.sendAnswerTo(this.backbutton, "backbutton pressed");
+            }
+        }else{
+            super.onBackPressed();
+        }
+
+    }
+
+
 
     private boolean hasGeolocationPermission() {
         return ContextCompat.checkSelfPermission(