diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt
index 176fba80e5..2bd2e115ae 100644
--- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt
+++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt
@@ -22,7 +22,7 @@ internal object ComposeCompilerCompatibility {
         "1.9.20-RC2" to "1.5.3-rc01",
         "1.9.20" to "1.5.3",
         "1.9.21" to "1.5.4",
-        "1.9.22" to "1.5.8.1-beta02",
+        "1.9.22" to "1.5.8.1",
         "2.0.0-Beta1" to "1.5.4-dev1-kt2.0.0-Beta1",
     )
 
diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
index 6ffac9c3b1..81cb376b75 100644
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -4,7 +4,7 @@ kotlin.code.style=official
 # Default version of Compose Libraries used by Gradle plugin
 compose.version=1.6.0-dev1383
 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
-compose.tests.compiler.version=1.5.8.1-beta02
+compose.tests.compiler.version=1.5.8.1
 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
 compose.tests.compiler.compatible.kotlin.version=1.9.22
 # The latest version of Kotlin compatible with compose.tests.compiler.version for JS target. Used only on CI.