diff --git a/content/reference_hardware/hardware/amd64.md b/content/reference_hardware/hardware/amd64.md
index 9fab5e009c3dcd4c05992b29d4fe6d73ca163511..cc90036cef01c575ebe8aebc6dc32e6b2f2906af 100644
--- a/content/reference_hardware/hardware/amd64.md
+++ b/content/reference_hardware/hardware/amd64.md
@@ -3,6 +3,10 @@ date = "2020-06-10"
 weight = 100
 
 title = "Intel 64-bit Reference Hardware"
+
+aliases = [
+    "/reference_hardware/amd64"
+]
 +++
 
 The recommended Intel 64-bit
diff --git a/content/reference_hardware/hardware/arm32.md b/content/reference_hardware/hardware/arm32.md
index c2e7da5584a15920964d3925b974306bac740d11..271a0f921e82b999a71958f5a16301aec8884886 100644
--- a/content/reference_hardware/hardware/arm32.md
+++ b/content/reference_hardware/hardware/arm32.md
@@ -3,6 +3,10 @@ date = "2020-06-10"
 weight = 100
 
 title = "ARM 32-bit Reference Hardware"
+
+aliases = [
+    "/reference_hardware/arm32"
+]
 +++
 
 The recommended ARM 32-bit hardware is the i.MX6 Sabrelite.
diff --git a/content/reference_hardware/hardware/arm64.md b/content/reference_hardware/hardware/arm64.md
index aab749b32841cc9b97ba5b7f67b930e0472e82cc..51bb324912bad3105e8a0c344eabc640348bb45d 100644
--- a/content/reference_hardware/hardware/arm64.md
+++ b/content/reference_hardware/hardware/arm64.md
@@ -3,6 +3,10 @@ date = "2020-06-10"
 weight = 100
 
 title = "ARM 64-bit Reference Hardware"
+
+aliases = [
+    "/reference_hardware/arm64"
+]
 +++
 
 Starting with the 17.03 release, ARM64 images have been made available. While
diff --git a/content/reference_hardware/hardware/extras.md b/content/reference_hardware/hardware/extras.md
index 57d0b0e0ae581332d9fbc887d4e3fe39ef17ca7e..1aec287fcece35658a7cf79685f7819de434a669 100644
--- a/content/reference_hardware/hardware/extras.md
+++ b/content/reference_hardware/hardware/extras.md
@@ -3,6 +3,10 @@ date = "2020-06-10"
 weight = 100
 
 title = "Optional Extra Reference Hardware"
+
+aliases = [
+    "/reference_hardware/extra"
+]
 +++
 
 The following optional extras are those used for testing in combination with
diff --git a/content/reference_hardware/setup_guides/imx6q_sabrelite_setup.md b/content/reference_hardware/setup_guides/imx6q_sabrelite_setup.md
index d1071dc916087f8bf0b9fd21e6f403e6a7984441..478b954cfab7b5b90ae782dcc31f026c52272140 100644
--- a/content/reference_hardware/setup_guides/imx6q_sabrelite_setup.md
+++ b/content/reference_hardware/setup_guides/imx6q_sabrelite_setup.md
@@ -6,7 +6,8 @@ toc = true
 title = "i.MX6Q SABRE Lite Setup"
 
 aliases = [
-    "/old-wiki/Reference_Hardware/imx6q_sabrelite_setup"
+    "/old-wiki/Reference_Hardware/imx6q_sabrelite_setup",
+    "/reference_hardware/imx6q_sabrelite_setup"
 ]
 +++
 
diff --git a/content/reference_hardware/setup_guides/imx8mn_bsh_smm_s2pro_setup.md b/content/reference_hardware/setup_guides/imx8mn_bsh_smm_s2pro_setup.md
index 9abd5ec72b54348fb81241c8e84f594bd93dae1d..2f304d956e3a5d345d1605051c6871aa3df5c814 100644
--- a/content/reference_hardware/setup_guides/imx8mn_bsh_smm_s2pro_setup.md
+++ b/content/reference_hardware/setup_guides/imx8mn_bsh_smm_s2pro_setup.md
@@ -5,6 +5,10 @@ weight = 100
 toc = true
 
 title = "i.MX8MN BSH SMM S2 PRO board"
+
+aliases = [
+    "/reference_hardware/imx8mn_bsh_smm_s2pro_setup"
+]
 +++
 
 BSH SMM S2 PRO (SystemMaster S2 Pro) Board is an add-on board which provide input
diff --git a/content/reference_hardware/setup_guides/imx8mn_var_symphony_setup.md b/content/reference_hardware/setup_guides/imx8mn_var_symphony_setup.md
index 41e3128b2faff8ddcf4a875bb38136c2a74e328b..65f1fa12f2b3aa6f8c30265197c4de072fc191b8 100644
--- a/content/reference_hardware/setup_guides/imx8mn_var_symphony_setup.md
+++ b/content/reference_hardware/setup_guides/imx8mn_var_symphony_setup.md
@@ -5,6 +5,10 @@ weight = 100
 toc = true
 
 title = "i.MX8MN Variscite Symphony board"
+
+aliases = [
+    "/reference_hardware/imx8mn_var_symphony_setup"
+]
 +++
 
 Variscite [Symphony-Board](https://www.variscite.com/product/single-board-computers/symphony-board/)
diff --git a/content/reference_hardware/setup_guides/minnowboard_setup.md b/content/reference_hardware/setup_guides/minnowboard_setup.md
index 9b28fcace05363f50073321164d90fd2be2b6e3c..ab657f832d0e65fff9bc2ad5f74cf7c06a61700e 100644
--- a/content/reference_hardware/setup_guides/minnowboard_setup.md
+++ b/content/reference_hardware/setup_guides/minnowboard_setup.md
@@ -6,7 +6,8 @@ title = "Minnowboard Setup"
 
 aliases = [
     "/old-wiki/Reference_Hardware/Minnowboard_setup",
-    "/old-wiki/Reference_Hardware/minnowboard_setup"
+    "/old-wiki/Reference_Hardware/minnowboard_setup",
+    "/reference_hardware/minnowboard_setup"
 ]
 +++
 
diff --git a/content/reference_hardware/setup_guides/rcar-gen3_setup.md b/content/reference_hardware/setup_guides/rcar-gen3_setup.md
index 8a0948a6026f7aa8babc91916d0a87ccdd0adbbd..b61d371d8010e12b8966cf39ec14b55a1547c099 100644
--- a/content/reference_hardware/setup_guides/rcar-gen3_setup.md
+++ b/content/reference_hardware/setup_guides/rcar-gen3_setup.md
@@ -9,7 +9,8 @@ title = "R-Car Hardware Setup"
 aliases = [
     "/reference_hardware/rcar-gen3_test_automation.md",
     "/old-wiki/Reference_Hardware/Rcar-gen3_test_automation",
-    "/old-wiki/Reference_Hardware/Rcar-gen3_setup"
+    "/old-wiki/Reference_Hardware/Rcar-gen3_setup",
+    "/reference_hardware/rcar-gen3_setup"
 ]
 +++
 
diff --git a/content/reference_hardware/setup_guides/rpi4_setup.md b/content/reference_hardware/setup_guides/rpi4_setup.md
index 755ab5a9f0a1bca1b029122bc01893496237ee13..9b37e60b8d4647b52e2851c87afa9ff87bb0e56c 100644
--- a/content/reference_hardware/setup_guides/rpi4_setup.md
+++ b/content/reference_hardware/setup_guides/rpi4_setup.md
@@ -4,6 +4,10 @@ lastmod = "2021-08-04"
 weight = 100
 
 title = "Raspberry Pi 4 Setup"
+
+aliases = [
+    "/reference_hardware/rpi4_setup"
+]
 +++
 
 {{% notice note %}}
diff --git a/content/reference_hardware/setup_guides/rpi_cm4_canopi_setup.md b/content/reference_hardware/setup_guides/rpi_cm4_canopi_setup.md
index 2385da1b03d28f2ddeb317c667ae4a67c295203a..560f82b2cafdda5af1ecc504e2b8247574cdd72e 100644
--- a/content/reference_hardware/setup_guides/rpi_cm4_canopi_setup.md
+++ b/content/reference_hardware/setup_guides/rpi_cm4_canopi_setup.md
@@ -4,6 +4,10 @@ lastmod = "2022-09-16"
 weight = 100
 
 title = "Raspberry Pi CM4 CANOPi Setup"
+
+aliases = [
+    "/reference_hardware/rpi_cm4_canopi_setup"
+]
 +++
 
 This is the setup recommended for developers using the Raspberry Pi CM4
diff --git a/content/reference_hardware/setup_guides/sk-am62_setup.md b/content/reference_hardware/setup_guides/sk-am62_setup.md
index 19abb649754b818615b5712477598a380d28a374..f9ed313125a88a1475164d282d3f0f0eac8b2400 100644
--- a/content/reference_hardware/setup_guides/sk-am62_setup.md
+++ b/content/reference_hardware/setup_guides/sk-am62_setup.md
@@ -3,6 +3,10 @@ date = "2024-02-21"
 weight = 100
 
 title = "TI SK-AM62 Setup"
+
+aliases = [
+    "/reference_hardware/sk-am62_setup"
+]
 +++
 
 {{% notice note %}}
diff --git a/content/reference_hardware/setup_guides/upsquared6000_setup.md b/content/reference_hardware/setup_guides/upsquared6000_setup.md
index 3fc60b74ca843ca26156767331caa8c7a895eecd..dc2c030cee6f5457b6ccf05c7c0c1f39fc26272d 100644
--- a/content/reference_hardware/setup_guides/upsquared6000_setup.md
+++ b/content/reference_hardware/setup_guides/upsquared6000_setup.md
@@ -3,6 +3,10 @@ date = "2022-05-27"
 weight = 100
 
 title = "UP Squared 6000 board Setup"
+
+aliases = [
+    "/reference_hardware/upsquared6000_setup"
+]
 +++
 
 [UP Squared 6000](https://up-board.org/up-squared-6000/) series board based on
diff --git a/content/reference_hardware/setup_lava_guides/imx6q_sabrelite_setup_lava.md b/content/reference_hardware/setup_lava_guides/imx6q_sabrelite_setup_lava.md
index 13a15dbaff275fb8133d4d261eadf8066a5d6e88..1ec5f65e391b377ed6db0e86e3bbb424ad7879ad 100644
--- a/content/reference_hardware/setup_lava_guides/imx6q_sabrelite_setup_lava.md
+++ b/content/reference_hardware/setup_lava_guides/imx6q_sabrelite_setup_lava.md
@@ -5,7 +5,8 @@ weight = 100
 title = "i.MX6Q Sabrelite Setup in LAVA"
 
 aliases = [
-    "/old-wiki/Reference_Hardware/imx6q_sabrelite_setup_lava"
+    "/old-wiki/Reference_Hardware/imx6q_sabrelite_setup_lava",
+    "/reference_hardware/imx6q_sabrelite_setup_lava"
 ]
 +++
 
diff --git a/content/reference_hardware/setup_lava_guides/rpi4_setup_lava.md b/content/reference_hardware/setup_lava_guides/rpi4_setup_lava.md
index 80425c3f5050087a702dc727f90135644d5e3824..ffdc8e22d65055018216dfe9df943e6f3f8e88e9 100644
--- a/content/reference_hardware/setup_lava_guides/rpi4_setup_lava.md
+++ b/content/reference_hardware/setup_lava_guides/rpi4_setup_lava.md
@@ -3,6 +3,10 @@ date = "2021-06-26"
 weight = 100
 
 title = "Raspberry Pi 4 Setup in LAVA"
+
+aliases = [
+    "/reference_hardware/rpi4_setup_lava"
+]
 +++
 
 These are the instructions to prepare a device for use as a DUT in the
diff --git a/content/reference_hardware/setup_lava_guides/upsquared6000_setup_lava.md b/content/reference_hardware/setup_lava_guides/upsquared6000_setup_lava.md
index 2a198b18d7e53c565faa0fa59ef625925993f7b2..88e87fcd141b4505e1b2f6701aec9be8c0c9b92a 100644
--- a/content/reference_hardware/setup_lava_guides/upsquared6000_setup_lava.md
+++ b/content/reference_hardware/setup_lava_guides/upsquared6000_setup_lava.md
@@ -3,6 +3,10 @@ date = "2022-07-20"
 weight = 100
 
 title = "UP Squared 6000 board Setup in LAVA"
+
+aliases = [
+    "/reference_hardware/upsquared6000_setup_lava"
+]
 +++
 
 # Setting up an UP Squared 6000 board for LAVA