diff --git a/build.gradle.kts b/build.gradle.kts
index fbcca451..84f82066 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,10 +4,3 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.kapt) apply false
 }
-
-tasks {
-    wrapper {
-        gradleVersion = "8.3"
-        distributionSha256Sum = "591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225"
-    }
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 408d84cb..b1dd29c7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-agp = "8.2.0-alpha15"
-kotlin = "1.9.0"
+agp = "8.2.0"
+kotlin = "1.9.20"
 
 [libraries]
 androidx-activity-ktx = "androidx.activity:activity-ktx:1.7.2"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 91bc0b90..61a336cb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,4 @@
-@file:Suppress("UnstableApiUsage")
+import com.android.build.api.dsl.SettingsExtension
 
 pluginManagement {
     repositories {
@@ -8,6 +8,7 @@ pluginManagement {
     }
 }
 
+@Suppress("UnstableApiUsage")
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -16,7 +17,18 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "wireguard-android"
+plugins {
+    id("com.android.settings") version "8.2.0"
+}
+
+rootProject.name = "amneziawg-android"
 
 include(":tunnel")
 include(":ui")
+
+configure<SettingsExtension> {
+    buildToolsVersion = "34.0.0"
+    compileSdk = 34
+    minSdk = 24
+    ndkVersion = "26.1.10909125"
+}
diff --git a/tunnel/build.gradle.kts b/tunnel/build.gradle.kts
index 589d72da..648afbd3 100644
--- a/tunnel/build.gradle.kts
+++ b/tunnel/build.gradle.kts
@@ -11,15 +11,11 @@ plugins {
 }
 
 android {
-    compileSdk = 34
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
     namespace = "${pkg}.tunnel"
-    defaultConfig {
-        minSdk = 21
-    }
     externalNativeBuild {
         cmake {
             path("tools/CMakeLists.txt")
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index 5cdcb6a1..ae17269b 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -12,7 +12,6 @@ plugins {
 }
 
 android {
-    compileSdk = 34
     buildFeatures {
         buildConfig = true
         dataBinding = true
@@ -21,7 +20,6 @@ android {
     namespace = pkg
     defaultConfig {
         applicationId = pkg
-        minSdk = 21
         targetSdk = 34
         versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt()
         versionName = providers.gradleProperty("wireguardVersionName").get()