diff --git a/components/schemas/infrastructure/servers/telemetry/snapshot/ServerTelemetrySnapshot.yml b/components/schemas/infrastructure/servers/telemetry/snapshot/ServerTelemetrySnapshot.yml
index 5d6abf44..3c0d08ee 100644
--- a/components/schemas/infrastructure/servers/telemetry/snapshot/ServerTelemetrySnapshot.yml
+++ b/components/schemas/infrastructure/servers/telemetry/snapshot/ServerTelemetrySnapshot.yml
@@ -36,7 +36,7 @@ properties:
   disk:
     description: Disk telemetry for this snapshot. Null when disk telemetry is unavailable.
     oneOf:
-      - $ref: ./storage/ServerTelemetryDisk.yml
+      - $ref: ./disk/ServerTelemetryDisk.yml
       - type: "null"
   processes:
     description: Process telemetry for this snapshot. Null when process telemetry is unavailable.
diff --git a/components/schemas/infrastructure/servers/telemetry/snapshot/storage/ServerTelemetryDisk.yml b/components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDisk.yml
similarity index 59%
rename from components/schemas/infrastructure/servers/telemetry/snapshot/storage/ServerTelemetryDisk.yml
rename to components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDisk.yml
index 5977ac7e..5b57ae99 100644
--- a/components/schemas/infrastructure/servers/telemetry/snapshot/storage/ServerTelemetryDisk.yml
+++ b/components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDisk.yml
@@ -11,3 +11,10 @@ properties:
     description: Per-device disk telemetry, keyed by device name.
     additionalProperties:
       $ref: ./ServerTelemetryDiskDevice.yml
+  volumes:
+    type:
+      - object
+      - "null"
+    description: Telemetry for all volumes mounted on this host, keyed by device name.
+    additionalProperties:
+      $ref: ./ServerTelemetryDiskVolume.yml
diff --git a/components/schemas/infrastructure/servers/telemetry/snapshot/storage/ServerTelemetryDiskDevice.yml b/components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDiskDevice.yml
similarity index 100%
rename from components/schemas/infrastructure/servers/telemetry/snapshot/storage/ServerTelemetryDiskDevice.yml
rename to components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDiskDevice.yml
diff --git a/components/schemas/infrastructure/servers/telemetry/snapshot/storage/ServerTelemetryDiskIo.yml b/components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDiskIo.yml
similarity index 100%
rename from components/schemas/infrastructure/servers/telemetry/snapshot/storage/ServerTelemetryDiskIo.yml
rename to components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDiskIo.yml
diff --git a/components/schemas/infrastructure/servers/telemetry/snapshot/storage/ServerTelemetryDiskUsage.yml b/components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDiskUsage.yml
similarity index 100%
rename from components/schemas/infrastructure/servers/telemetry/snapshot/storage/ServerTelemetryDiskUsage.yml
rename to components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDiskUsage.yml
diff --git a/components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDiskVolume.yml b/components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDiskVolume.yml
new file mode 100644
index 00000000..5c026354
--- /dev/null
+++ b/components/schemas/infrastructure/servers/telemetry/snapshot/disk/ServerTelemetryDiskVolume.yml
@@ -0,0 +1,24 @@
+type: object
+title: ServerTelemetryDiskVolume
+description: Telemetry for a single volume on the server.
+required:
+  - name
+  - type
+  - io
+  - usage
+properties:
+  name:
+    type: string
+    description: The name of the volume.
+  type:
+    type: string
+    description: The type of volume (e.g. 'lvm')
+  mount:
+    type: string
+    description: Mountpoint of the volume
+  io:
+    $ref: ./ServerTelemetryDiskIo.yml
+    description: Block-device I/O counters for the volume.
+  usage:
+    $ref: ./ServerTelemetryDiskUsage.yml
+    description: Filesystem usage for the volume.