diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a8fb99d..29b3bb2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,10 +29,10 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - name: Setup Gradle 8.6
+      - name: Setup Gradle 8.7
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: '8.6'
+          gradle-version: '8.7'
           cache-read-only: false
 
       - name: Write local.properties
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 2df5fbd..c67e615 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -39,10 +39,10 @@ jobs:
           java-version: "17"
           distribution: temurin
 
-      - name: Setup Gradle 8.6
+      - name: Setup Gradle 8.7
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: "8.6"
+          gradle-version: "8.7"
           cache-read-only: false
 
       - name: Write local.properties
diff --git a/CHANGELOG.md b/CHANGELOG.md
index acb7160..3d03761 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,11 @@ Rules:
 
 ---
 
+## [0.22.1-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.22.0-beta.1] - 2026-06-02
 
 ### Added
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a260a6c..a867d8b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -7,14 +7,14 @@ plugins {
 
 android {
     namespace = "com.mapgie.goflo"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.mapgie.goflo"
         minSdk = 26
         targetSdk = 34
-        versionCode = 57
-        versionName = "0.22.0-beta.1"
+        versionCode = 58
+        versionName = "0.22.1-beta.1"
     }
 
     signingConfigs {
diff --git a/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt b/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt
index d180353..afcfee9 100644
--- a/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt
+++ b/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt
@@ -2,6 +2,7 @@ package com.mapgie.goflo.ui.screens.licenses
 
 // MAINTAINER NOTE: keep this list in sync with gradle/libs.versions.toml.
 // Add an entry here whenever a new RUNTIME dependency is added to the project.
+// Compose library versions are pinned via the Compose BOM (currently 2025.05.01).
 //
 // Excluded — not shipped in the release APK:
 //   junit                    (testImplementation only)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 74e8fc6..2c6e52b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
-agp = "8.4.0"
+agp = "8.6.0"
 kotlin = "2.0.0"
 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"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a80b22c..e7646de 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME