diff --git a/_toc.yml b/_toc.yml
index c9514db4..0d264964 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -150,6 +150,7 @@ chapters:
   - file: rhel9/index
     sections:
       - file: rhel9/installation
+      - file: rhel9/hardware_compatibility
 
   - file: services-user-guide/index
     sections:
diff --git a/rhel8/hardware_compatibility.md b/rhel8/hardware_compatibility.md
index 6ea31966..aab690d5 100644
--- a/rhel8/hardware_compatibility.md
+++ b/rhel8/hardware_compatibility.md
@@ -1,6 +1,6 @@
-# Hardware Compatibility
+# RHEL8 Hardware Compatibility
 
-Here are hardware tests with standard PSI hardware documented.
+Here are hardware tests with RHEL8 on standard PSI hardware documented.
 
 Generally speaking has Linux a rather good hardware compatibility with PC hardware, usually the older the hardware the better the support.
 
@@ -18,9 +18,8 @@ Generally speaking has Linux a rather good hardware compatibility with PC hardwa
 
 ## Mobile Hardware
 
-### HP ZBook Studio 16 inch G10
-✔
-❌
+### HP ZBook Studio 16 inch G10 Mobile Workstation PC
+❌ Linux kernel fails to load
 
 
 ## Test Details
diff --git a/rhel9/hardware_compatibility.md b/rhel9/hardware_compatibility.md
new file mode 100644
index 00000000..736be7eb
--- /dev/null
+++ b/rhel9/hardware_compatibility.md
@@ -0,0 +1,41 @@
+# RHEL9 Hardware Compatibility
+
+Here are hardware tests with RHEL9 on standard PSI hardware documented.
+
+Generally speaking has Linux a rather good hardware compatibility with PC hardware, usually the older the hardware the better the support.
+
+## Desktop Hardware
+
+### HP Elite Mini 800 G9 Desktop PC
+- ✔/❌ NIC: network boot only after registration in PacketFence
+- ? GPU
+- ? HDMI
+- ? DP
+- ? USB
+- ? Audio
+
+
+
+## Mobile Hardware
+
+### HP ZBook Studio 16 inch G10 Mobile Workstation PC
+❌ Linux kernel fails to load
+
+
+## Test Details
+
+- network card by installation via network
+- GPU by running graphical desktop, for Nvidia GPUs check if Nvidia drivers are used
+- HDMI
+- DP
+- USB by mouse, keyboard
+- notebook:
+    - wifi
+    - bluethooth (headset working?)
+    - microphone
+    - speaker
+    - webcam
+    - Dock
+        - network
+        - USB by mouse, keyboard
+        - HDMI