diff --git a/java/Android.bp b/java/Android.bp
index e3e644cf3..613b45148 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -53,8 +53,8 @@ android_app {
     // Include all the resources regardless of system supported locales
     aapt_include_all_resources: true,
 
-    min_sdk_version: "14",
-    target_sdk_version: "23",
+    min_sdk_version: "21",
+    target_sdk_version: "30",
     sdk_version: "current",
 
     product_specific: true,
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 9b149287a..ac84c3388 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -17,10 +17,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      coreApp="true"
      package="com.android.inputmethod.latin"
-     android:versionCode="28">
+     android:versionCode="30">
 
     <uses-sdk android:minSdkVersion="21"
-         android:targetSdkVersion="28"/>
+         android:targetSdkVersion="30"/>
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION"/>
diff --git a/tests/Android.bp b/tests/Android.bp
index e1db354c3..4c5b74a91 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -50,6 +50,6 @@ android_test {
     instrumentation_for: "LatinIME",
 
     min_sdk_version: "14",
-    target_sdk_version: "21",
+    target_sdk_version: "30",
     sdk_version: "current",
 }
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index e788e0b7c..95ddb0a2a 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -16,9 +16,9 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.inputmethod.latin.tests"
-    android:versionCode="28">
+    android:versionCode="30">
 
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />