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 ff78041038..e5763c44e7 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
@@ -21,6 +21,7 @@ internal object ComposeCompilerCompatibility {
         "1.9.20-RC" to "1.5.2.1-rc01",
         "1.9.20-RC2" to "1.5.3-rc01",
         "1.9.20" to "1.5.3",
+        "1.9.21" to "1.5.4",
         "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 cafb63b058..c50a79c9a2 100644
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -2,13 +2,13 @@ org.gradle.parallel=true
 kotlin.code.style=official
 
 # Default version of Compose Libraries used by Gradle plugin
-compose.version=1.5.2
+compose.version=1.5.10
 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
-compose.tests.compiler.version=1.5.2
+compose.tests.compiler.version=1.5.4
 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
-compose.tests.compiler.compatible.kotlin.version=1.9.10
+compose.tests.compiler.compatible.kotlin.version=1.9.21
 # The latest version of Kotlin compatible with compose.tests.compiler.version for JS target. Used only on CI.
-compose.tests.js.compiler.compatible.kotlin.version=1.9.10
+compose.tests.js.compiler.compatible.kotlin.version=1.9.21
 # __SUPPORTED_GRADLE_VERSIONS__
 # Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well
 compose.tests.gradle.versions=7.3.3, 8.3