diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8eda4f0..c87dcad 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -17,7 +17,7 @@ android {
         includeInBundle = false
     }
 
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "org.unifiedpush.distributor.sunup"
diff --git a/app/src/main/java/org/unifiedpush/distributor/sunup/api/ApiUrlCandidate.kt b/app/src/main/java/org/unifiedpush/distributor/sunup/api/ApiUrlCandidate.kt
index 6831628..96c015b 100644
--- a/app/src/main/java/org/unifiedpush/distributor/sunup/api/ApiUrlCandidate.kt
+++ b/app/src/main/java/org/unifiedpush/distributor/sunup/api/ApiUrlCandidate.kt
@@ -1,6 +1,6 @@
 package org.unifiedpush.distributor.sunup.api
 
-import androidx.lifecycle.AtomicReference
+import java.util.concurrent.atomic.AtomicReference
 
 /**
  * Candidate for a new API url
diff --git a/app/src/main/java/org/unifiedpush/distributor/sunup/services/FgService.kt b/app/src/main/java/org/unifiedpush/distributor/sunup/services/FgService.kt
index fc4cc64..a2ffee0 100644
--- a/app/src/main/java/org/unifiedpush/distributor/sunup/services/FgService.kt
+++ b/app/src/main/java/org/unifiedpush/distributor/sunup/services/FgService.kt
@@ -2,7 +2,6 @@ package org.unifiedpush.distributor.sunup.services
 
 import android.content.Context
 import android.util.Log
-import androidx.lifecycle.AtomicReference
 import org.unifiedpush.distributor.service.ForegroundService
 import org.unifiedpush.distributor.service.ForegroundServiceFactory
 import org.unifiedpush.distributor.sunup.api.MessageSender
@@ -12,6 +11,7 @@ import org.unifiedpush.distributor.sunup.callback.NetworkCallbackFactory
 import org.unifiedpush.distributor.sunup.utils.ForegroundNotification
 import org.unifiedpush.distributor.sunup.utils.NOTIFICATION_ID_FOREGROUND
 import org.unifiedpush.distributor.sunup.utils.TAG
+import java.util.concurrent.atomic.AtomicReference
 
 class FgService : ForegroundService() {
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2165630..306e529 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-android-gradle-plugin = "8.7.3"
-androidx-activityCompose = "1.10.1"
-androidx-lifecycle = "2.8.7"
-androidx-work = "2.10.0"
-appcompat = "1.7.0"
+android-gradle-plugin = "8.13.0"
+androidx-activityCompose = "1.11.0"
+androidx-lifecycle = "2.9.4"
+androidx-work = "2.10.4"
+appcompat = "1.7.1"
 unifiedpush_distributor = "0.4.0"
 unifiedpush_distributor_ui = "0.4.0"
 kotlin = "2.1.0"
-kotlinx_serializationJson = "1.8.0"
+kotlinx_serializationJson = "1.9.0"
 ktlint = "12.1.2"
 material3Android = "1.3.2"
-okhttp = "5.0.0-alpha.14"
-uiTooling = "1.7.8"
+okhttp = "5.1.0"
+uiTooling = "1.9.1"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
@@ -26,7 +26,7 @@ unifiedpush-distributor-ui = { module = "org.unifiedpush.android:distributor-ui"
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx_serializationJson" }
 ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlint"}
-okhttp = { module = "com.squareup.okhttp3:okhttp-sse", version.ref = "okhttp" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0..37f853b 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.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME