diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 12ab9480c..fe96dc45e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,10 +35,11 @@ turbine = "1.2.1"
 # Compose Multiplatform
 compose-multiplatform = "1.11.0-beta02"
 compose-multiplatform-material3 = "1.11.0-alpha06"
-# AndroidX Compose test/tracing artifacts share a version track with CMP but are resolved
-# independently by Maven. Pinning them to their own ref prevents Renovate from bumping the
-# CMP plugin version when a new AndroidX Compose pre-release appears.
-androidx-compose = "1.11.0-rc01"
+# `androidx-compose-material` (M2) is independent of CMP and pinned separately
+# because some third-party libs (maps-compose-widgets, datadog) drag in
+# unversioned material transitives. Test/tracing artifacts in the
+# androidx.compose.{runtime,ui} groups MUST track CMP — use compose-multiplatform
+# as their version ref, not a separate pin.
 androidx-compose-material = "1.7.8"
 jetbrains-adaptive = "1.3.0-alpha06"
 
@@ -121,8 +122,8 @@ androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version
 androidx-work-testing = { module = "androidx.work:work-testing", version = "2.11.2" }
 
 # AndroidX Compose (explicit versions — BOM removed; CMP is the sole version authority)
-androidx-compose-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "androidx-compose" }
-androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose" } # Required by Robolectric Compose tests (registers ComponentActivity)
+androidx-compose-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "compose-multiplatform" }
+androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose-multiplatform" } # Required by Robolectric Compose tests (registers ComponentActivity)
 
 # Compose Multiplatform
 compose-multiplatform-animation = { module = "org.jetbrains.compose.animation:animation", version.ref = "compose-multiplatform" }