diff --git a/boards/terms-and-conditions.rst b/boards/terms-and-conditions.rst
index b8c32e1141a3c5eabd7e86e6ed0656045de83c84..1b212516781d11dfa2597571a78fc8c9276fca20 100644
--- a/boards/terms-and-conditions.rst
+++ b/boards/terms-and-conditions.rst
@@ -1,7 +1,7 @@
 .. _boards-terms-and-conditions:
 
-BeagleBoard.org general Terms & Conditions
-###########################################
+Terms & Conditions
+##################
 
 DESIGN
 *******
@@ -196,21 +196,19 @@ needed, the customer will pay all shipping costs.
 
 
 Before returning the board, please visit
-
-
-BeagleBoard.org/support
+https://docs.beagleboard.org/latest/intro/support
 
 
 For up to date SW images and technical information refer to
-https://beagleboard.org/latest-images
+https://www.beagleboard.org/distros
 
 
-All support for this board is provided via community support at
-BeagleBoard.org forum
+All support for is provided via community support at
+https://forum.beagleboard.org
 
 
-To return a defective board for repair, please request an RMA at
-beagleboard.org/support/rma
+To return a defective board for repair, please request a return materials authorization (RMA) at
+https://www.beagleboard.org/rma
 
 
 Please DO NOT return the board without approval from the RMA team
diff --git a/index.rst b/index.rst
index 6c81fc71f3d344fc5e835ec3647ceac913959002..3baf5be6ad9bd75efc322b6e3e74de1108718979 100644
--- a/index.rst
+++ b/index.rst
@@ -315,7 +315,6 @@ Capes
    :hidden:
    :caption: Boards
    
-   /boards/terms-and-conditions.rst
    /boards/beaglebone/ai-64/index
    /boards/beaglebone/ai/index
    /boards/beaglebone/black/index
@@ -325,6 +324,7 @@ Capes
    /boards/pocketbeagle/original/index
    /boards/beagleconnect/freedom/index
    /boards/beagleboard/index
+   /boards/terms-and-conditions.rst
 
 
 Projects