diff --git a/Cargo.lock b/Cargo.lock
index 8f0b0780c..46e73e6b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4962,8 +4962,8 @@ dependencies = [
 
 [[package]]
 name = "ruma"
-version = "0.16.0"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+version = "0.17.0"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
  "assign",
  "js_int",
@@ -4981,8 +4981,8 @@ dependencies = [
 
 [[package]]
 name = "ruma-appservice-api"
-version = "0.16.0"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+version = "0.17.0"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
  "http",
  "js_int",
@@ -4994,8 +4994,8 @@ dependencies = [
 
 [[package]]
 name = "ruma-client-api"
-version = "0.24.0"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+version = "0.25.0"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
  "as_variant",
  "assign",
@@ -5016,11 +5016,11 @@ dependencies = [
 
 [[package]]
 name = "ruma-common"
-version = "0.19.0"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+version = "0.20.0"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
  "as_variant",
- "base64 0.22.1",
+ "base64 0.23.1",
  "bytes",
  "date_header",
  "form_urlencoded",
@@ -5049,8 +5049,8 @@ dependencies = [
 
 [[package]]
 name = "ruma-events"
-version = "0.34.0"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+version = "0.35.0"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
  "as_variant",
  "indexmap 2.14.2",
@@ -5070,11 +5070,10 @@ dependencies = [
 
 [[package]]
 name = "ruma-federation-api"
-version = "0.15.0"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+version = "0.16.0"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
  "bytes",
- "headers",
  "http",
  "http-auth",
  "httparse",
@@ -5094,7 +5093,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.12.1"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
  "js_int",
  "thiserror 2.0.21",
@@ -5102,8 +5101,8 @@ dependencies = [
 
 [[package]]
 name = "ruma-macros"
-version = "0.19.0"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+version = "0.20.0"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
  "as_variant",
  "cfg-if",
@@ -5118,8 +5117,8 @@ dependencies = [
 
 [[package]]
 name = "ruma-push-gateway-api"
-version = "0.15.0"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+version = "0.16.0"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -5130,10 +5129,10 @@ dependencies = [
 
 [[package]]
 name = "ruma-signatures"
-version = "0.21.0"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+version = "0.22.0"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
- "base64 0.22.1",
+ "base64 0.23.1",
  "ed25519-dalek 3.0.0",
  "memchr",
  "pkcs8 0.11.0",
@@ -5147,8 +5146,8 @@ dependencies = [
 
 [[package]]
 name = "ruma-state-res"
-version = "0.17.0"
-source = "git+https://github.com/ruma/ruma.git?rev=83d80c8d869e0ba09becbf7e7378eefc7377cfdb#83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+version = "0.18.0"
+source = "git+https://github.com/ruma/ruma.git?rev=e7384f01eacd454c593683de50491201e2160fd1#e7384f01eacd454c593683de50491201e2160fd1"
 dependencies = [
  "js_int",
  "ruma-common",
diff --git a/Cargo.toml b/Cargo.toml
index d92ec888b..859640d35 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -347,7 +347,7 @@ version = "1.1.1"
 # Used for matrix spec type definitions and helpers
 [workspace.dependencies.ruma]
 git = "https://github.com/ruma/ruma.git"
-rev = "83d80c8d869e0ba09becbf7e7378eefc7377cfdb"
+rev = "e7384f01eacd454c593683de50491201e2160fd1"
 features = [
     "appservice-api-c",
     "client-api",
diff --git a/src/api/client/mutual_rooms.rs b/src/api/client/mutual_rooms.rs
index 950c9c913..532a5cc79 100644
--- a/src/api/client/mutual_rooms.rs
+++ b/src/api/client/mutual_rooms.rs
@@ -1,7 +1,7 @@
 use axum::extract::State;
 use conduwuit::{Err, Result};
 use futures::StreamExt;
-use ruma::{OwnedRoomId, api::client::membership::mutual_rooms};
+use ruma::{OwnedRoomId, api::client::membership::get_mutual_rooms};
 
 use crate::Ruma;
 
@@ -13,8 +13,8 @@ use crate::Ruma;
 #[tracing::instrument(skip_all, name = "mutual_rooms", level = "info")]
 pub(crate) async fn get_mutual_rooms_unstable_route(
 	State(services): State<crate::State>,
-	body: Ruma<mutual_rooms::unstable::Request>,
-) -> Result<mutual_rooms::unstable::Response> {
+	body: Ruma<get_mutual_rooms::unstable::Request>,
+) -> Result<get_mutual_rooms::unstable::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
 
 	if sender_user == body.user_id {
@@ -28,7 +28,7 @@ pub(crate) async fn get_mutual_rooms_unstable_route(
 		.collect()
 		.await;
 
-	Ok(mutual_rooms::unstable::Response::new(mutual_rooms))
+	Ok(get_mutual_rooms::unstable::Response::new(mutual_rooms))
 }
 
 /// # `GET /_matrix/client/v1/mutual_rooms`
@@ -37,8 +37,8 @@ pub(crate) async fn get_mutual_rooms_unstable_route(
 #[tracing::instrument(skip_all, name = "mutual_rooms", level = "info")]
 pub(crate) async fn get_mutual_rooms_route(
 	State(services): State<crate::State>,
-	body: Ruma<mutual_rooms::v1::Request>,
-) -> Result<mutual_rooms::v1::Response> {
+	body: Ruma<get_mutual_rooms::v1::Request>,
+) -> Result<get_mutual_rooms::v1::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
 
 	if sender_user == body.user_id {
@@ -52,7 +52,7 @@ pub(crate) async fn get_mutual_rooms_route(
 		.collect()
 		.await;
 
-	Ok(mutual_rooms::v1::Response::new(
+	Ok(get_mutual_rooms::v1::Response::new(
 		mutual_rooms
 			.len()
 			.try_into()
diff --git a/src/api/router/auth.rs b/src/api/router/auth.rs
index f62f83eb5..cbabf1b77 100644
--- a/src/api/router/auth.rs
+++ b/src/api/router/auth.rs
@@ -138,7 +138,7 @@ impl CheckAuth for ServerSignatures {
 		let keys: PubKeys = [(output.key.to_string(), key.key)].into();
 		let keys: PubKeyMap = [(output.origin.as_str().into(), keys)].into();
 
-		match output.verify_request(request, destination, &keys) {
+		match output.verify_http_request(request, destination, &keys) {
 			| Ok(()) => {
 				if services
 					.moderation
diff --git a/src/service/federation/execute.rs b/src/service/federation/execute.rs
index 3fca3ba1f..52af916e5 100644
--- a/src/service/federation/execute.rs
+++ b/src/service/federation/execute.rs
@@ -14,7 +14,7 @@ use ruma::{
 		SupportedVersions,
 		auth_scheme::{AuthScheme, NoAuthentication},
 		error::Error as RumaError,
-		federation::authentication::{ServerSignatures, ServerSignaturesInput},
+		federation::authentication::{ServerSignatures, XMatrixSigningInput},
 		path_builder::PathBuilder,
 	},
 };
@@ -92,7 +92,7 @@ impl super::Service {
 				PathBuilder: PathBuilder<Input<'i>: FederationPathBuilderInput>,
 			> + Send,
 	{
-		let authentication = ServerSignaturesInput::new(
+		let authentication = XMatrixSigningInput::new(
 			self.services.server.name.clone(),
 			dest.to_owned(),
 			self.services.server_keys.keypair(),