diff --git a/CHANGELOG.md b/CHANGELOG.md
index 812e5e5..191d8c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,11 @@ Rules:
 
 ---
 
+## [0.21.2-beta.1] - 2026-06-02
+
+### Changed
+- Compose BOM upgraded from `2024.12.01` to `2025.05.01` (Compose UI 1.8.x, Material3 1.4.x). No user-visible changes; enables use of stable Compose 1.8 APIs internally.
+
 ## [0.21.1-beta.1] - 2026-06-02
 
 ### Changed
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6bcc54e..92cd438 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
         applicationId = "com.mapgie.goflo"
         minSdk = 26
         targetSdk = 34
-        versionCode = 56
-        versionName = "0.21.1-beta.1"
+        versionCode = 57
+        versionName = "0.21.2-beta.1"
     }
 
     signingConfigs {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 74e8fc6..dbc3ec7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ ksp = "2.0.0-1.0.21"
 coreKtx = "1.13.1"
 lifecycleRuntime = "2.8.1"
 activityCompose = "1.9.0"
-composeBom = "2024.12.01"
+composeBom = "2025.05.01"
 navigationCompose = "2.7.7"
 room = "2.6.1"
 datastorePreferences = "1.1.1"