diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 254a1fc3cc8..3efb2d8dd4c 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.2.10" />
+    <option name="version" value="2.2.20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt b/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt
index f50a3b6face..9dec26ad747 100644
--- a/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt
+++ b/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt
@@ -35,6 +35,7 @@ import dev.zacsweers.metro.BindingContainer
 import dev.zacsweers.metro.Binds
 import dev.zacsweers.metro.ContributesTo
 import dev.zacsweers.metro.IntoMap
+import dev.zacsweers.metro.Origin
 import io.element.android.annotations.ContributesNode
 import org.jetbrains.kotlin.name.FqName
 
@@ -71,14 +72,16 @@ class ContributesNodeProcessor(
         val scope = annotation.arguments.find { it.name?.asString() == "scope" }!!.value as KSType
         val modulePackage = ksClass.packageName.asString()
         val moduleClassName = "${ksClass.simpleName.asString()}_Module"
+        val nodeClassName = ClassName.bestGuess(ksClass.qualifiedName!!.asString())
         val content = FileSpec.builder(
             packageName = modulePackage,
             fileName = moduleClassName,
         )
             .addType(
                 TypeSpec.interfaceBuilder(moduleClassName)
+                    .addAnnotation(AnnotationSpec.builder(Origin::class).addMember(CLASS_PLACEHOLDER, nodeClassName).build())
                     .addAnnotation(BindingContainer::class)
-                    .addAnnotation(AnnotationSpec.builder(ContributesTo::class).addMember("%T::class", scope.toTypeName()).build())
+                    .addAnnotation(AnnotationSpec.builder(ContributesTo::class).addMember(CLASS_PLACEHOLDER, scope.toTypeName()).build())
                     .addFunction(
                         FunSpec.builder("bind${ksClass.simpleName.asString()}Factory")
                             .addModifiers(KModifier.ABSTRACT)
@@ -88,7 +91,7 @@ class ContributesNodeProcessor(
                             .addAnnotation(IntoMap::class)
                             .addAnnotation(
                                 AnnotationSpec.Companion.builder(ClassName.bestGuess(nodeKeyFqName.asString())).addMember(
-                                    "%T::class",
+                                    CLASS_PLACEHOLDER,
                                     ClassName.bestGuess(ksClass.qualifiedName!!.asString())
                                 ).build()
                             )
@@ -138,6 +141,7 @@ class ContributesNodeProcessor(
             .addType(
                 TypeSpec.interfaceBuilder(assistedFactoryClassName)
                     .addSuperinterface(ClassName.bestGuess(assistedNodeFactoryFqName.asString()).parameterizedBy(nodeClassName))
+                    .addAnnotation(AnnotationSpec.builder(Origin::class).addMember("%T::class", nodeClassName).build())
                     .addAnnotation(AssistedFactory::class)
                     .addFunction(
                         FunSpec.builder("create")
@@ -161,6 +165,7 @@ class ContributesNodeProcessor(
     }
 
     companion object {
+        private const val CLASS_PLACEHOLDER = "%T::class"
         private val assistedNodeFactoryFqName = FqName("io.element.android.libraries.architecture.AssistedNodeFactory")
         private val nodeKeyFqName = FqName("io.element.android.libraries.architecture.NodeKey")
     }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewWidgetMessageInterceptor.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewWidgetMessageInterceptor.kt
index 55adc246e9e..82500c59371 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewWidgetMessageInterceptor.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewWidgetMessageInterceptor.kt
@@ -133,6 +133,7 @@ class WebViewWidgetMessageInterceptor(
                 return assetLoader.shouldInterceptRequest(request.url)
             }
 
+            @Suppress("OVERRIDE_DEPRECATION")
             override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
                 return assetLoader.shouldInterceptRequest(url.toUri())
             }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0825c5049e0..54d7f34dbbf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,9 +6,9 @@
 # We cannot use 8.12.+ since it breaks F-Droid build (see https://github.com/element-hq/element-x-android/issues/3420#issuecomment-3199571010)
 android_gradle_plugin = "8.11.1"
 # When updateing this, please also update the version in the file ./idea/kotlinc.xml
-kotlin = "2.2.10"
+kotlin = "2.2.20"
 kotlinpoet = "2.2.0"
-ksp = "2.2.10-2.0.2"
+ksp = "2.2.20-2.0.2"
 firebaseAppDistribution = "5.1.1"
 
 # AndroidX
@@ -51,7 +51,7 @@ haze = "1.6.10"
 dependencyAnalysis = "2.19.0"
 
 # DI
-metro = "0.6.4"
+metro = "0.6.6"
 
 # Auto service
 autoservice = "1.1.1"
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMap.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMap.kt
index 5de213615e7..f1ef0f0459b 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMap.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMap.kt
@@ -8,7 +8,7 @@
 
 package io.element.android.libraries.maplibre.compose
 
-import android.content.ComponentCallbacks
+import android.content.ComponentCallbacks2
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Bundle
@@ -235,11 +235,15 @@ private fun MapView.lifecycleObserver(previousState: MutableState<Lifecycle.Even
         previousState.value = event
     }
 
-private fun MapView.componentCallbacks(): ComponentCallbacks =
-    object : ComponentCallbacks {
-        override fun onConfigurationChanged(config: Configuration) {}
+private fun MapView.componentCallbacks(): ComponentCallbacks2 =
+    object : ComponentCallbacks2 {
+        override fun onConfigurationChanged(config: Configuration) = Unit
 
-        override fun onLowMemory() {
+        @Suppress("OVERRIDE_DEPRECATION")
+        override fun onLowMemory() = Unit
+
+        override fun onTrimMemory(level: Int) {
+            // We call the `MapView.onLowMemory` method for any memory trim level
             this@componentCallbacks.onLowMemory()
         }
     }