diff --git a/amethyst/build.gradle b/amethyst/build.gradle
index b6b3c6f2a..70b037908 100644
--- a/amethyst/build.gradle
+++ b/amethyst/build.gradle
@@ -36,6 +36,17 @@ def generateVersionName(String baseVersion) {
     }
 }
 
+// Workaround: stability.analyzer plugin doesn't declare task dependencies properly for Gradle 9.x
+afterEvaluate {
+    def stabilityNames = tasks.names.findAll { it.contains("StabilityCheck") }
+    def compileNames = tasks.names.findAll { it.matches("compile.*UnitTestKotlin") }
+    stabilityNames.each { scName ->
+        compileNames.each { ctName ->
+            tasks.named(scName).configure { mustRunAfter(tasks.named(ctName)) }
+        }
+    }
+}
+
 android {
     namespace = 'com.vitorpamplona.amethyst'
     compileSdk = libs.versions.android.compileSdk.get().toInteger()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9fda673e2..d6a717466 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -69,6 +69,7 @@ kotlinTest = "2.3.0"
 core = "1.7.0"
 mavenPublish = "0.36.0"
 spmForKmpVersion = "1.4.10"
+stabilityAnalyser = "0.7.0"
 
 [libraries]
 abedElazizShe-video-compressor-fork = { group = "com.github.davotoula", name = "LightCompressor-enhanced", version.ref = "lightcompressor-enhanced" }
@@ -187,6 +188,6 @@ serialization = { id = 'org.jetbrains.kotlin.plugin.serialization', version.ref
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 androidKotlinMultiplatformLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 vanniktech-mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
-stability-analyzer = { id = "com.github.skydoves.compose.stability.analyzer", version = "0.7.0" }
+stability-analyzer = { id = "com.github.skydoves.compose.stability.analyzer", version.ref = "stabilityAnalyser" }
 composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
 frankois944-spmForKmp = { id = "io.github.frankois944.spmForKmp", version.ref = "spmForKmpVersion" }