diff --git a/docs/architecture/hotspot-makers/hotspot-makers.mdx b/docs/architecture/hotspot-makers/hotspot-makers.mdx
index 8df203e2b..412651b2d 100644
--- a/docs/architecture/hotspot-makers/hotspot-makers.mdx
+++ b/docs/architecture/hotspot-makers/hotspot-makers.mdx
@@ -145,9 +145,11 @@ withdrawal of approved maker status.
 
 ## FreedomFi (Now owned by Nova Labs)
 
-- [Website](https://freedomfi.com/) No direct sales while HIP-113 CBRS is Experimental is deployed.
+- [Website](https://freedomfi.com/) CBRS Hotspots can no longer be deployed.
 - Support: hardware@hellohelium.com and [Support site](https://hardware.hellohelium.com/en)
-- [iOS App](https://apps.apple.com/us/app/helium-hotspot/id1450463605) -
+- Use the [Helium Wallet App](https://docs.helium.com/wallets/helium-wallet-app/) for Hotspot onboarding
+  and rewards claiming.
+  [iOS App](https://apps.apple.com/us/app/helium-hotspot/id1450463605) -
   [Android App](https://play.google.com/store/apps/details?id=com.helium.wallet)
 - MOBILE Hotspot
   [HIP19 Application](https://github.com/dewi-alliance/hotspot-manufacturers/blob/main/applications/freedomfi.md)
@@ -162,9 +164,10 @@ now only operate as an IoT Hotspot.
 
 ## Helium Systems Inc (Now Nova Labs)
 
-- [iOS App](https://apps.apple.com/us/app/helium-hotspot/id1450463605) -
+- Use the [Helium Wallet App](https://docs.helium.com/wallets/helium-wallet-app/) for Hotspot onboarding
+  and rewards claiming.
+  [iOS App](https://apps.apple.com/us/app/helium-hotspot/id1450463605) -
   [Android App](https://play.google.com/store/apps/details?id=com.helium.wallet)
-- Support: support@helium.com
 - Onboarding Maker Address:
   [762bAGFtTj7L5UM92Rgz8YNtR7Rz6JmCZpUWxEDa5MfN](https://solscan.io/account/762bAGFtTj7L5UM92Rgz8YNtR7Rz6JmCZpUWxEDa5MfN)
 - Maker DC Balance:
@@ -204,8 +207,10 @@ now only operate as an IoT Hotspot.
 - [IOT iOS App](https://apps.apple.com/us/app/mntd-helium-hotspot-manager/id1595569593) -
   [IOT Android App](https://play.google.com/store/apps/details?id=com.getmntd.wallet)
 
-### IOT Hotspot
+### IoT Hotspot
 
+- Use the [Helium Wallet App](https://docs.helium.com/wallets/helium-wallet-app/) for Hotspot onboarding
+  and rewards claiming.
 - IOT Hotspot
   [HIP19 Application](https://github.com/dewi-alliance/hotspot-manufacturers/blob/main/applications/rak-wireless.md)
 - IOT Onboarding Maker Address:
@@ -221,8 +226,6 @@ now only operate as an IoT Hotspot.
   [GH6tvrii4DrhpA34xucjRTE1qxhRfF1HQ5UAeXiRtRv2](https://solscan.io/account/GH6tvrii4DrhpA34xucjRTE1qxhRfF1HQ5UAeXiRtRv2)
 - MOBILE Maker DC Balance:
   [GFCbw4fnvcWLgxoANEwZZLuoMmJ2KZrDtMdsjQUqs3Hc](https://solscan.io/account/GFCbw4fnvcWLgxoANEwZZLuoMmJ2KZrDtMdsjQUqs3Hc)
-- MOBILE Maker MOBILE Balance:
-  [AjoRqcCxS3A7rWtr6BZ3nQ4iMot8r9mMQz2Hw27Pvrbc](https://solscan.io/account/AjoRqcCxS3A7rWtr6BZ3nQ4iMot8r9mMQz2Hw27Pvrbc)
 
 ## Nova Labs (was Helium Systems, Inc.)
 
@@ -236,8 +239,6 @@ Selling MOBILE Wi-Fi Hotspot under the HelloHelium identity
   [FbnCZoQzE9GrmWxG1yMsYyw4YrEJSZjyNVtF3PDCPzoi](https://solscan.io/account/FbnCZoQzE9GrmWxG1yMsYyw4YrEJSZjyNVtF3PDCPzoi)
 - MOBILE Maker DC Balance:
   [t4P24xTVyySL4XSBvR3hJa3fgMyKy4pwfMU6BFb8H8P](https://solscan.io/account/t4P24xTVyySL4XSBvR3hJa3fgMyKy4pwfMU6BFb8H8P)
-- MOBILE Maker MOBILE Balance:
-  [AT9c65QDqGxL8gqqGGq1RzQhwuvBAChfkj3nrZZ6HycC](https://solscan.io/account/AT9c65QDqGxL8gqqGGq1RzQhwuvBAChfkj3nrZZ6HycC)
 
 ## Osprey Electronics (Ingenious Technology)
 
@@ -319,12 +320,13 @@ the network by these makers. Existing stock already manufactured in sales channe
 already manufactured can be onboarded onto the network.
 
 Helium Foundation still requests that these makers fulfill their obligations to their customers to
-fund the \$10+\$1 Onboarding and Location assertion fees but cannot enforce this requirement.
-Owners of un-onboarded Hotspots can pay the onboarding and location assertion fees from their own
-wallets if maker wallets are out of DC funds by using the
-[Helium Wallet App.](/wallets/helium-wallet-app) to onboard. Do not use the maker apps or the
-"Repair Onboarding" option in the Helium Wallet app unless the maker has enough DC in their wallet
-balance for the onboarding and assert transactions.
+fund the \$10+\$1 Onboarding and Location assertion fees but cannot enforce this requirement. Owners
+of un-onboarded Hotspots can pay the onboarding and location assertion fees from their own wallets
+if maker wallets are out of DC funds by using the [Helium Wallet App.](/wallets/helium-wallet-app)
+to onboard. 
+
+Do not use the maker apps or the "Repair Onboarding" option in the Helium Wallet app
+unless the maker has enough DC in their wallet balance for the onboarding and assert transactions.
 
 ## Aiteks
 
@@ -385,7 +387,8 @@ balance for the onboarding and assert transactions.
 
 - [Website](https://www.calchipconnect.com)
 - Support: support@calchipconnect.com
-- For onboarding use the [Helium Wallet App](/wallets/helium-wallet-app)
+- Use the [Helium Wallet App](https://docs.helium.com/wallets/helium-wallet-app/) for Hotspot onboarding
+  and rewards claiming.
 - IOT Onboarding Maker Address:
   [3YP8z4bTzzU2G2aHFtU1WH92qEYjMSDFT6bubUwS3HKP](https://solscan.io/account/3YP8z4bTzzU2G2aHFtU1WH92qEYjMSDFT6bubUwS3HKP)
 - IOT Maker DC Balance:
@@ -466,6 +469,8 @@ Maker suspended
 
 ## Hummingbird (RUFF)
 
+Maker Suspended
+
 - [Website](https://www.xdt.com)
 - Support: topelinux@gmail.com
 - [iOS App](https://apps.apple.com/app/hummingbird-hotspot/id1612429261) -