diff --git a/android/build.gradle b/android/build.gradle
new file mode 100644
index 0000000..4b24caa
--- /dev/null
+++ b/android/build.gradle
@@ -0,0 +1,87 @@
+group = "xyz.nuark.liblinphone_flutter"
+version = "1.0-SNAPSHOT"
+
+buildscript {
+    ext.kotlin_version = "2.1.0"
+    repositories {
+        google()
+        mavenCentral()
+
+        maven {
+            name = "linphone.org maven repository"
+            url = uri("https://download.linphone.org/maven_repository")
+            content {
+                includeGroup("org.linphone")
+            }
+        }
+    }
+
+    dependencies {
+        classpath("com.android.tools.build:gradle:8.9.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+
+android {
+    namespace = "xyz.nuark.liblinphone_flutter"
+
+    compileSdk = 36
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11
+    }
+
+    sourceSets {
+        main.java.srcDirs += "src/main/kotlin"
+        test.java.srcDirs += "src/test/kotlin"
+    }
+
+    defaultConfig {
+        minSdk = 24
+    }
+
+    repositories {
+        maven {
+            name = "linphone.org maven repository"
+            url = uri("https://download.linphone.org/maven_repository")
+            content {
+                includeGroup("org.linphone")
+            }
+        }
+    }
+
+    dependencies {
+//        implementation(files("libs/linphone-sdk-android-5.2.0.aar"))
+        implementation("org.linphone:linphone-sdk-android:5.4.84")
+
+        testImplementation("org.jetbrains.kotlin:kotlin-test")
+        testImplementation("org.mockito:mockito-core:5.0.0")
+    }
+
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+
+            testLogging {
+               events "passed", "skipped", "failed", "standardOut", "standardError"
+               outputs.upToDateWhen {false}
+               showStandardStreams = true
+            }
+        }
+    }
+}
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 3c08f67..3708da5 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -8,8 +8,11 @@ buildscript {
         mavenCentral()
 
         maven {
-            name = "nuarkMvnPublic"
-            url = uri("https://reposilite.ac.nuark.xyz/public")
+            name = "linphone.org maven repository"
+            url = uri("https://download.linphone.org/maven_repository")
+            content {
+                includeGroup("org.linphone")
+            }
         }
     }
 
@@ -76,8 +79,6 @@ android {
 }
 
 dependencies {
-    implementation("org.linphone:linphone-sdk-android:5.5.0-beta.2+907e6bafba")
-    
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("org.mockito:mockito-core:5.0.0")
 }
diff --git a/android/settings.gradle b/android/settings.gradle
new file mode 100644
index 0000000..1f4f06d
--- /dev/null
+++ b/android/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'liblinphone_flutter'
diff --git a/android/src/main/kotlin/xyz/nuark/liblinphone_flutter/LinphoneBridge.kt b/android/src/main/kotlin/xyz/nuark/liblinphone_flutter/LinphoneBridge.kt
index 2dce681..44a0b96 100644
--- a/android/src/main/kotlin/xyz/nuark/liblinphone_flutter/LinphoneBridge.kt
+++ b/android/src/main/kotlin/xyz/nuark/liblinphone_flutter/LinphoneBridge.kt
@@ -219,7 +219,7 @@ class LinphoneBridge(
         core.uploadBandwidth = 512
         core.downloadBandwidth = 1500
 
-        val preferredAudio = listOf("g729", "opus", "speex", "pcmu", "pcma") // in order of preference
+        val preferredAudio = listOf("opus", "speex", "pcmu", "pcma") // in order of preference
         val preferredVideo = listOf("h264", "vp8")
 
         core.audioPayloadTypes.forEach { pt: PayloadType ->