diff --git a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
index 5516275f6a4..25d64d5073c 100644
--- a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
@@ -146,7 +146,7 @@ androidx.savedstate:savedstate:1.3.1
 androidx.slidingpanelayout:slidingpanelayout:1.2.0
 androidx.sqlite:sqlite-framework:2.4.0
 androidx.sqlite:sqlite:2.4.0
-androidx.startup:startup-runtime:1.1.1
+androidx.startup:startup-runtime:1.2.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.tracing:tracing-ktx:1.2.0
 androidx.tracing:tracing:1.2.0
@@ -191,7 +191,8 @@ com.mikepenz:fastadapter-extensions-swipe:5.7.0
 com.mikepenz:fastadapter-extensions-utils:5.7.0
 com.mikepenz:fastadapter:5.7.0
 com.squareup.moshi:moshi:1.15.2
-com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okhttp3:okhttp-android:5.1.0
+com.squareup.okhttp3:okhttp:5.1.0
 com.squareup.okio:okio-jvm:3.16.0
 com.squareup.okio:okio:3.16.0
 com.takisoft.colorpicker:colorpicker:1.0.0
diff --git a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
index 38c56add0bd..b674a70abdb 100644
--- a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
@@ -146,7 +146,7 @@ androidx.savedstate:savedstate:1.3.1
 androidx.slidingpanelayout:slidingpanelayout:1.2.0
 androidx.sqlite:sqlite-framework:2.4.0
 androidx.sqlite:sqlite:2.4.0
-androidx.startup:startup-runtime:1.1.1
+androidx.startup:startup-runtime:1.2.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.tracing:tracing-ktx:1.2.0
 androidx.tracing:tracing:1.2.0
@@ -204,7 +204,8 @@ com.mikepenz:fastadapter-extensions-swipe:5.7.0
 com.mikepenz:fastadapter-extensions-utils:5.7.0
 com.mikepenz:fastadapter:5.7.0
 com.squareup.moshi:moshi:1.15.2
-com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okhttp3:okhttp-android:5.1.0
+com.squareup.okhttp3:okhttp:5.1.0
 com.squareup.okio:okio-jvm:3.16.0
 com.squareup.okio:okio:3.16.0
 com.takisoft.colorpicker:colorpicker:1.0.0
diff --git a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
index 9483aa6aa3a..9d86a9073fe 100644
--- a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
@@ -151,7 +151,7 @@ androidx.savedstate:savedstate:1.3.1
 androidx.slidingpanelayout:slidingpanelayout:1.2.0
 androidx.sqlite:sqlite-framework:2.4.0
 androidx.sqlite:sqlite:2.4.0
-androidx.startup:startup-runtime:1.1.1
+androidx.startup:startup-runtime:1.2.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.tracing:tracing-ktx:1.2.0
 androidx.tracing:tracing:1.2.0
@@ -198,7 +198,8 @@ com.mikepenz:fastadapter-extensions-swipe:5.7.0
 com.mikepenz:fastadapter-extensions-utils:5.7.0
 com.mikepenz:fastadapter:5.7.0
 com.squareup.moshi:moshi:1.15.2
-com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okhttp3:okhttp-android:5.1.0
+com.squareup.okhttp3:okhttp:5.1.0
 com.squareup.okio:okio-jvm:3.16.0
 com.squareup.okio:okio:3.16.0
 com.takisoft.colorpicker:colorpicker:1.0.0
diff --git a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
index 9483aa6aa3a..9d86a9073fe 100644
--- a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
@@ -151,7 +151,7 @@ androidx.savedstate:savedstate:1.3.1
 androidx.slidingpanelayout:slidingpanelayout:1.2.0
 androidx.sqlite:sqlite-framework:2.4.0
 androidx.sqlite:sqlite:2.4.0
-androidx.startup:startup-runtime:1.1.1
+androidx.startup:startup-runtime:1.2.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.tracing:tracing-ktx:1.2.0
 androidx.tracing:tracing:1.2.0
@@ -198,7 +198,8 @@ com.mikepenz:fastadapter-extensions-swipe:5.7.0
 com.mikepenz:fastadapter-extensions-utils:5.7.0
 com.mikepenz:fastadapter:5.7.0
 com.squareup.moshi:moshi:1.15.2
-com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okhttp3:okhttp-android:5.1.0
+com.squareup.okhttp3:okhttp:5.1.0
 com.squareup.okio:okio-jvm:3.16.0
 com.squareup.okio:okio:3.16.0
 com.takisoft.colorpicker:colorpicker:1.0.0
diff --git a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
index 9483aa6aa3a..9d86a9073fe 100644
--- a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
@@ -151,7 +151,7 @@ androidx.savedstate:savedstate:1.3.1
 androidx.slidingpanelayout:slidingpanelayout:1.2.0
 androidx.sqlite:sqlite-framework:2.4.0
 androidx.sqlite:sqlite:2.4.0
-androidx.startup:startup-runtime:1.1.1
+androidx.startup:startup-runtime:1.2.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.tracing:tracing-ktx:1.2.0
 androidx.tracing:tracing:1.2.0
@@ -198,7 +198,8 @@ com.mikepenz:fastadapter-extensions-swipe:5.7.0
 com.mikepenz:fastadapter-extensions-utils:5.7.0
 com.mikepenz:fastadapter:5.7.0
 com.squareup.moshi:moshi:1.15.2
-com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okhttp3:okhttp-android:5.1.0
+com.squareup.okhttp3:okhttp:5.1.0
 com.squareup.okio:okio-jvm:3.16.0
 com.squareup.okio:okio:3.16.0
 com.takisoft.colorpicker:colorpicker:1.0.0
diff --git a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
index 551b99a578f..c3ccbf84a79 100644
--- a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
@@ -151,7 +151,7 @@ androidx.savedstate:savedstate:1.3.1
 androidx.slidingpanelayout:slidingpanelayout:1.2.0
 androidx.sqlite:sqlite-framework:2.4.0
 androidx.sqlite:sqlite:2.4.0
-androidx.startup:startup-runtime:1.1.1
+androidx.startup:startup-runtime:1.2.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.tracing:tracing-ktx:1.2.0
 androidx.tracing:tracing:1.2.0
@@ -211,7 +211,8 @@ com.mikepenz:fastadapter-extensions-swipe:5.7.0
 com.mikepenz:fastadapter-extensions-utils:5.7.0
 com.mikepenz:fastadapter:5.7.0
 com.squareup.moshi:moshi:1.15.2
-com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okhttp3:okhttp-android:5.1.0
+com.squareup.okhttp3:okhttp:5.1.0
 com.squareup.okio:okio-jvm:3.16.0
 com.squareup.okio:okio:3.16.0
 com.takisoft.colorpicker:colorpicker:1.0.0
diff --git a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
index 551b99a578f..c3ccbf84a79 100644
--- a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
@@ -151,7 +151,7 @@ androidx.savedstate:savedstate:1.3.1
 androidx.slidingpanelayout:slidingpanelayout:1.2.0
 androidx.sqlite:sqlite-framework:2.4.0
 androidx.sqlite:sqlite:2.4.0
-androidx.startup:startup-runtime:1.1.1
+androidx.startup:startup-runtime:1.2.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.tracing:tracing-ktx:1.2.0
 androidx.tracing:tracing:1.2.0
@@ -211,7 +211,8 @@ com.mikepenz:fastadapter-extensions-swipe:5.7.0
 com.mikepenz:fastadapter-extensions-utils:5.7.0
 com.mikepenz:fastadapter:5.7.0
 com.squareup.moshi:moshi:1.15.2
-com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okhttp3:okhttp-android:5.1.0
+com.squareup.okhttp3:okhttp:5.1.0
 com.squareup.okio:okio-jvm:3.16.0
 com.squareup.okio:okio:3.16.0
 com.takisoft.colorpicker:colorpicker:1.0.0
diff --git a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
index 551b99a578f..c3ccbf84a79 100644
--- a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
@@ -151,7 +151,7 @@ androidx.savedstate:savedstate:1.3.1
 androidx.slidingpanelayout:slidingpanelayout:1.2.0
 androidx.sqlite:sqlite-framework:2.4.0
 androidx.sqlite:sqlite:2.4.0
-androidx.startup:startup-runtime:1.1.1
+androidx.startup:startup-runtime:1.2.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.tracing:tracing-ktx:1.2.0
 androidx.tracing:tracing:1.2.0
@@ -211,7 +211,8 @@ com.mikepenz:fastadapter-extensions-swipe:5.7.0
 com.mikepenz:fastadapter-extensions-utils:5.7.0
 com.mikepenz:fastadapter:5.7.0
 com.squareup.moshi:moshi:1.15.2
-com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okhttp3:okhttp-android:5.1.0
+com.squareup.okhttp3:okhttp:5.1.0
 com.squareup.okio:okio-jvm:3.16.0
 com.squareup.okio:okio:3.16.0
 com.takisoft.colorpicker:colorpicker:1.0.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 852a91c00e6..ce078ee4ece 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -99,7 +99,7 @@ mockitoKotlin = "6.0.0"
 mokkery = "2.10.0"
 moshi = "1.15.2"
 mozillaAndroidComponents = "141.0.1"
-okhttp = "4.12.0"
+okhttp = "5.1.0"
 okio = "3.16.0"
 preferencesFix = "1.1.0"
 robolectric = "4.15.1"