diff --git a/common/source/docs/common-holybro-pixhawk6X.rst b/common/source/docs/common-holybro-pixhawk6X.rst
index 97f53841f8..439d1b6a09 100644
--- a/common/source/docs/common-holybro-pixhawk6X.rst
+++ b/common/source/docs/common-holybro-pixhawk6X.rst
@@ -8,14 +8,16 @@ Pixhawk6X®  is the latest update to the successful family of Pixhawk® autopilo
 
 Pixhawk6X:
 
-.. image:: ../../../images/holybro-pixhawk6/Pixhawk6X.png
-    :target: ../_images/Pixhawk6X.png
+.. image:: ../../../images/holybro-pixhawk6/Pixhawk6X-internal.jpg
+    :target: ../_images/Pixhawk6X-internal.jpg
     :width: 450px
 
 Where To Buy
 ============
 
-The Pixhawk6 autopilots are sold by `Holybro <https://shop.holybro.com/c/flight-controllers_0456>`__
+The Pixhawk 6X autopilots are sold by Holybro 
+ - `Pixhawk 6X <https://holybro.com/collections/autopilot-flight-controllers/products/pixhawk-6x>`__
+ - `Pixhawk 6X Pro <https://holybro.com/collections/autopilots-peripheral/products/pixhawk-6x-pro>`__
 
 Features of Pixhawk6 Series
 ===========================
diff --git a/common/source/docs/common-positioning-landing-page.rst b/common/source/docs/common-positioning-landing-page.rst
index e86931ec54..e0799e7575 100644
--- a/common/source/docs/common-positioning-landing-page.rst
+++ b/common/source/docs/common-positioning-landing-page.rst
@@ -27,10 +27,13 @@ GPS/Compass
     CUAV Neo 3X(Water proof) GPS <common-cuav-neo-3x>
     CubePilot Here 2 DroneCAN GPS/Gyro/IMU/Baro <https://docs.cubepilot.org/user-guides/here-2/updating-here-2-firmware>
     Holybro DroneCAN M8/M9 GPS <https://shop.holybro.com/dronecan-m8n-m9n-gps_p1335.html>    
-    Holybro Micro M8N GPS Module <https://shop.holybro.com/micro-m8n-gps_p1009.html> 
+    Holybro Micro M9N GPS Module <https://holybro.com/collections/gps/products/micro-m9n-gps> 
+    Holybro Micro M10 GPS Module <https://holybro.com/products/micro-m10-gps/> 
     Holybro Nano Ublox M8 5883 GPS Module <https://shop.holybro.com/nano-ublox-m8-5883-gps-module_p1236.html> 
     Holybro M8N (Pixhawk 4) GPS Module <https://holybro.com/collections/gps-rtk-systems/products/m8n-gps>
-    Holybro M9N GPS Module <https://holybro.com/collections/gps-rtk-systems/products/m9n-gps>
+    Holybro M9N GPS Module (UART) <https://holybro.com/collections/gps-rtk-systems/products/m9n-gps>
+    Holybro M9N GPS Module (DroneCAN) <https://holybro.com/collections/gps/products/dronecan-m9n-gps>
+    Holybro M10 GPS Module <https://holybro.com/collections/gps/products/m10-gps>
     Holybro DroneCAN RM3100 Professional Grade Compass <https://holybro.com/products/dronecan-rm3100-compass>
     Matek DroneCAN AP_Periph GNSS M10-L4-3100 <http://www.mateksys.com/?portfolio=m10-l4-3100>
     Matek SAM-M8Q <http://www.mateksys.com/?portfolio=sam-m8q>
@@ -71,10 +74,12 @@ These GPS can incorporate real time kinematic data, either internally generated
     Hitec PositionPro GNSS <https://www.hiteccs.com/drones/peripheral-details/positionpro-gnss-receiver/>
     Holybro DroneCAN H-RTK F9P Rover <https://holybro.com/collections/gps-rtk-systems/products/dronecan-h-rtk-f9p-rover>
     Holybro DroneCAN H-RTK F9P Helical <https://holybro.com/collections/gps-rtk-systems/products/dronecan-h-rtk-f9p-helical>
-    Holybro RTK M8P Family <common-holybro-rtk-m8p>
     Holybro RTK F9P Family <common-holybro-rtk-f9p>
     Holybro RTK F9P Ultralight <https://holybro.com/products/h-rtk-f9p-ultralight>
-    Holybro RTK Unicore UM982 GPS <https://holybro.com/products/h-rtk-unicore-um982>
+    Holybro RTK ZED-F9P Rover (RM3100 Compass, Barometer, IP66 Waterproof) <https://holybro.com/collections/h-rtk-gps/products/h-rtk-zed-f9p-rover>
+    Holybro RTK NEO-F9P Family <https://holybro.com/collections/h-rtk-neo-f9p-series>
+    Holybro RTK Unicore UM982 GPS (Dual Antenna Heading) <https://holybro.com/products/h-rtk-unicore-um982>
+    Holybro RTK mosaic-H GPS (Dual Antenna Heading) <https://holybro.com/collections/h-rtk-gps/products/h-rtk-mosaic>
     LOCOSYS HAWK R1 RTK GNSS / R2 RTK GNSS + Compass<common-gps-locosys>
     Qiotek DroneCAN RTK-F9P GPS <https://www.qio-tek.com/index.php/product/qiotek-zed-f9p-rtk-and-compass-dronecan-module>
     Swift Navigation's Piksi Multi RTK GPS Receiver <common-piksi-multi-rtk-receiver>
@@ -107,7 +112,10 @@ Moving Baseline (GPS for Yaw) Capable
     Holybro DroneCAN H-RTK F9P Helical <https://holybro.com/collections/gps-rtk-systems/products/dronecan-h-rtk-f9p-helical>
     Holybro RTK F9P Family <common-holybro-rtk-f9p>
     Holybro RTK F9P Ultralight <https://holybro.com/products/h-rtk-f9p-ultralight>
-    Holybro RTK Unicore UM982 GPS <https://holybro.com/products/h-rtk-unicore-um982>
+    Holybro RTK ZED-F9P Rover (RM3100 Compass, Barometer, IP66 Waterproof) <https://holybro.com/collections/h-rtk-gps/products/h-rtk-zed-f9p-rover>
+    Holybro RTK NEO-F9P Family <https://holybro.com/collections/h-rtk-neo-f9p-series>
+    Holybro RTK Unicore UM982 GPS (Dual Antenna Heading) <https://holybro.com/products/h-rtk-unicore-um982>
+    Holybro RTK mosaic-H GPS (Dual Antenna Heading) <https://holybro.com/collections/h-rtk-gps/products/h-rtk-mosaic>
     Qiotek DroneCAN RTK-F9P GPS <https://www.qio-tek.com/index.php/product/qiotek-zed-f9p-rtk-and-compass-dronecan-module>
     Synerx MDU-2000 RTK + LTE GPS <common-synerex-mdu-2000>
 
diff --git a/common/source/docs/common-powermodule-landingpage.rst b/common/source/docs/common-powermodule-landingpage.rst
index 8eaa3c498f..97c301fd5c 100644
--- a/common/source/docs/common-powermodule-landingpage.rst
+++ b/common/source/docs/common-powermodule-landingpage.rst
@@ -29,6 +29,8 @@ Power Monitors Connecting to AutoPilot Power Monitor Port
 .. toctree::
     :maxdepth: 1
     
+    Holybro Analog Power Modules (PM02,PM06,PM07) <https://holybro.com/collections/power-modules-pdbs/Analog>
+    Holybro Digital I2C Power Modules (PM02D,PM03D,PM06D) <https://holybro.com/collections/power-modules-pdbs/Digital>
     Common Power Module <common-3dr-power-module>
     AirbotPower Power Module <common-airbotpower-power-module>
     CUAV HV PM<common-hv-pm>
@@ -42,6 +44,7 @@ CAN/DroneCAN Power Monitors and Batteries
 .. toctree::
     :maxdepth: 1
 
+    Holybro PM08-CAN Power Modules <https://holybro.com/collections/power-modules-pdbs/products/dronecan-pm08-power-module-14s-200a>
     ARK PAB Power Modules <common-ark-power-modules>
     CUAV CAN/DroneCAN PMU<common-can-pmu>
     Matek CAN-L4-BM DroneCan PMU <http://www.mateksys.com/?portfolio=can-l4-bm>
@@ -56,6 +59,7 @@ I2C Power Monitor
 .. toctree::
     :maxdepth: 1
 
+    Holybro Digital I2C Power Modules (PM02D,PM03D,PM06D) <https://holybro.com/collections/power-modules-pdbs/Digital>
     Rotoye BatMon Smart Battery <common-smart-battery-rotoye.rst>
 
 Power Monitoring Via Telemetry Equipped AM32/BLHeli32/S ESCs
diff --git a/common/source/docs/common-sik-telemetry-radio.rst b/common/source/docs/common-sik-telemetry-radio.rst
index bdc52a1187..0bbcfcb8ed 100644
--- a/common/source/docs/common-sik-telemetry-radio.rst
+++ b/common/source/docs/common-sik-telemetry-radio.rst
@@ -39,7 +39,7 @@ many different sources, including ArduPilot Partners:
 
 -  Search EBay for `SiK Telemetry Radio <https://www.ebay.com/sch/i.html?_from=R40&_trksid=m570.l1313&_nkw=SiK+telemetry+radio&_sacat=0&LH_TitleDesc=0&_osacat=0&_odkw=3dr+telemetry+radio>`__ (be aware, many "clones" have incorrect analog modules and will interoperate fine with themselves, although with reduced range, but not with the original "3DR" design. OEM versions below do not have this issue)
 -  `mRo SiK Telemetry Radio <https://store.mrobotics.io/product-p/mro-sikv2airgnd-mr.htm>`__ (mRobotics)
--  `Holybro SiK Telemetry Radio <https://shop.holybro.com/transceiver-telemetry-radio-v3_p1103.html>`__ (Holybro)
+-  `Holybro SiK Telemetry Radio <https://holybro.com/products/sik-telemetry-radio-v3>`__ (Holybro)
 
 .. tip::
 
diff --git a/common/source/docs/common-telemetry-landingpage.rst b/common/source/docs/common-telemetry-landingpage.rst
index 1f381e1f18..566dcff07b 100644
--- a/common/source/docs/common-telemetry-landingpage.rst
+++ b/common/source/docs/common-telemetry-landingpage.rst
@@ -53,7 +53,7 @@ Long Range
     DragonLink <common-dragonlink-rc>
     Herelink <common-herelink>
     Holybro 900Mhz XBP9X Telemetry Radio <https://shop.holybro.com/xbp9x-radio_p1268.html>
-    Holybro Microhard P900 Radio Telemetry Radio <http://www.holybro.com/product/microhard-p900-radio/>
+    Holybro Microhard Radio Telemetry Radio (P900/P840/P400-C1S) <https://holybro.com/products/microhard-radio>
     LTM telemetry <common-ltm-telemetry>
     mLRS <common-mlrs-rc.rst>
     RFD900 <common-rfd900>
diff --git a/common/source/docs/common-uavcan-peripherals.rst b/common/source/docs/common-uavcan-peripherals.rst
index a88d5fa71c..57ca684506 100644
--- a/common/source/docs/common-uavcan-peripherals.rst
+++ b/common/source/docs/common-uavcan-peripherals.rst
@@ -28,11 +28,11 @@ GPS/Combos
     CubePilot HERE 3/3+ DroneCAN RTK GPS/IMU/Compass <https://docs.cubepilot.org/user-guides/here-3/here-3-manual>
     CubePilot HERE 4 DroneCAN RTK GPS/IMU/Compass <https://docs.cubepilot.org/user-guides/here-4/here-4-manual>
     CubePilot HEREPRO DroneCAN RTK GPS/Compass <https://docs.cubepilot.org/user-guides/herepro/herepro-manual>
-    Holybro DroneCAN M8/M9 GPS <https://shop.holybro.com/dronecan-m8n-m9n-gps_p1335.html>
+    Holybro DroneCAN M8/M9 GPS <https://holybro.com/collections/dronecan-gps-module>
     Holybro DroneCAN H-RTK F9P Rover <https://holybro.com/collections/gps-rtk-systems/products/dronecan-h-rtk-f9p-rover>
     Holybro DroneCAN H-RTK F9P Helical <https://holybro.com/collections/gps-rtk-systems/products/dronecan-h-rtk-f9p-helical>
-    Holybro H-RTK ZED-F9P Rover <https://holybro.com/products/h-rtk-zed-f9p-rover>
-    Holybro H-RTK NEO-F9P GPS Series <https://holybro.com/collections/h-rtk-neo-f9p-series>    
+    Holybro H-RTK ZED-F9P Rover (RM3100 Compass, Barometer, IP66 Waterproof) <https://holybro.com/collections/h-rtk-gps/products/h-rtk-zed-f9p-rover>
+    Holybro H-RTK NEO-F9P Family <https://holybro.com/collections/h-rtk-neo-f9p-series> 
     Matek M8Q-CAN/DroneCAN GPS+Compass+Baro+Airspeed I2C port <common-matek-m8q>
     Matek M10Q-3100 DroneCAN GPS+Compass <http://www.mateksys.com/?portfolio=m10q-3100>
     Matek DroneCAN GNSS M10-L4-3100 <http://www.mateksys.com/?portfolio=m10-l4-3100>
diff --git a/dev/source/docs/companion-computers.rst b/dev/source/docs/companion-computers.rst
index 159073a265..3250523fab 100644
--- a/dev/source/docs/companion-computers.rst
+++ b/dev/source/docs/companion-computers.rst
@@ -29,8 +29,8 @@ popular Companion Computer hardware are listed below.
     NVidia TX1 <companion-computer-nvidia-tx1>
     NVidia TX2 <companion-computer-nvidia-tx2>
     ODroid <odroid-via-mavlink>
-    Pixhawk Rasberry Pi CM4 Baseboard <https://holybro.com/products/pixhawk-rpi-cm4-baseboard>
-    Pixhawk Jetson Baseboard <https://holybro.com/products/pixhawk-jetson-baseboard>
+    Holybro Pixhawk Rasberry Pi CM4/CM5 Baseboard <https://holybro.com/products/pixhawk-rpi-cm4-baseboard>
+    Holybro Pixhawk Jetson Baseboard <https://holybro.com/products/pixhawk-jetson-baseboard>
     Raspberry Pi <raspberry-pi-via-mavlink>
 
 The Companion Computer software refers to the programs and tools that run on the Companion
diff --git a/images/holybro-pixhawk6/Pixhawk6X-internal.jpg b/images/holybro-pixhawk6/Pixhawk6X-internal.jpg
new file mode 100644
index 0000000000..fcf31654f3
Binary files /dev/null and b/images/holybro-pixhawk6/Pixhawk6X-internal.jpg differ
diff --git a/images/holybro-pixhawk6/Pixhawk6X.png b/images/holybro-pixhawk6/Pixhawk6X.png
deleted file mode 100644
index 84f75f0d59..0000000000
Binary files a/images/holybro-pixhawk6/Pixhawk6X.png and /dev/null differ