diff --git a/docs/hardware-support/boards/raspberrypi4.rst b/docs/hardware-support/boards/raspberrypi4.rst
index c424c37be84fa51bdaa3dc56eb3522e1500a6d19..e591b76da5939396fbee4e19d295c2c0403a1727 100644
--- a/docs/hardware-support/boards/raspberrypi4.rst
+++ b/docs/hardware-support/boards/raspberrypi4.rst
@@ -15,6 +15,12 @@ Raspberry Pi 4 Model B
 Overview
 ********
 
+.. note::
+
+   Even though this documentation targets Raspberry Pi 4, in Oniro, the same
+   image provides support for Raspberry Pi 3 as well. This means that the
+   following considerations and instructions apply to both types of hardware.
+
 Raspberry Pi 4 Model B is powered with Broadcom BCM2711, quad-core Cortex-A72
 (ARM v8) 64-bit SoC @ 1.5GHz. This product's key features include a
 high-performance 64-bit quad-core processor, dual-display support at
diff --git a/docs/hardware-support/virtual-boards/qemuarm-efi.rst b/docs/hardware-support/virtual-boards/qemuarm-efi.rst
index 784418ecd095ef68e01c66c1a961ba5c993dd17f..1288f7a22b1aed19af799552260e61f690473854 100644
--- a/docs/hardware-support/virtual-boards/qemuarm-efi.rst
+++ b/docs/hardware-support/virtual-boards/qemuarm-efi.rst
@@ -4,6 +4,8 @@
 
 .. include:: ../../definitions.rst
 
+.. _SupportedVBoardQemuARM:
+
 Qemu ARM 32bit
 ##############
 
diff --git a/docs/hardware-support/virtual-boards/qemuarm64-efi.rst b/docs/hardware-support/virtual-boards/qemuarm64-efi.rst
index 8ca59d7477eedeeb029cf4c36185f8c9a4db55cf..a4c3230608f66233c6a2e67fd2b2bee2bb46e8bf 100644
--- a/docs/hardware-support/virtual-boards/qemuarm64-efi.rst
+++ b/docs/hardware-support/virtual-boards/qemuarm64-efi.rst
@@ -4,6 +4,8 @@
 
 .. include:: ../../definitions.rst
 
+.. _SupportedVBoardQemuARM64:
+
 Qemu ARM 64bit
 ##############
 
diff --git a/docs/hardware-support/virtual-boards/qemux86-64.rst b/docs/hardware-support/virtual-boards/qemux86-64.rst
index 3f7dd5dc4aa63841b474ca5bdfb8ede5f042c817..601cd8d955d2e3a7e12a991bf6704dbf308e8489 100644
--- a/docs/hardware-support/virtual-boards/qemux86-64.rst
+++ b/docs/hardware-support/virtual-boards/qemux86-64.rst
@@ -4,6 +4,8 @@
 
 .. include:: ../../definitions.rst
 
+.. _SupportedVBoardQemuX86-64:
+
 Qemu X86-64
 ###########
 
diff --git a/docs/hardware-support/virtual-boards/qemux86.rst b/docs/hardware-support/virtual-boards/qemux86.rst
index 8f88cd03559f1413f630af1c2a34a4cd019ab4b0..906a759370eb9a365cb0ccffc01b0f5901a802a4 100644
--- a/docs/hardware-support/virtual-boards/qemux86.rst
+++ b/docs/hardware-support/virtual-boards/qemux86.rst
@@ -4,6 +4,8 @@
 
 .. include:: ../../definitions.rst
 
+.. _SupportedVBoardQemuX86:
+
 Qemu X86
 ########