diff --git a/GenericApp/app/build.gradle b/GenericApp/app/build.gradle
index 1fd0ec2..3ad3f2f 100644
--- a/GenericApp/app/build.gradle
+++ b/GenericApp/app/build.gradle
@@ -64,13 +64,13 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.core:core-ktx:1.15.0'
+    implementation 'androidx.core:core-ktx:1.16.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation "com.google.android.gms:play-services-location:21.3.0"
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1"
-    implementation platform('com.google.firebase:firebase-bom:33.6.0')
+    implementation platform('com.google.firebase:firebase-bom:33.12.0')
     implementation 'com.google.firebase:firebase-messaging-ktx'
     implementation 'com.google.android.material:material:1.12.0'
     implementation project(':ORLib')
diff --git a/ORLib/build.gradle b/ORLib/build.gradle
index 9c8db68..567bb8f 100644
--- a/ORLib/build.gradle
+++ b/ORLib/build.gradle
@@ -54,16 +54,16 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.15.0'
+    implementation 'androidx.core:core-ktx:1.16.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation "com.google.android.gms:play-services-location:21.3.0"
     implementation 'com.google.android.gms:play-services-vision:20.1.3'
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1"
-    implementation platform('com.google.firebase:firebase-bom:33.6.0')
+    implementation platform('com.google.firebase:firebase-bom:33.12.0')
     implementation 'com.google.firebase:firebase-messaging-ktx'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
 }
 
 
diff --git a/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt b/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
index ec8f3d7..d7251b5 100644
--- a/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
+++ b/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
@@ -211,7 +211,14 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagi
         orAlertAction: ORAlertAction?
     ): PendingIntent {
         val actionIntent = when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ->Intent(this, NotificationActivity::class.java)
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+                Intent(this, NotificationActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or 
+                            Intent.FLAG_ACTIVITY_CLEAR_TASK or
+                            Intent.FLAG_ACTIVITY_NO_HISTORY or
+                            Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+                }
+            }
             else -> Intent(this, ORMessagingActionService::class.java)
         }
         actionIntent.putExtra("notificationId", notificationId)
diff --git a/build.gradle b/build.gradle
index e5a57f3..72ec4ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "2.0.20"
+    ext.kotlin_version = "2.1.20"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
+        classpath 'com.android.tools.build:gradle:8.9.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.4.2'
         // NOTE: Do not place your application dependencies here; they belong