diff --git a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
index cf044424219..6662fe2f2b3 100644
--- a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
@@ -213,13 +213,13 @@ org.jetbrains.compose.ui:ui-text:1.7.1
 org.jetbrains.compose.ui:ui-unit:1.7.1
 org.jetbrains.compose.ui:ui-util:1.7.1
 org.jetbrains.compose.ui:ui:1.7.1
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-bom:2.1.0
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
 org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
diff --git a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
index 72799ec59b8..dc94ab87eee 100644
--- a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
@@ -227,13 +227,13 @@ org.jetbrains.compose.ui:ui-text:1.7.1
 org.jetbrains.compose.ui:ui-unit:1.7.1
 org.jetbrains.compose.ui:ui-util:1.7.1
 org.jetbrains.compose.ui:ui:1.7.1
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-bom:2.1.0
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
 org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
diff --git a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
index a7abe26fd03..52b7e85e664 100644
--- a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
@@ -220,13 +220,13 @@ org.jetbrains.compose.ui:ui-text:1.7.1
 org.jetbrains.compose.ui:ui-unit:1.7.1
 org.jetbrains.compose.ui:ui-util:1.7.1
 org.jetbrains.compose.ui:ui:1.7.1
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-bom:2.1.0
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
 org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
diff --git a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
index a7abe26fd03..52b7e85e664 100644
--- a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
@@ -220,13 +220,13 @@ org.jetbrains.compose.ui:ui-text:1.7.1
 org.jetbrains.compose.ui:ui-unit:1.7.1
 org.jetbrains.compose.ui:ui-util:1.7.1
 org.jetbrains.compose.ui:ui:1.7.1
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-bom:2.1.0
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
 org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
diff --git a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
index a7abe26fd03..52b7e85e664 100644
--- a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
@@ -220,13 +220,13 @@ org.jetbrains.compose.ui:ui-text:1.7.1
 org.jetbrains.compose.ui:ui-unit:1.7.1
 org.jetbrains.compose.ui:ui-util:1.7.1
 org.jetbrains.compose.ui:ui:1.7.1
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-bom:2.1.0
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
 org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
diff --git a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
index 2d2d161db30..0b2c7b3000b 100644
--- a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
@@ -234,13 +234,13 @@ org.jetbrains.compose.ui:ui-text:1.7.1
 org.jetbrains.compose.ui:ui-unit:1.7.1
 org.jetbrains.compose.ui:ui-util:1.7.1
 org.jetbrains.compose.ui:ui:1.7.1
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-bom:2.1.0
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
 org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
diff --git a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
index 2d2d161db30..0b2c7b3000b 100644
--- a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
@@ -234,13 +234,13 @@ org.jetbrains.compose.ui:ui-text:1.7.1
 org.jetbrains.compose.ui:ui-unit:1.7.1
 org.jetbrains.compose.ui:ui-util:1.7.1
 org.jetbrains.compose.ui:ui:1.7.1
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-bom:2.1.0
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
 org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
diff --git a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
index 2d2d161db30..0b2c7b3000b 100644
--- a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
@@ -234,13 +234,13 @@ org.jetbrains.compose.ui:ui-text:1.7.1
 org.jetbrains.compose.ui:ui-unit:1.7.1
 org.jetbrains.compose.ui:ui-util:1.7.1
 org.jetbrains.compose.ui:ui:1.7.1
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-bom:2.1.0
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
 org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6396cd8a98f..f9c000a072c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,8 +15,8 @@ androidBilling = "7.1.1"
 androidDesugar = "2.1.3"
 androidMaterial = "1.12.0"
 # AGP and tools should be updated together
-androidGradlePlugin = "8.7.2"
-androidTools = "31.7.2"
+androidGradlePlugin = "8.7.3"
+androidTools = "31.7.3"
 androidxActivity = "1.9.3"
 androidxAnnotation = "1.9.1"
 androidxAppCompat = "1.7.0"
@@ -69,10 +69,10 @@ junit = "4.13.2"
 jutf7 = "1.0.0"
 jzlib = "1.0.7"
 koinBom = "3.5.6"
-kotlinBom = "2.0.21"
+kotlinBom = "2.1.0"
 # Needs to match the version used by Gradle, just check with `./gradlew --version`
 kotlinGradleBom = "2.0.20"
-kotlinKsp = "2.0.21-1.0.28"
+kotlinKsp = "2.1.0-1.0.29"
 kotlinxCoroutines = "1.9.0"
 kotlinxCollectionsImmutable = "0.3.8"
 kotlinxDateTime = "0.6.1"