diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index f64c9a8e3..12f6f2de4 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -21,7 +21,7 @@ android {
     namespace = pkg
     defaultConfig {
         applicationId = pkg
-        minSdk = 21
+        minSdk = 23
         targetSdk = 36
         versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt()
         versionName = providers.gradleProperty("wireguardVersionName").get()
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 86c989b3e..f05d84f26 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -40,7 +40,9 @@
 
     <application
         android:name=".Application"
-        android:allowBackup="false"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup"
+        android:dataExtractionRules="@xml/dataExtractionRules"
         android:banner="@mipmap/banner"
         android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/ui/src/main/res/xml/backup.xml b/ui/src/main/res/xml/backup.xml
new file mode 100644
index 000000000..8e4a12cd3
--- /dev/null
+++ b/ui/src/main/res/xml/backup.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <include domain="sharedpref" path="." requireFlags="clientSideEncryption" />
+    <include domain="file" path="." requireFlags="clientSideEncryption" />
+</full-backup-content>
diff --git a/ui/src/main/res/xml/dataExtractionRules.xml b/ui/src/main/res/xml/dataExtractionRules.xml
new file mode 100644
index 000000000..acaea64ab
--- /dev/null
+++ b/ui/src/main/res/xml/dataExtractionRules.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+ <cloud-backup disableIfNoEncryptionCapabilities="true">
+   <include domain="file" path="."/>
+   <include domain="sharedpref" path="."/>
+ </cloud-backup>
+</data-extraction-rules>