diff --git a/build-logic/src/main/kotlin/Environment.kt b/build-logic/src/main/kotlin/Environment.kt
index 497c3aa8..8557546a 100644
--- a/build-logic/src/main/kotlin/Environment.kt
+++ b/build-logic/src/main/kotlin/Environment.kt
@@ -17,8 +17,8 @@ enum class SupportedAgp(
     AGP_8_1("8.1.4", gradle = "8.0"),
     AGP_8_2("8.2.2", gradle = "8.2"),
     AGP_8_3("8.3.1", gradle = "8.4"),
-    AGP_8_4("8.4.0-alpha13", gradle = "8.6"),
-    AGP_8_5("8.5.0-alpha01", gradle = "8.6");
+    AGP_8_4("8.4.0-rc01", gradle = "8.6"),
+    AGP_8_5("8.5.0-alpha03", gradle = "8.6");
 
     companion object {
         val oldest = values().first()