diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 21adde36..6277dd69 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.1.0-beta03"
+agp = "8.2.0-alpha05"
 kotlin = "1.8.21"
 
 [libraries]
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index 136c636a..3672c1ee 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -4,9 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import com.android.build.gradle.tasks.ExtractSupportedLocalesTask
 
-// Grotesque workaround for https://issuetracker.google.com/issues/279780940
-System.setProperty("com.android.tools.r8.disableApiModeling", "1")
-
 val pkg: String = providers.gradleProperty("wireguardPackageName").get()
 
 plugins {
@@ -95,12 +92,3 @@ tasks.withType<JavaCompile>().configureEach {
 tasks.withType<KotlinCompile>().configureEach {
     compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
 }
-
-// Grotesque workaround for https://issuetracker.google.com/issues/281825213
-tasks.withType<ExtractSupportedLocalesTask>().configureEach {
-    doLast {
-        val file = localeList.asFile.get()
-        val lines = file.readLines()
-        file.writeText((listOf(lines[0]) + lines.subList(1, lines.size).sorted()).joinToString(separator = "\n"))
-    }
-}
\ No newline at end of file