diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 475b410..0f460bb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,6 +13,7 @@ plugins {
     jacoco
     alias(libs.plugins.firebase.perf.plugin)
     alias(libs.plugins.about.lib.plugin)
+    alias(libs.plugins.compose.compiler)
 }
 
 jacoco {
@@ -161,9 +162,6 @@ android {
         compose = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.9"
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/build.gradle.kts b/build.gradle.kts
index f095bf1..5ad6cae 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.about.lib.plugin) apply false
     alias(libs.plugins.firebase.perf.plugin) apply false
+    alias(libs.plugins.compose.compiler) apply false
 //    TODO Move some of these to toml file
     id("com.github.ben-manes.versions") version "0.41.0"
     id("nl.littlerobots.version-catalog-update") version "0.8.4"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d9f31fd..923e33a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -99,6 +99,7 @@ kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref =
 mapsplatform-secrets-gradle-plugin = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "mapsplatform-secrets" }
 org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 org-jetbrains-kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-serialization" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 [bundles]
 android-test = [