diff --git a/build.gradle.kts b/build.gradle.kts
index f43a1a8..10d30e1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,14 +15,14 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath("com.android.tools.build:gradle:7.3.1")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.21")
     }
 }
 
 allprojects {
     group = "fr.acinq.secp256k1"
-    version = "0.8.0"
+    version = "0.9.0-SNAPSHOT"
 
     repositories {
         google()
diff --git a/jni/android/build.gradle.kts b/jni/android/build.gradle.kts
index 28996b7..6ab6b86 100644
--- a/jni/android/build.gradle.kts
+++ b/jni/android/build.gradle.kts
@@ -15,12 +15,9 @@ dependencies {
 
 android {
     defaultConfig {
-        compileSdkVersion(30)
-        minSdkVersion(21)
+        compileSdk = 33
+        minSdk = 21
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        externalNativeBuild {
-            cmake {}
-        }
     }
 
     compileOptions {
@@ -33,7 +30,8 @@ android {
             path("src/main/CMakeLists.txt")
         }
     }
-    ndkVersion = "21.4.7075529"
+
+    ndkVersion = "25.2.9519653"
 
     afterEvaluate {
         tasks.withType<com.android.build.gradle.tasks.factory.AndroidUnitTest>().all {
@@ -43,8 +41,8 @@ android {
 }
 
 afterEvaluate {
-    configure(listOf("Debug", "Release").map { tasks["externalNativeBuild$it"] }) {
-        dependsOn(":native:buildSecp256k1Android")
+    tasks.filter { it.name.startsWith("configureCMake") }.forEach {
+        it.dependsOn(":native:buildSecp256k1Android")
     }
 }
 
diff --git a/jni/android/src/main/CMakeLists.txt b/jni/android/src/main/CMakeLists.txt
index dec6fd7..5d3db10 100644
--- a/jni/android/src/main/CMakeLists.txt
+++ b/jni/android/src/main/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10.0)
 
+project(secp256k1jni)
+
 add_library( secp256k1-jni SHARED
     ${CMAKE_CURRENT_LIST_DIR}/../../../c/src/fr_acinq_secp256k1_Secp256k1CFunctions.c
 )
diff --git a/native/build-android.sh b/native/build-android.sh
index 7a67681..8a94c17 100755
--- a/native/build-android.sh
+++ b/native/build-android.sh
@@ -19,18 +19,16 @@ else
 fi
 
 TARGET=$SYS-linux-android
-TOOLTARGET=$TARGET
 if [ "$SYS" == "armv7a" ]; then
   TARGET=armv7a-linux-androideabi
-  TOOLTARGET=arm-linux-androideabi
 fi
 
 export CC=$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN/bin/${TARGET}21-clang
-export LD=$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN/bin/$TOOLTARGET-ld
-export AR=$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN/bin/$TOOLTARGET-ar
-export AS=$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN/bin/$TOOLTARGET-as
-export RANLIB=$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN/bin/$TOOLTARGET-ranlib
-export STRIP=$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN/bin/$TOOLTARGET-strip
+export LD=$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN/bin/ld
+export AR=$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN/bin/llvm-ar
+export AS=$CC
+export RANLIB=$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN/bin/llvm-ranlib
+export STRIP=$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN/bin/llvm-strip
 
 cd secp256k1
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 086595c..42fa5f0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,6 +3,13 @@ pluginManagement {
         google()
         gradlePluginPortal()
     }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.namespace == "com.android" || requested.id.name == "kotlin-android-extensions") {
+                useModule("com.android.tools.build:gradle:7.3.1")
+            }
+        }
+    }
 }
 rootProject.name = "secp256k1-kmp"
 
diff --git a/tests/src/androidTest/java/fr/acinq/secp256k1/AndroidTest.kt b/tests/src/androidTest/java/fr/acinq/secp256k1/AndroidTest.kt
deleted file mode 100644
index bc59f6d..0000000
--- a/tests/src/androidTest/java/fr/acinq/secp256k1/AndroidTest.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package fr.acinq.secp256k1
-
-import org.junit.Test
-import kotlin.test.assertEquals
-
-
-class AndroidTest {}