diff --git a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
index 49c540cdd1d..c2d2529bf88 100644
--- a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
@@ -265,12 +265,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.0
 org.jetbrains.compose.ui:ui-unit:1.9.0
 org.jetbrains.compose.ui:ui-util:1.9.0
 org.jetbrains.compose.ui:ui:1.9.0
-org.jetbrains.kotlin:kotlin-bom:2.2.20
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib:2.2.20
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
index 66cbba9ad1f..2da0cd7cc30 100644
--- a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
@@ -279,12 +279,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.0
 org.jetbrains.compose.ui:ui-unit:1.9.0
 org.jetbrains.compose.ui:ui-util:1.9.0
 org.jetbrains.compose.ui:ui:1.9.0
-org.jetbrains.kotlin:kotlin-bom:2.2.20
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib:2.2.20
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
index 1e9e4892c55..18f586fe36d 100644
--- a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
@@ -272,12 +272,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.0
 org.jetbrains.compose.ui:ui-unit:1.9.0
 org.jetbrains.compose.ui:ui-util:1.9.0
 org.jetbrains.compose.ui:ui:1.9.0
-org.jetbrains.kotlin:kotlin-bom:2.2.20
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib:2.2.20
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
index 1e9e4892c55..18f586fe36d 100644
--- a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
@@ -272,12 +272,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.0
 org.jetbrains.compose.ui:ui-unit:1.9.0
 org.jetbrains.compose.ui:ui-util:1.9.0
 org.jetbrains.compose.ui:ui:1.9.0
-org.jetbrains.kotlin:kotlin-bom:2.2.20
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib:2.2.20
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
index 1e9e4892c55..18f586fe36d 100644
--- a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
@@ -272,12 +272,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.0
 org.jetbrains.compose.ui:ui-unit:1.9.0
 org.jetbrains.compose.ui:ui-util:1.9.0
 org.jetbrains.compose.ui:ui:1.9.0
-org.jetbrains.kotlin:kotlin-bom:2.2.20
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib:2.2.20
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
index ddc53db4efd..16bf329b5ca 100644
--- a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
@@ -286,12 +286,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.0
 org.jetbrains.compose.ui:ui-unit:1.9.0
 org.jetbrains.compose.ui:ui-util:1.9.0
 org.jetbrains.compose.ui:ui:1.9.0
-org.jetbrains.kotlin:kotlin-bom:2.2.20
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib:2.2.20
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
index ddc53db4efd..16bf329b5ca 100644
--- a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
@@ -286,12 +286,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.0
 org.jetbrains.compose.ui:ui-unit:1.9.0
 org.jetbrains.compose.ui:ui-util:1.9.0
 org.jetbrains.compose.ui:ui:1.9.0
-org.jetbrains.kotlin:kotlin-bom:2.2.20
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib:2.2.20
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
index ddc53db4efd..16bf329b5ca 100644
--- a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
@@ -286,12 +286,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.0
 org.jetbrains.compose.ui:ui-unit:1.9.0
 org.jetbrains.compose.ui:ui-util:1.9.0
 org.jetbrains.compose.ui:ui:1.9.0
-org.jetbrains.kotlin:kotlin-bom:2.2.20
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20
-org.jetbrains.kotlin:kotlin-stdlib:2.2.20
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cd81b7b9bb3..1cebc8a6761 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -77,7 +77,7 @@ jutf7 = "1.0.0"
 jzlib = "1.0.7"
 koinBom = "4.1.1"
 konsist = "0.17.3"
-kotlinBom = "2.2.20"
+kotlinBom = "2.2.21"
 # Needs to match the version used by Gradle, just check with `./gradlew --version`
 kotlinGradleBom = "2.2.0"
 kotlinKsp = "2.2.20-2.0.4"