diff --git a/.gitlab/tests/cram/scripts/prplmesh_ap_mld.sh b/.gitlab/tests/cram/scripts/prplmesh_ap_mld.sh
index 4b4d95bb2d..04ee861155 100644
--- a/.gitlab/tests/cram/scripts/prplmesh_ap_mld.sh
+++ b/.gitlab/tests/cram/scripts/prplmesh_ap_mld.sh
@@ -114,21 +114,21 @@ get_dataelements_apmld_normalized() {
   done | LC_ALL=C sort
 }
 
-# Restore default MLD/config after MLO test: WiFi MLDUnit for AP 1..9 (0,1,0,1,0,1,0,1,0),
+# Restore default MLD/config after MLO test: WiFi MLDUnit for AP 1..9 (0,1,0,1,0,1,2,2,2),
 # use_dataelements_vap_configs=0, Network.AccessPoint.1 SSID=prplOS, KeyPassphrase=password,
 # commit, prplmesh restart.
 # Out: echoes "MLO_DEFAULTS_RESTORED" when done.
 prplmesh_revert_mlo_to_defaults() {
   R logger -t cram "Restore default MLD configuration"
-  R "ba-cli -j -l WiFi.AccessPoint.1.SSIDReference+.MLDUnit=-1" | sed '/^$/d'
+  R "ba-cli -j -l WiFi.AccessPoint.1.SSIDReference+.MLDUnit=0" | sed '/^$/d'
   R "ba-cli -j -l WiFi.AccessPoint.2.SSIDReference+.MLDUnit=1" | sed '/^$/d'
-  R "ba-cli -j -l WiFi.AccessPoint.3.SSIDReference+.MLDUnit=-1" | sed '/^$/d'
+  R "ba-cli -j -l WiFi.AccessPoint.3.SSIDReference+.MLDUnit=0" | sed '/^$/d'
   R "ba-cli -j -l WiFi.AccessPoint.4.SSIDReference+.MLDUnit=1" | sed '/^$/d'
-  R "ba-cli -j -l WiFi.AccessPoint.5.SSIDReference+.MLDUnit=-1" | sed '/^$/d'
+  R "ba-cli -j -l WiFi.AccessPoint.5.SSIDReference+.MLDUnit=0" | sed '/^$/d'
   R "ba-cli -j -l WiFi.AccessPoint.6.SSIDReference+.MLDUnit=1" | sed '/^$/d'
-  R "ba-cli -j -l WiFi.AccessPoint.7.SSIDReference+.MLDUnit=0" | sed '/^$/d'
-  R "ba-cli -j -l WiFi.AccessPoint.8.SSIDReference+.MLDUnit=1" | sed '/^$/d'
-  R "ba-cli -j -l WiFi.AccessPoint.9.SSIDReference+.MLDUnit=0" | sed '/^$/d'
+  R "ba-cli -j -l WiFi.AccessPoint.7.SSIDReference+.MLDUnit=2" | sed '/^$/d'
+  R "ba-cli -j -l WiFi.AccessPoint.8.SSIDReference+.MLDUnit=2" | sed '/^$/d'
+  R "ba-cli -j -l WiFi.AccessPoint.9.SSIDReference+.MLDUnit=2" | sed '/^$/d'
   R "sed -i 's/^use_dataelements_vap_configs=.*/use_dataelements_vap_configs=0/' /opt/prplmesh/config/beerocks_controller.conf"
   sleep 10
   R "ba-cli -l X_PRPLWARE-COM_ProcessManager.PrplMesh.Enable=0" | tr -d '\n'
diff --git a/.gitlab/tests/cram/wnc-freedom/126-wifi-radio-capability.t b/.gitlab/tests/cram/wnc-freedom/126-wifi-radio-capability.t
index 855d7838fe..83033fd08a 100644
--- a/.gitlab/tests/cram/wnc-freedom/126-wifi-radio-capability.t
+++ b/.gitlab/tests/cram/wnc-freedom/126-wifi-radio-capability.t
@@ -114,15 +114,15 @@ Compare: same => OK, else MISMATCH and show both:
   OK
 
   $ prplmesh_revert_mlo_to_defaults
-  [{"Device.WiFi.SSID.1.":{"MLDUnit":-1}}]
+  [{"Device.WiFi.SSID.1.":{"MLDUnit":0}}]
   [{"Device.WiFi.SSID.3.":{"MLDUnit":1}}]
-  [{"Device.WiFi.SSID.4.":{"MLDUnit":-1}}]
+  [{"Device.WiFi.SSID.4.":{"MLDUnit":0}}]
   [{"Device.WiFi.SSID.6.":{"MLDUnit":1}}]
-  [{"Device.WiFi.SSID.7.":{"MLDUnit":-1}}]
+  [{"Device.WiFi.SSID.7.":{"MLDUnit":0}}]
   [{"Device.WiFi.SSID.9.":{"MLDUnit":1}}]
-  [{"Device.WiFi.SSID.16.":{"MLDUnit":0}}]
-  [{"Device.WiFi.SSID.17.":{"MLDUnit":1}}]
-  [{"Device.WiFi.SSID.18.":{"MLDUnit":0}}]
+  [{"Device.WiFi.SSID.16.":{"MLDUnit":2}}]
+  [{"Device.WiFi.SSID.17.":{"MLDUnit":2}}]
+  [{"Device.WiFi.SSID.18.":{"MLDUnit":2}}]
   01/opt/prplmesh/bin/beerocks_agent
   /opt/prplmesh/bin/beerocks_controller
   /opt/prplmesh/bin/beerocks_fronthaul -i wlan0
diff --git a/.gitlab/tests/cram/wnc-freedom/127-wifi-mlo-over-mesh.t b/.gitlab/tests/cram/wnc-freedom/127-wifi-mlo-over-mesh.t
index 843cf78498..9c7fe0b88e 100644
--- a/.gitlab/tests/cram/wnc-freedom/127-wifi-mlo-over-mesh.t
+++ b/.gitlab/tests/cram/wnc-freedom/127-wifi-mlo-over-mesh.t
@@ -130,15 +130,15 @@ Second MLO group (Guest):
 Restore defautlt MLDUnit and config values:
 
   $ prplmesh_revert_mlo_to_defaults
-  [{"Device.WiFi.SSID.1.":{"MLDUnit":-1}}]
+  [{"Device.WiFi.SSID.1.":{"MLDUnit":0}}]
   [{"Device.WiFi.SSID.3.":{"MLDUnit":1}}]
-  [{"Device.WiFi.SSID.4.":{"MLDUnit":-1}}]
+  [{"Device.WiFi.SSID.4.":{"MLDUnit":0}}]
   [{"Device.WiFi.SSID.6.":{"MLDUnit":1}}]
-  [{"Device.WiFi.SSID.7.":{"MLDUnit":-1}}]
+  [{"Device.WiFi.SSID.7.":{"MLDUnit":0}}]
   [{"Device.WiFi.SSID.9.":{"MLDUnit":1}}]
-  [{"Device.WiFi.SSID.16.":{"MLDUnit":0}}]
-  [{"Device.WiFi.SSID.17.":{"MLDUnit":1}}]
-  [{"Device.WiFi.SSID.18.":{"MLDUnit":0}}]
+  [{"Device.WiFi.SSID.16.":{"MLDUnit":2}}]
+  [{"Device.WiFi.SSID.17.":{"MLDUnit":2}}]
+  [{"Device.WiFi.SSID.18.":{"MLDUnit":2}}]
   01/opt/prplmesh/bin/beerocks_agent
   /opt/prplmesh/bin/beerocks_controller
   /opt/prplmesh/bin/beerocks_fronthaul -i wlan0