diff --git a/build-logic/src/main/kotlin/AndroidConfiguration.kt b/build-logic/src/main/kotlin/AndroidConfiguration.kt
index 1c16824012..e41b234ac3 100644
--- a/build-logic/src/main/kotlin/AndroidConfiguration.kt
+++ b/build-logic/src/main/kotlin/AndroidConfiguration.kt
@@ -111,8 +111,7 @@ fun BaseExtension.configureFlavorDimensions(project: Project) {
 // context(Project)
 fun CommonExtension<*, *, *, *, *, *>.configureCompose(project: Project, enableCircuit: Boolean = false) {
     buildFeatures.compose = true
-    composeOptions.kotlinCompilerExtensionVersion =
-        project.libs.findVersion("androidx-compose-compiler").get().requiredVersion
+    project.pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
 
     // add our base compose dependencies
     project.dependencies.apply {
@@ -136,7 +135,6 @@ fun CommonExtension<*, *, *, *, *, *>.configureCompose(project: Project, enableC
     project.pluginManager.apply("com.jeppeman.mockposable")
     project.mockposable {
         plugins = listOf("mockk")
-        composeCompilerPluginVersion = project.libs.findVersion("androidx-compose-compiler").get().requiredVersion
     }
 }
 
diff --git a/build.gradle b/build.gradle
index 85ca5337fd..8499bac084 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,7 @@ buildscript {
 }
 
 plugins {
+    alias libs.plugins.compose.compiler apply false
     alias libs.plugins.hilt apply false
     alias libs.plugins.ksp apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6d2a5c0e78..77ad9f7307 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 accompanist = "0.34.0"
 android-gradle-plugin = "8.5.0"
-androidx-compose-compiler = "1.5.14"
 androidx-compose-material = "1.6.8"
 androidx-compose-ui = "1.6.8"
 androidx-core = "1.13.1"
@@ -216,7 +215,6 @@ weakdelegate = "com.github.Karumi:WeakDelegate:1.0.1"
 youtubePlayer = "com.pierfrancescosoffritti.androidyoutubeplayer:core:12.1.0"
 
 # HACK: dependencies used to trigger renovate upgrades
-androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "androidx-compose-compiler" }
 ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
 
 [bundles]
@@ -229,6 +227,7 @@ ktlint-rulesets = ["ktlint-rules-compose"]
 test-framework = ["junit", "kotlin-test", "androidx-test-junit", "mockk", "robolectric"]
 
 [plugins]
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 firebase-appdistribution = { id = "com.google.firebase.appdistribution", version = "5.0.0" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.2" }
 firebase-perf = { id = "com.google.firebase.firebase-perf", version = "1.4.2" }