diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml
index a469bcc8..3899a7ed 100644
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@@ -79,10 +79,8 @@ axum-extra.workspace = true
 axum.workspace = true
 base64.workspace = true
 bytes.workspace = true
-ctor.workspace = true
-tuwunel-core.workspace = true
-tuwunel-service.workspace = true
 const-str.workspace = true
+ctor.workspace = true
 futures.workspace = true
 hmac.workspace = true
 http.workspace = true
@@ -100,6 +98,8 @@ serde.workspace = true
 sha1.workspace = true
 tokio.workspace = true
 tracing.workspace = true
+tuwunel-core.workspace = true
+tuwunel-service.workspace = true
 
 [lints]
 workspace = true
diff --git a/src/database/maps.rs b/src/database/maps.rs
index e40a81cd..7e832486 100644
--- a/src/database/maps.rs
+++ b/src/database/maps.rs
@@ -100,6 +100,10 @@ pub(super) static MAPS: &[Descriptor] = &[
 		name: "lazyloadedids",
 		..descriptor::RANDOM_SMALL
 	},
+	Descriptor {
+		name: "logintoken_expiresatuserid",
+		..descriptor::RANDOM_SMALL
+	},
 	Descriptor {
 		name: "mediaid_file",
 		..descriptor::RANDOM_SMALL
@@ -112,6 +116,10 @@ pub(super) static MAPS: &[Descriptor] = &[
 		name: "onetimekeyid_onetimekeys",
 		..descriptor::RANDOM_SMALL
 	},
+	Descriptor {
+		name: "openidtoken_expiresatuserid",
+		..descriptor::RANDOM_SMALL
+	},
 	Descriptor {
 		name: "pduid_pdu",
 		cache_disp: CacheDisp::SharedWith("eventid_outlierpdu"),
@@ -402,14 +410,6 @@ pub(super) static MAPS: &[Descriptor] = &[
 		name: "useridprofilekey_value",
 		..descriptor::RANDOM_SMALL
 	},
-	Descriptor {
-		name: "openidtoken_expiresatuserid",
-		..descriptor::RANDOM_SMALL
-	},
-	Descriptor {
-		name: "logintoken_expiresatuserid",
-		..descriptor::RANDOM_SMALL
-	},
 	Descriptor {
 		name: "userroomid_highlightcount",
 		..descriptor::RANDOM