diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 46890d253f..c22264eaf1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -185,7 +185,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
 # https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
 # All new features should not be implemented in the pull request that upgrades the version, developers should
 # only fix API breaks and may add some TODOs.
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.08.19"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.08.25"
 
 # Others
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt
index 7bfc5dc6bb..2994683a61 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt
@@ -35,6 +35,7 @@ sealed interface StateEventType {
     data object RoomImagePack : StateEventType
     data object RoomLanguage : StateEventType
     data object RoomPolicy : StateEventType
+    data object RoomRetention : StateEventType
 
     data class Custom(val type: String) : StateEventType
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
index 0d593626bb..b1d93fd903 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
@@ -99,7 +99,6 @@ class RustMatrixClientFactory(
             isMessageSearchAvailable = isMessageSearchAvailable,
         )
             .homeserverUrl(sessionData.homeserverUrl)
-            .username(sessionData.userId)
             .let { (clientBuilderEnterpriseHook(RustMatrixClientBuilder(it), SessionId(sessionData.userId)) as RustMatrixClientBuilder).inner }
             .use { it.build() }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt
index 13a040525e..e64eb87570 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt
@@ -39,6 +39,7 @@ fun StateEventType.map(): RustStateEventType = when (this) {
     StateEventType.RoomImagePack -> RustStateEventType.RoomImagePack
     StateEventType.RoomLanguage -> RustStateEventType.RoomLanguage
     StateEventType.RoomPolicy -> RustStateEventType.RoomPolicy
+    StateEventType.RoomRetention -> RustStateEventType.RoomRetention
     is StateEventType.Custom -> stateEventTypeFromString(type)
 }
 
@@ -69,5 +70,6 @@ fun RustStateEventType.map(): StateEventType = when (this) {
     RustStateEventType.RoomImagePack -> StateEventType.RoomImagePack
     RustStateEventType.RoomLanguage -> StateEventType.RoomLanguage
     RustStateEventType.RoomPolicy -> StateEventType.RoomPolicy
+    RustStateEventType.RoomRetention -> StateEventType.RoomRetention
     is RustStateEventType.Custom -> StateEventType.Custom(this.toString())
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClientBuilder.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClientBuilder.kt
index 623fe9a8cf..ba010ed728 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClientBuilder.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClientBuilder.kt
@@ -42,7 +42,7 @@ class FakeFfiClientBuilder(
     override fun setSessionDelegate(sessionDelegate: ClientSessionDelegate) = this
     override fun slidingSyncVersionBuilder(versionBuilder: SlidingSyncVersionBuilder) = this
     override fun userAgent(userAgent: String) = this
-    override fun username(username: String) = this
+    override fun serverNameFromUserId(userId: String): ClientBuilder = this
     override fun enableShareHistoryOnInvite(enableShareHistoryOnInvite: Boolean): ClientBuilder = this
     override fun threadsEnabled(enabled: Boolean, threadSubscriptions: Boolean): ClientBuilder = this
     override fun sqliteStore(config: SqliteStoreBuilder): ClientBuilder = this