diff --git a/Cargo.lock b/Cargo.lock
index 4745da3aa..aaffa9c17 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4917,7 +4917,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.14.1"
-source = "git+https://github.com/ruma/ruma?rev=b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60#b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60"
+source = "git+https://github.com/ruma/ruma?rev=a0acf4187a7c7557d145db54bcb23b01f6295ce7#a0acf4187a7c7557d145db54bcb23b01f6295ce7"
 dependencies = [
  "assign",
  "js_int",
@@ -4935,7 +4935,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.22.1"
-source = "git+https://github.com/ruma/ruma?rev=b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60#b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60"
+source = "git+https://github.com/ruma/ruma?rev=a0acf4187a7c7557d145db54bcb23b01f6295ce7#a0acf4187a7c7557d145db54bcb23b01f6295ce7"
 dependencies = [
  "as_variant",
  "assign",
@@ -4958,7 +4958,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.17.1"
-source = "git+https://github.com/ruma/ruma?rev=b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60#b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60"
+source = "git+https://github.com/ruma/ruma?rev=a0acf4187a7c7557d145db54bcb23b01f6295ce7#a0acf4187a7c7557d145db54bcb23b01f6295ce7"
 dependencies = [
  "as_variant",
  "base64",
@@ -4990,7 +4990,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.32.1"
-source = "git+https://github.com/ruma/ruma?rev=b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60#b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60"
+source = "git+https://github.com/ruma/ruma?rev=a0acf4187a7c7557d145db54bcb23b01f6295ce7#a0acf4187a7c7557d145db54bcb23b01f6295ce7"
 dependencies = [
  "as_variant",
  "indexmap",
@@ -5013,7 +5013,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.13.1"
-source = "git+https://github.com/ruma/ruma?rev=b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60#b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60"
+source = "git+https://github.com/ruma/ruma?rev=a0acf4187a7c7557d145db54bcb23b01f6295ce7#a0acf4187a7c7557d145db54bcb23b01f6295ce7"
 dependencies = [
  "headers",
  "http",
@@ -5034,7 +5034,7 @@ dependencies = [
 [[package]]
 name = "ruma-html"
 version = "0.6.0"
-source = "git+https://github.com/ruma/ruma?rev=b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60#b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60"
+source = "git+https://github.com/ruma/ruma?rev=a0acf4187a7c7557d145db54bcb23b01f6295ce7#a0acf4187a7c7557d145db54bcb23b01f6295ce7"
 dependencies = [
  "as_variant",
  "html5ever",
@@ -5045,7 +5045,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.12.0"
-source = "git+https://github.com/ruma/ruma?rev=b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60#b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60"
+source = "git+https://github.com/ruma/ruma?rev=a0acf4187a7c7557d145db54bcb23b01f6295ce7#a0acf4187a7c7557d145db54bcb23b01f6295ce7"
 dependencies = [
  "js_int",
  "thiserror 2.0.17",
@@ -5054,7 +5054,7 @@ dependencies = [
 [[package]]
 name = "ruma-macros"
 version = "0.17.1"
-source = "git+https://github.com/ruma/ruma?rev=b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60#b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60"
+source = "git+https://github.com/ruma/ruma?rev=a0acf4187a7c7557d145db54bcb23b01f6295ce7#a0acf4187a7c7557d145db54bcb23b01f6295ce7"
 dependencies = [
  "as_variant",
  "cfg-if",
@@ -5070,7 +5070,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.19.0"
-source = "git+https://github.com/ruma/ruma?rev=b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60#b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60"
+source = "git+https://github.com/ruma/ruma?rev=a0acf4187a7c7557d145db54bcb23b01f6295ce7#a0acf4187a7c7557d145db54bcb23b01f6295ce7"
 dependencies = [
  "base64",
  "ed25519-dalek",
diff --git a/Cargo.toml b/Cargo.toml
index c7c9c4595..50b21dbc6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,7 +71,7 @@ rand = { version = "0.10.0", default-features = false, features = ["std", "std_r
 regex = { version = "1.12.2", default-features = false }
 reqwest = { version = "0.13.1", default-features = false }
 rmp-serde = { version = "1.3.0", default-features = false }
-ruma = { git = "https://github.com/ruma/ruma", rev = "b0f6da250a1a6e7ec56ec59e7d353dbd5f3fcc60", features = [
+ruma = { git = "https://github.com/ruma/ruma", rev = "a0acf4187a7c7557d145db54bcb23b01f6295ce7", features = [
     "client-api-c",
     "compat-unset-avatar",
     "compat-upload-signatures",
diff --git a/crates/matrix-sdk/src/account.rs b/crates/matrix-sdk/src/account.rs
index ea3d18929..a3c56dd2f 100644
--- a/crates/matrix-sdk/src/account.rs
+++ b/crates/matrix-sdk/src/account.rs
@@ -42,9 +42,8 @@ use ruma::{
             config::{get_global_account_data, set_global_account_data},
             error::ErrorKind,
             profile::{
-                DisplayName, ProfileFieldName, ProfileFieldValue, StaticProfileField,
-                delete_profile_field, get_avatar_url, get_profile, get_profile_field,
-                set_avatar_url, set_display_name, set_profile_field,
+                DisplayName, StaticProfileField, delete_profile_field, get_avatar_url, get_profile,
+                get_profile_field, set_avatar_url, set_display_name, set_profile_field,
             },
             uiaa::AuthData,
         },
@@ -61,6 +60,7 @@ use ruma::{
         push_rules::PushRulesEventContent,
         room::MediaSource,
     },
+    profile::{ProfileFieldName, ProfileFieldValue},
     push::Ruleset,
     serde::Raw,
     thirdparty::Medium,
diff --git a/crates/matrix-sdk/src/client/homeserver_capabilities.rs b/crates/matrix-sdk/src/client/homeserver_capabilities.rs
index 6b3e69b40..98f7801cd 100644
--- a/crates/matrix-sdk/src/client/homeserver_capabilities.rs
+++ b/crates/matrix-sdk/src/client/homeserver_capabilities.rs
@@ -1,6 +1,6 @@
 use matrix_sdk_base::{StateStoreDataKey, StateStoreDataValue};
-use ruma::api::client::{
-    discovery::{
+use ruma::{
+    api::client::discovery::{
         get_capabilities,
         get_capabilities::v3::{Capabilities, ProfileFieldsCapability},
     },
diff --git a/crates/matrix-sdk/src/test_utils/mocks/mod.rs b/crates/matrix-sdk/src/test_utils/mocks/mod.rs
index 0ef82b876..d423c99ec 100644
--- a/crates/matrix-sdk/src/test_utils/mocks/mod.rs
+++ b/crates/matrix-sdk/src/test_utils/mocks/mod.rs
@@ -36,7 +36,6 @@ use ruma::{
     OwnedOneTimeKeyId, OwnedRoomId, OwnedUserId, RoomId, ServerName, UserId,
     api::client::{
         discovery::get_capabilities::v3::Capabilities,
-        profile::{ProfileFieldName, ProfileFieldValue},
         receipt::create_receipt::v3::ReceiptType,
         room::Visibility,
         sync::sync_events::v5,
@@ -53,6 +52,7 @@ use ruma::{
         room::member::RoomMemberEvent,
     },
     media::Method,
+    profile::{ProfileFieldName, ProfileFieldValue},
     push::RuleKind,
     serde::Raw,
     time::Duration,
diff --git a/crates/matrix-sdk/tests/integration/account.rs b/crates/matrix-sdk/tests/integration/account.rs
index 9a11510bb..36f624751 100644
--- a/crates/matrix-sdk/tests/integration/account.rs
+++ b/crates/matrix-sdk/tests/integration/account.rs
@@ -4,9 +4,10 @@ use matrix_sdk_test::async_test;
 use ruma::{
     api::{
         MatrixVersion,
-        client::profile::{AvatarUrl, DisplayName, ProfileFieldName, ProfileFieldValue, TimeZone},
+        client::profile::{AvatarUrl, DisplayName, TimeZone},
     },
     mxc_uri,
+    profile::{ProfileFieldName, ProfileFieldValue},
 };
 use serde_json::json;
 use wiremock::{