diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7bb9fc99..69bf110e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 moshi = "1.15.1"
 retrofit = "2.11.0"
 junit = "5.10.2"
diff --git a/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt b/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt
index ab93045f..437db876 100644
--- a/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt
+++ b/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt
@@ -35,13 +35,19 @@ enum class AgpVersion(
 
   // stable
   AGP_8_4(
-    value = "8.4.0",
+    value = "8.4.1",
     minGradleVersion = GradleVersion.GRADLE_8_6,
   ),
 
   // canary channel
   AGP_8_5(
-    value = "8.5.0-alpha07",
+    value = "8.5.0-beta02",
+    minGradleVersion = GradleVersion.GRADLE_8_6,
+  ),
+
+  // canary channel
+  AGP_8_6(
+    value = "8.6.0-alpha03",
     minGradleVersion = GradleVersion.GRADLE_8_6,
   ),
 }
@@ -53,10 +59,10 @@ enum class KotlinVersion(
 ) {
   // minimum supported
   // stable
-  KT_1_9_23("1.9.23"),
+  KT_1_9_23("1.9.24"),
 
   // beta
-  KT_2_0_0("2.0.0-RC2"),
+  KT_2_0_0("2.0.0"),
 }
 
 enum class GradleVersion(