diff --git a/docs/hardware/index.md b/docs/hardware/index.md
index 9ec41ac..49881e0 100644
--- a/docs/hardware/index.md
+++ b/docs/hardware/index.md
@@ -26,6 +26,12 @@ _Auto-generated from `docs/hardware/*.md` — do not edit by hand. Run `make doc
 | [srv04](srv04.md) | The pile | Intel Core i5-3570K @ 3.40GHz · 4c | 8 GB | 500 GB HDD | 1 GbE | staging |
 | [srv05](srv05.md) | The pile | Intel Core i5-3570K @ 3.40GHz · 4c | 8 GB | 500 GB HDD | 1 GbE | staging |
 
+## Shelves
+
+| Hostname | Location | CPU | RAM | Storage | NIC | Status |
+|---|---|---|---|---|---|---|
+| [shf01](shf01.md) |  |  |  |  |  | in-use |
+
 ## Switches
 
 | Hostname | Location | CPU | RAM | Storage | NIC | Status |
diff --git a/docs/hardware/shf01.md b/docs/hardware/shf01.md
new file mode 100644
index 0000000..fb56738
--- /dev/null
+++ b/docs/hardware/shf01.md
@@ -0,0 +1,14 @@
+---
+hostname: shf01
+kind: shelf
+status: in-use
+rack: rack01
+rack_u: 37
+u_height: 10
+rack_face: both
+cluster: tappaas
+---
+
+## Notes
+
+- Provisional placeholder shelf holding the TaPPaaS nodes (srv01/srv02 front, srv03 rear).
diff --git a/docs/hardware/srv01.md b/docs/hardware/srv01.md
index 8b6540a..d3b872c 100644
--- a/docs/hardware/srv01.md
+++ b/docs/hardware/srv01.md
@@ -11,9 +11,9 @@ ram_gb: "?"
 storage: "?"
 nic_gbps: "?"
 rack: rack01
-rack_u: 1
-u_height: 1
-rack_face: front
+mounted_on: shf01
+shelf_face: front
+shelf_slot: 1
 power:
   - { pdu: pdu01, outlet: 1 }
   - { pdu: pdu02, outlet: 1 }
diff --git a/docs/hardware/srv02.md b/docs/hardware/srv02.md
index c5bc5e3..8d862c4 100644
--- a/docs/hardware/srv02.md
+++ b/docs/hardware/srv02.md
@@ -2,6 +2,7 @@
 hostname: srv02
 kind: server
 status: staging
+cluster: tappaas
 location: The pile
 cpu: Intel Core i5-8500 @ 3.00GHz
 cpu_cores: 6
@@ -12,9 +13,9 @@ storage_gb: 40
 storage_type: nvme
 nic_gbps: 1
 rack: rack01
-rack_u: 2
-u_height: 1
-rack_face: front
+mounted_on: shf01
+shelf_face: front
+shelf_slot: 2
 power:
   - { pdu: pdu01, outlet: 2 }
 links:
diff --git a/docs/hardware/srv03.md b/docs/hardware/srv03.md
index 3b5ed34..cb2b865 100644
--- a/docs/hardware/srv03.md
+++ b/docs/hardware/srv03.md
@@ -2,6 +2,7 @@
 hostname: srv03
 kind: server
 status: staging
+cluster: tappaas
 location: The pile
 cpu: Intel Core i5-8500 @ 3.00GHz
 cpu_cores: 6
@@ -12,9 +13,9 @@ storage_gb: 40
 storage_type: nvme
 nic_gbps: 1
 rack: rack01
-rack_u: 3
-u_height: 1
-rack_face: front
+mounted_on: shf01
+shelf_face: rear
+shelf_slot: 1
 power:
   - { pdu: pdu01, outlet: 3 }
 links:
diff --git a/docs/infrastructure/racks/rack01-elevation.svg b/docs/infrastructure/racks/rack01-elevation.svg
index d60a138..78a102f 100644
--- a/docs/infrastructure/racks/rack01-elevation.svg
+++ b/docs/infrastructure/racks/rack01-elevation.svg
@@ -147,12 +147,6 @@
 <text x="54" y="954" text-anchor="end" fill="#999">46</text>
 <text x="54" y="974" text-anchor="end" fill="#999">47</text>
 <text x="54" y="994" text-anchor="end" fill="#999">48</text>
-<rect x="59" y="41" width="238" height="18" rx="3" fill="#4c78a8" stroke="#333"/>
-<text x="178" y="54" text-anchor="middle" fill="#ffffff">srv01 (U1)</text>
-<rect x="59" y="61" width="238" height="18" rx="3" fill="#4c78a8" stroke="#333"/>
-<text x="178" y="74" text-anchor="middle" fill="#ffffff">srv02 (U2)</text>
-<rect x="59" y="81" width="238" height="18" rx="3" fill="#4c78a8" stroke="#333"/>
-<text x="178" y="94" text-anchor="middle" fill="#ffffff">srv03 (U3)</text>
 <rect x="59" y="121" width="238" height="38" rx="3" fill="#4c78a8" stroke="#333"/>
 <text x="178" y="144" text-anchor="middle" fill="#ffffff">srv04 (U5–U6)</text>
 <rect x="349" y="121" width="238" height="38" rx="3" fill="#4c78a8" stroke="#333"/>
@@ -165,4 +159,13 @@
 <text x="20" y="520" text-anchor="middle" fill="#ffffff" transform="rotate(-90 20 520)">pdu01</text>
 <rect x="588" y="40" width="16" height="960" fill="#e15759" stroke="#333"/>
 <text x="596" y="520" text-anchor="middle" fill="#ffffff" transform="rotate(-90 596 520)">pdu02</text>
+<rect x="59" y="761" width="118" height="192" rx="3" fill="#4c78a8" stroke="#333"/>
+<text x="118" y="861" text-anchor="middle" fill="#ffffff">srv01</text>
+<rect x="179" y="761" width="118" height="192" rx="3" fill="#4c78a8" stroke="#333"/>
+<text x="238" y="861" text-anchor="middle" fill="#ffffff">srv02</text>
+<rect x="58" y="954" width="240" height="6" fill="#bab0ac" stroke="#333"/>
+<rect x="349" y="761" width="238" height="192" rx="3" fill="#4c78a8" stroke="#333"/>
+<text x="468" y="861" text-anchor="middle" fill="#ffffff">srv03</text>
+<rect x="348" y="954" width="240" height="6" fill="#bab0ac" stroke="#333"/>
+<text x="178" y="959" text-anchor="middle" fill="#333" font-size="9">shf01</text>
 </svg>
diff --git a/docs/infrastructure/racks/rack01.md b/docs/infrastructure/racks/rack01.md
index 14f55ed..0d1b3ba 100644
--- a/docs/infrastructure/racks/rack01.md
+++ b/docs/infrastructure/racks/rack01.md
@@ -48,12 +48,13 @@ flowchart LR
 
 | U | Device | Kind | Face | Status |
 |---|---|---|---|---|
-| U1 | [srv01](../../hardware/srv01.md) | server | front | staging |
-| U2 | [srv02](../../hardware/srv02.md) | server | front | staging |
-| U3 | [srv03](../../hardware/srv03.md) | server | front | staging |
 | U5–U6 | [srv04](../../hardware/srv04.md) | server | front | staging |
 | U5–U6 | [srv05](../../hardware/srv05.md) | server | rear | staging |
 | U10 | [sw01](../../hardware/sw01.md) | switch | front | in-use |
 | U24 | [pp01](../../hardware/pp01.md) | patch-panel | front | in-use |
+| U37–U46 | [shf01](../../hardware/shf01.md) | shelf | both | in-use |
+| U37–U46 | [srv01](../../hardware/srv01.md) | server | front · shf01/1 | staging |
+| U37–U46 | [srv02](../../hardware/srv02.md) | server | front · shf01/2 | staging |
+| U37–U46 | [srv03](../../hardware/srv03.md) | server | rear · shf01/1 | staging |
 | 0U | [pdu01](../../hardware/pdu01.md) | pdu | left | in-use |
 | 0U | [pdu02](../../hardware/pdu02.md) | pdu | right | in-use |