diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1199f3a3f7..21315e0aca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,8 @@ The format is simplified version of [Keep a Changelog](https://keepachangelog.co
 - Replace Injekt with Koin
 - Remove unnecessary permission added by Firebase
 - Remove unnecessary features added by Firebase
+- Replace BOM dev.chrisbanes.compose:compose-bom with JetPack's BOM
+- Update compose BOM to 2024.09.02
 
 ## [v1.8.5.7]
 
diff --git a/gradle/compose.versions.toml b/gradle/compose.versions.toml
index 8cb27d3cbd..6503a7db15 100644
--- a/gradle/compose.versions.toml
+++ b/gradle/compose.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-compose-bom = "2024.08.00-alpha02"
+compose = "2024.09.02"
 
 [libraries]
-bom = { module = "dev.chrisbanes.compose:compose-bom", version.ref = "compose-bom" }
+bom = { module = "androidx.compose:compose-bom", version.ref = "compose" }
 animation = { module = "androidx.compose.animation:animation" }
 foundation = { module = "androidx.compose.foundation:foundation" }
 material3 = { module = "androidx.compose.material3:material3" }