diff --git a/Cargo.lock b/Cargo.lock
index 50dbb5ede14..3f6ea92673e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -974,7 +974,7 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 [[package]]
 name = "dropshot"
 version = "0.6.1-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#da09c39441e2d4c984d076f90cd550d9c6f76951"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#0e971f5c554390273622b37cd2a6aaec1dff815b"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -992,7 +992,7 @@ dependencies = [
  "percent-encoding",
  "proc-macro2",
  "rustls",
- "rustls-pemfile 0.3.0",
+ "rustls-pemfile 1.0.0",
  "schemars",
  "serde",
  "serde_json",
@@ -1013,7 +1013,7 @@ dependencies = [
 [[package]]
 name = "dropshot_endpoint"
 version = "0.6.1-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#da09c39441e2d4c984d076f90cd550d9c6f76951"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#0e971f5c554390273622b37cd2a6aaec1dff815b"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/openapi/bootstrap-agent.json b/openapi/bootstrap-agent.json
index cf04477f449..113fe221a88 100644
--- a/openapi/bootstrap-agent.json
+++ b/openapi/bootstrap-agent.json
@@ -111,6 +111,7 @@
         ]
       },
       "Ipv6Net": {
+        "example": "fd12:3456::/64",
         "title": "An IPv6 subnet",
         "description": "An IPv6 subnet, including prefix and subnet mask",
         "type": "string",
diff --git a/openapi/nexus.json b/openapi/nexus.json
index 409ebadc1a7..8524249f4ee 100644
--- a/openapi/nexus.json
+++ b/openapi/nexus.json
@@ -5971,6 +5971,7 @@
         ]
       },
       "Ipv4Net": {
+        "example": "192.168.1.0/24",
         "title": "An IPv4 subnet",
         "description": "An IPv4 subnet, including prefix and subnet mask",
         "type": "string",
@@ -5978,6 +5979,7 @@
         "maxLength": 18
       },
       "Ipv6Net": {
+        "example": "fd12:3456::/64",
         "title": "An IPv6 subnet",
         "description": "An IPv6 subnet, including prefix and subnet mask",
         "type": "string",
@@ -5985,6 +5987,7 @@
         "maxLength": 43
       },
       "L4PortRange": {
+        "example": "22",
         "title": "A range of IP ports",
         "description": "An inclusive-inclusive range of IP ports. The second port may be omitted to represent a single port",
         "type": "string",
@@ -6004,6 +6007,7 @@
         ]
       },
       "MacAddr": {
+        "example": "ff:ff:ff:ff:ff:ff",
         "title": "A MAC address",
         "description": "A Media Access Control address, in EUI-48 format",
         "type": "string",
diff --git a/openapi/sled-agent.json b/openapi/sled-agent.json
index 36e51a24083..4c6fa0a4845 100644
--- a/openapi/sled-agent.json
+++ b/openapi/sled-agent.json
@@ -857,6 +857,7 @@
         ]
       },
       "MacAddr": {
+        "example": "ff:ff:ff:ff:ff:ff",
         "title": "A MAC address",
         "description": "A Media Access Control address, in EUI-48 format",
         "type": "string",