diff --git a/Cargo.lock b/Cargo.lock
index efdfcda4ee..5827fde175 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2092,7 +2092,7 @@ dependencies = [
 [[package]]
 name = "dropshot"
 version = "0.10.2-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#0c0bae3cb56e05daa055d7b75217d7b0f7ed29ea"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#52d900a470b8f08eddf021813470b2a9194f2cc0"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2107,7 +2107,7 @@ dependencies = [
  "hostname 0.4.0",
  "http 0.2.12",
  "hyper 0.14.30",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "multer",
  "openapiv3",
  "paste",
@@ -2138,7 +2138,7 @@ dependencies = [
 [[package]]
 name = "dropshot_endpoint"
 version = "0.10.2-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#0c0bae3cb56e05daa055d7b75217d7b0f7ed29ea"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#52d900a470b8f08eddf021813470b2a9194f2cc0"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -2970,7 +2970,7 @@ dependencies = [
  "debug-ignore",
  "fixedbitset",
  "guppy-workspace-hack",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "itertools 0.13.0",
  "nested",
  "once_cell",
@@ -3002,7 +3002,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -3616,9 +3616,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
@@ -4934,7 +4934,7 @@ dependencies = [
  "debug-ignore",
  "expectorate",
  "gateway-client",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "internal-dns",
  "ipnet",
  "maplit",
@@ -6083,7 +6083,7 @@ dependencies = [
  "hex",
  "hmac",
  "hyper 0.14.30",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "inout",
  "ipnetwork",
  "itertools 0.10.5",
@@ -6208,7 +6208,7 @@ version = "0.4.0"
 source = "git+https://github.com/oxidecomputer/openapi-lint?branch=main#ef442ee4343e97b6d9c217d3e7533962fe7d7236"
 dependencies = [
  "heck 0.4.1",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "lazy_static",
  "openapiv3",
  "regex",
@@ -6248,7 +6248,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc02deea53ffe807708244e5914f6b099ad7015a207ee24317c22112e17d9c5c"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "serde",
  "serde_json",
 ]
@@ -6520,7 +6520,7 @@ dependencies = [
  "expectorate",
  "futures",
  "highway",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "itertools 0.12.1",
  "num",
  "omicron-common",
@@ -6996,7 +6996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "serde",
  "serde_derive",
 ]
@@ -7397,7 +7397,7 @@ dependencies = [
  "getopts",
  "heck 0.5.0",
  "http 0.2.12",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "openapiv3",
  "proc-macro2",
  "quote",
@@ -7731,9 +7731,9 @@ dependencies = [
 
 [[package]]
 name = "rand_seeder"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2890aaef0aa82719a50e808de264f9484b74b442e1a3a0e5ee38243ac40bdb"
+checksum = "4a9febe641d2842ffc76ee962668a17578767c4e01735e4802b21ed9a24b2e4e"
 dependencies = [
  "rand_core 0.6.4",
 ]
@@ -7813,7 +7813,7 @@ dependencies = [
  "dropshot",
  "expectorate",
  "humantime",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "nexus-client",
  "nexus-db-queries",
  "nexus-reconfigurator-execution",
@@ -8817,7 +8817,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -8843,7 +8843,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "itoa",
  "ryu",
  "serde",
@@ -10224,7 +10224,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -10237,7 +10237,7 @@ version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -10798,7 +10798,7 @@ dependencies = [
  "derive-where",
  "either",
  "futures",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "indicatif",
  "libsw",
  "linear-map",
@@ -10934,9 +10934,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "viona_api"
@@ -11180,7 +11180,7 @@ dependencies = [
  "expectorate",
  "futures",
  "humantime",
- "indexmap 2.2.6",
+ "indexmap 2.3.0",
  "indicatif",
  "itertools 0.12.1",
  "maplit",
diff --git a/Cargo.toml b/Cargo.toml
index 728d56453e..4782db5ae1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -464,7 +464,7 @@ quote = "1.0"
 rand = "0.8.5"
 rand_core = "0.6.4"
 rand_distr = "0.4.3"
-rand_seeder = "0.2.3"
+rand_seeder = "0.3.0"
 ratatui = "0.27.0"
 rayon = "1.10"
 rcgen = "0.12.1"
diff --git a/cockroach-admin/api/src/lib.rs b/cockroach-admin/api/src/lib.rs
index 192ff56f04..48549d1cd3 100644
--- a/cockroach-admin/api/src/lib.rs
+++ b/cockroach-admin/api/src/lib.rs
@@ -8,9 +8,7 @@ use omicron_uuid_kinds::OmicronZoneUuid;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[dropshot::api_description {
-    module = "cockroach_admin_api_mod",
-}]
+#[dropshot::api_description]
 pub trait CockroachAdminApi {
     type Context;
 
diff --git a/dev-tools/openapi-manager/src/spec.rs b/dev-tools/openapi-manager/src/spec.rs
index 2c99a83802..f991d35ec4 100644
--- a/dev-tools/openapi-manager/src/spec.rs
+++ b/dev-tools/openapi-manager/src/spec.rs
@@ -52,7 +52,7 @@ pub fn all_apis() -> Vec<ApiSpec> {
             description: "API for the internal DNS server",
             boundary: ApiBoundary::Internal,
             api_description:
-                dns_server_api::dns_server_api::stub_api_description,
+                dns_server_api::dns_server_api_mod::stub_api_description,
             filename: "dns-server.json",
             extra_validation: None,
         },
@@ -63,7 +63,7 @@ pub fn all_apis() -> Vec<ApiSpec> {
                 and report progress",
             boundary: ApiBoundary::Internal,
             api_description:
-                installinator_api::installinator_api::stub_api_description,
+                installinator_api::installinator_api_mod::stub_api_description,
             filename: "installinator.json",
             extra_validation: None,
         },
diff --git a/dns-server/src/http_server.rs b/dns-server/src/http_server.rs
index 84ffbc90e9..f9f56d9326 100644
--- a/dns-server/src/http_server.rs
+++ b/dns-server/src/http_server.rs
@@ -22,7 +22,7 @@ impl Context {
 }
 
 pub fn api() -> dropshot::ApiDescription<Context> {
-    dns_server_api::dns_server_api::api_description::<DnsServerApiImpl>()
+    dns_server_api::dns_server_api_mod::api_description::<DnsServerApiImpl>()
         .expect("registered DNS server entrypoints")
 }
 
diff --git a/gateway-api/src/lib.rs b/gateway-api/src/lib.rs
index 261e669a26..30f262ec45 100644
--- a/gateway-api/src/lib.rs
+++ b/gateway-api/src/lib.rs
@@ -29,9 +29,7 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use uuid::Uuid;
 
-#[dropshot::api_description {
-    module = "gateway_api_mod",
-}]
+#[dropshot::api_description]
 pub trait GatewayApi {
     type Context;
 
diff --git a/installinator-api/src/lib.rs b/installinator-api/src/lib.rs
index 3ff9acffd2..b3b36cc2fe 100644
--- a/installinator-api/src/lib.rs
+++ b/installinator-api/src/lib.rs
@@ -157,7 +157,7 @@ pub fn make_server_starter<T: InstallinatorApi>(
         log_headers: vec![],
     };
 
-    let api = crate::installinator_api::api_description::<T>()?;
+    let api = crate::installinator_api_mod::api_description::<T>()?;
     let server =
         dropshot::HttpServerStarter::new(&dropshot_config, api, context, &log)
             .map_err(|error| {
diff --git a/nexus/internal-api/src/lib.rs b/nexus/internal-api/src/lib.rs
index b6de85486a..c6ade3b1a2 100644
--- a/nexus/internal-api/src/lib.rs
+++ b/nexus/internal-api/src/lib.rs
@@ -45,10 +45,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
-#[dropshot::api_description {
-    // Named something different to let 'import nexus_internal_api::*;' work.
-    module = "nexus_internal_api_mod",
-}]
+#[dropshot::api_description]
 pub trait NexusInternalApi {
     type Context;
 
diff --git a/oximeter/api/src/lib.rs b/oximeter/api/src/lib.rs
index 3cda501fa7..0b33bc6c95 100644
--- a/oximeter/api/src/lib.rs
+++ b/oximeter/api/src/lib.rs
@@ -13,9 +13,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
-#[dropshot::api_description {
-    module = "oximeter_api_mod",
-}]
+#[dropshot::api_description]
 pub trait OximeterApi {
     type Context;
 
diff --git a/sled-agent/bootstrap-agent-api/src/lib.rs b/sled-agent/bootstrap-agent-api/src/lib.rs
index b1b8865351..4deb76ca85 100644
--- a/sled-agent/bootstrap-agent-api/src/lib.rs
+++ b/sled-agent/bootstrap-agent-api/src/lib.rs
@@ -20,9 +20,7 @@ use sled_agent_types::{
 };
 use sled_hardware_types::Baseboard;
 
-#[dropshot::api_description {
-    module = "bootstrap_agent_api_mod",
-}]
+#[dropshot::api_description]
 pub trait BootstrapAgentApi {
     type Context;
 
diff --git a/wicketd-api/src/lib.rs b/wicketd-api/src/lib.rs
index 2af264eb94..12a1653226 100644
--- a/wicketd-api/src/lib.rs
+++ b/wicketd-api/src/lib.rs
@@ -39,9 +39,7 @@ use wicket_common::rack_update::ClearUpdateStateResponse;
 use wicket_common::rack_update::StartUpdateOptions;
 use wicket_common::update_events::EventReport;
 
-#[dropshot::api_description {
-    module = "wicketd_api_mod",
-}]
+#[dropshot::api_description]
 pub trait WicketdApi {
     type Context;
 
diff --git a/wicketd/src/lib.rs b/wicketd/src/lib.rs
index 907d8754f8..430b94985f 100644
--- a/wicketd/src/lib.rs
+++ b/wicketd/src/lib.rs
@@ -211,7 +211,7 @@ impl Server {
                 SocketAddr::V6(args.artifact_address),
             );
             let api_description =
-                installinator_api::installinator_api::api_description::<
+                installinator_api::installinator_api_mod::api_description::<
                     WicketdInstallinatorApiImpl,
                 >()?;
 
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 464ece5acb..41233601ae 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -62,7 +62,7 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 hyper = { version = "0.14.30", features = ["full"] }
-indexmap = { version = "2.2.6", features = ["serde"] }
+indexmap = { version = "2.3.0", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 ipnetwork = { version = "0.20.0", features = ["schemars"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
@@ -167,7 +167,7 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 hyper = { version = "0.14.30", features = ["full"] }
-indexmap = { version = "2.2.6", features = ["serde"] }
+indexmap = { version = "2.3.0", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 ipnetwork = { version = "0.20.0", features = ["schemars"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }