diff --git a/docs/unified/novacustom/community-test-results.md b/docs/unified/novacustom/community-test-results.md
index e83106ae..4efe21e5 100644
--- a/docs/unified/novacustom/community-test-results.md
+++ b/docs/unified/novacustom/community-test-results.md
@@ -13,12 +13,35 @@ Feel free to perform different tests and report your results via
 [Dasharo documentation repository](https://github.com/Dasharo/docs) or by using
 [Dasharo issues repository](https://github.com/Dasharo/dasharo-issues/issues).
 
-## Docking station compatibility list
+## Testing method
 
-This is a list of USB-C docking stations and hubs tested to work:
+You can follow the tests in
+[Dasharo Test Specification](../../unified-test-documentation/overview.md) to
+verify functionality. If you used another testing method, please describe the
+test steps in the report.
 
-| Dock / Hub | Part number | Laptop | Firmware version | Notes |
-| --- | --- | --- | --- | --- |
-| Lenovo USB-C Dock Gen2 | 40AS | NV4x 12th Gen | v0.9.0 | <ul><li>Can overdraw power from the dock, fixed in Dasharo v1.7.2</li><li>Power button not supported</li> |
-| Lenovo Universal USB-C Dock | 40AY | NV4x 12th Gen | v0.9.0 | <ul><li> Need 130W power supply option to not overdraw, fixed in Dasharo v1.7.2</li><li>Power button not supported</li> |
-| CableMatters Triple Display Travel Hub | 201431-BLK | NV4x 12th Gen | v0.9.0 | No issues |
+## Test results
+
+=== "USB-C Accessories"
+
+    This section is for USB Type-C accessories: docks, hubs, power supplies and
+    other types of peripherals.
+
+    === "NS5x/7x 12th Gen"
+        | Device | Firmware version | Notes |
+        | --- | --- | --- |
+
+    === "NV4x 12th Gen"
+        | Device | Firmware version | Notes |
+        | --- | --- | --- |
+        | Lenovo USB-C Dock Gen2 |  v0.9.0 | <ul><li>Can overdraw power from the dock, fixed in v1.7.2</li><li>Power button not supported</li> |
+        | Lenovo Universal USB-C Dock | v0.9.0 | <ul><li> Need 130W power supply option to not overdraw, fixed in v1.7.2</li><li>Power button not supported</li> |
+        | CableMatters Triple Display Travel Hub (201431-BLK) | v0.9.0 | No issues |
+
+    === "NS5x/7x 11th Gen"
+        | Device | Firmware version | Notes |
+        | --- | --- | --- |
+
+    === "NV4x 11th Gen"
+        | Device | Firmware version | Notes |
+        | --- | --- | --- |
diff --git a/docs/unified/novacustom/hcl.md b/docs/unified/novacustom/hcl.md
new file mode 100644
index 00000000..5553cd2b
--- /dev/null
+++ b/docs/unified/novacustom/hcl.md
@@ -0,0 +1,83 @@
+# Hardware Compatibility Lists
+
+The following compatibility list contains officially supported devices and
+accessories.
+
+For unofficial test results contributed by the community, check out the
+[Community Test Results](../community-test-results) section.
+
+=== "USB-C HCL (11 Dec 2023)"
+
+    The following is a list of USB Type-C docking stations and hubs that have
+    been verified and tested for compatibility by the Dasharo validation team.
+    Each firmware release is tested against these docks to ensure compatibility.
+
+    === "NS5x/7x 12th Gen"
+        <div class="annotate" markdown>
+
+        | Manufacturer | Model | Dasharo version | Notes |
+        |:---:|:---:|:---:|:---:|
+        | Wavlink | UMD05 Pro (1) | v1.7.2 | DP Alternate mode (2) |
+        | Wavlink | UG69PD2 (3) | v1.7.2 | DisplayLink (4) |
+        | Levin | 7-in-1 Type-C Hub Pro | v1.7.2 | DP Alternate mode |
+        | Generic | 8-in-1 Type-C Hub | v1.7.2 | DP Alternate mode |
+
+        </div>
+
+        1. Rev.C1 and Rev.E
+        2. Synaptics VMM5310 DP MST hub, two upstream DP 1.4 lanes, DSC 1.2
+           decompression, up to 2x 4K60 + 1x 4K30 depending on source.
+        3. Rev.A1
+        4. Up to 2x 5K60 supported. OS driver required.
+
+    === "NV4x 12th Gen"
+        <div class="annotate" markdown>
+
+        | Manufacturer | Model | Dasharo version | Notes |
+        |:---:|:---:|:---:|:---:|
+        | Wavlink | UMD05 Pro (1) | v1.7.2 | DP Alternate mode (2) |
+        | Wavlink | UG69PD2 (3) | v1.7.2 | DisplayLink (4) |
+        | Levin | 7-in-1 Type-C Hub Pro | v1.7.2 | DP Alternate mode |
+        | Generic | 8-in-1 Type-C Hub | v1.7.2 | DP Alternate mode |
+
+        </div>
+
+        1. Rev.C1 and Rev.E
+        2. Synaptics VMM5310 DP MST hub, two upstream DP 1.4 lanes, DSC 1.2
+           decompression, up to 2x 4K60 + 1x 4K30 depending on source.
+        3. Rev.A1
+        4. Up to 2x 5K60 supported. OS driver required.
+
+    === "NS5x/7x 11th Gen"
+        <div class="annotate" markdown>
+
+        | Manufacturer | Model | Dasharo version | Notes |
+        |:---:|:---:|:---:|:---:|
+        | Wavlink | UG69PD2 (1) | v1.7.2 | DisplayLink (2) |
+        | Levin | 7-in-1 Type-C Hub Pro | v1.7.2 | DP Alternate mode |
+        | Generic | 8-in-1 Type-C Hub | v1.7.2 | DP Alternate mode |
+
+        </div>
+
+        1. Rev.A1
+        2. Up to 2x 5K60 supported. OS driver required.
+
+    === "NV4x 11th Gen"
+        <div class="annotate" markdown>
+
+        | Manufacturer | Model | Dasharo version | Notes |
+        |:---:|:---:|:---:|:---:|
+        | Wavlink | UG69PD2 (1) | v1.7.2 | DisplayLink (2) |
+        | Levin | 7-in-1 Type-C Hub Pro | v1.7.2 | DP Alternate mode |
+        | Generic | 8-in-1 Type-C Hub | v1.7.2 | DP Alternate mode |
+
+        </div>
+
+        1. Rev.A1
+        2. Up to 2x 5K60 supported. OS driver required.
+
+    > **Note on DisplayLink compatibility:** DisplayLink requires a driver to
+    > function correctly. On Windows, the driver should install automatically if
+    > network is connected and Windows Update is enabled. On Linux, consult your
+    > distribution's documentation on DisplayLink compatibility. Preboot video
+    > output is not supported.
diff --git a/docs/unified/novacustom/hw-compatibility.md b/docs/unified/novacustom/hw-compatibility.md
deleted file mode 100644
index be854f57..00000000
--- a/docs/unified/novacustom/hw-compatibility.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Hardware compatibility
-
-## Introduction
-
-This page contains the list of peripherals that have been verified to work with
-NovaCustom laptops by the Dasharo validation team. They are tested with each
-release for each laptop currently supported.
-
-### USB-C docking stations
-
-<div class="annotate" markdown>
-
-* Wavlink UMD05 Pro Rev.E, Rev.C1 (USB-C DP Alternate mode)
-    - 1x DP 1.4, 2x HDMI 2.0b (1)
-    - Power Delivery up to 100W
-    - 4x USB 3 5Gbps Type-A ports, one with BC1.2 charging
-    - SD + MicroSD card reader
-    - Gigabit Ethernet
-    - 3.5mm combo (headphone + mic) audio jack
-
-* Wavlink UG69PD2 Rev.A1 (DisplayLink)
-    - 2x HDMI / DP ports (2)
-    - Power Delivery up to 65W
-    - 4x USB 3 5Gbps Type-A ports, one with BC1.2 charging
-    - 2x USB 3 5Gbps Type-C ports
-    - Gigabit Ethernet
-    - 3.5mm headphone and mic jacks
-
-
-> **Note on DisplayLink compatibility:** DisplayLink requires a driver to
-> function correctly. On Windows, the driver should install automatically if
-> network is connected and Windows Update is enabled. On Linux, consult your
-> distribution documentation on DisplayLink compatibility.
-
-</div>
-
-1. DisplayPort Alt mode, Synaptics VMM5310 DP MST hub, two upstream DP 1.4
-   lanes, DSC 1.2 decompression, up to 2x 4K60 + 1x 4K30 depending on source
-
-2. DisplayLink, up to 2x 5K60 supported. OS driver required
-
-### USB-C Hubs
-
-<div class="annotate" markdown>
-
-* Levin 7-in-1 USB Type-C Hub Pro
-    - HDMI
-    - Power delivery pass-through
-    - 2x USB-A 5Gbps
-    - SD, TF card reader
-
-* Generic 7-in-1 USB Type-C Hub
-    - HDMI, VGA (1)
-    - Power delivery pass-through
-    - 2x USB-A 5Gbps
-    - SD card reader
-    - Ethernet
-    - 3.5mm headphone jack
-
-</div>
-
-1. Only one can be used simultaneously
diff --git a/mkdocs.yml b/mkdocs.yml
index fd384a69..bf4e29d0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -115,7 +115,7 @@ nav:
           - 'Battery management': unified/novacustom/battery-management.md
           - 'Fan profiles': unified/novacustom/fan-profiles.md
           - 'Firmware update using fwupd': unified/novacustom/fwupd-usage.md
-          - 'Hardware Compatibility List': unified/novacustom/hw-compatibility.md
+          - 'Hardware Compatibility List': unified/novacustom/hcl.md
           - 'Community Test Results': unified/novacustom/community-test-results.md
           - 'NV4x 12th Gen':
               - 'Releases': variants/novacustom_nv4x_adl/releases.md