diff --git a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
index a4659e2ea8c..5516275f6a4 100644
--- a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
@@ -259,13 +259,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.8.2
 org.jetbrains.compose.ui:ui-unit:1.8.2
 org.jetbrains.compose.ui:ui-util:1.8.2
 org.jetbrains.compose.ui:ui:1.8.2
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-bom:2.2.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib:2.2.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.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 603d646854a..38c56add0bd 100644
--- a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
@@ -273,13 +273,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.8.2
 org.jetbrains.compose.ui:ui-unit:1.8.2
 org.jetbrains.compose.ui:ui-util:1.8.2
 org.jetbrains.compose.ui:ui:1.8.2
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-bom:2.2.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib:2.2.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.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 5e699131648..9483aa6aa3a 100644
--- a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
@@ -266,13 +266,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.8.2
 org.jetbrains.compose.ui:ui-unit:1.8.2
 org.jetbrains.compose.ui:ui-util:1.8.2
 org.jetbrains.compose.ui:ui:1.8.2
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-bom:2.2.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib:2.2.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.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 5e699131648..9483aa6aa3a 100644
--- a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
@@ -266,13 +266,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.8.2
 org.jetbrains.compose.ui:ui-unit:1.8.2
 org.jetbrains.compose.ui:ui-util:1.8.2
 org.jetbrains.compose.ui:ui:1.8.2
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-bom:2.2.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib:2.2.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.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 5e699131648..9483aa6aa3a 100644
--- a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
@@ -266,13 +266,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.8.2
 org.jetbrains.compose.ui:ui-unit:1.8.2
 org.jetbrains.compose.ui:ui-util:1.8.2
 org.jetbrains.compose.ui:ui:1.8.2
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-bom:2.2.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib:2.2.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.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 8fbe850f05e..551b99a578f 100644
--- a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
@@ -280,13 +280,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.8.2
 org.jetbrains.compose.ui:ui-unit:1.8.2
 org.jetbrains.compose.ui:ui-util:1.8.2
 org.jetbrains.compose.ui:ui:1.8.2
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-bom:2.2.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib:2.2.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.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 8fbe850f05e..551b99a578f 100644
--- a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
@@ -280,13 +280,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.8.2
 org.jetbrains.compose.ui:ui-unit:1.8.2
 org.jetbrains.compose.ui:ui-util:1.8.2
 org.jetbrains.compose.ui:ui:1.8.2
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-bom:2.2.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib:2.2.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.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 8fbe850f05e..551b99a578f 100644
--- a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
@@ -280,13 +280,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.8.2
 org.jetbrains.compose.ui:ui-unit:1.8.2
 org.jetbrains.compose.ui:ui-util:1.8.2
 org.jetbrains.compose.ui:ui:1.8.2
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-bom:2.2.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0
-org.jetbrains.kotlin:kotlin-stdlib:2.2.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.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 79c0a6cb368..2af0f05eec2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -77,10 +77,10 @@ jutf7 = "1.0.0"
 jzlib = "1.0.7"
 koinBom = "4.1.0"
 konsist = "0.17.3"
-kotlinBom = "2.2.0"
+kotlinBom = "2.2.20"
 # Needs to match the version used by Gradle, just check with `./gradlew --version`
 kotlinGradleBom = "2.0.21"
-kotlinKsp = "2.2.0-2.0.2"
+kotlinKsp = "2.2.20-2.0.3"
 kotlinxCoroutines = "1.10.2"
 kotlinxCollectionsImmutable = "0.4.0"
 kotlinxDateTime = "0.7.1"
@@ -96,7 +96,7 @@ mime4j = "0.8.13"
 minidns = "1.1.1"
 mockito = "5.18.0"
 mockitoKotlin = "6.0.0"
-mokkery = "2.9.0"
+mokkery = "2.10.0"
 moshi = "1.15.2"
 mozillaAndroidComponents = "141.0.1"
 okhttp = "4.12.0"