diff --git a/.gitlab/manual_tests/cram/mxl25641-hdk-6/test_ethernet_dhcp.t b/.gitlab/manual_tests/cram/mxl25641-hdk-6/test_ethernet_dhcp.t
new file mode 100644
index 0000000000..09547f1552
--- /dev/null
+++ b/.gitlab/manual_tests/cram/mxl25641-hdk-6/test_ethernet_dhcp.t
@@ -0,0 +1,68 @@
+# Purpose: manually test Ethernet_DHCP mode
+#
+# Before running this script, prepare the setup manually by following the steps
+# below. cram tests cannot pause mid-test and interactively ask a human for
+# input.
+#
+# - Log in on the HGW, run 'firstboot -yr', and wait until HGW has rebooted.
+# - Plug in optical Ethernet SFP.
+# - Connect SFP to a link partner. The link partner must run a DHCP server which
+#   assigns IPv4 addresses on VLAN 100.
+# - Log in on the HGW and change the WAN mode to Ethernet_DHCP with the command:
+#   ba-cli "WANManager.setWANMode(WANMode = Ethernet_DHCP)"
+# - Wait until the HGW has rebooted and the Ethernet WAN IF has received an
+#   IPv4 address. You can check this by running following command on the HGW:
+#   ip a show dev vlan_data
+
+  $ alias R="${CRAM_REMOTE_COMMAND:-ssh root@192.168.1.1}"
+
+# Check if we're on the right board
+
+  $ R "ubus call system board | jsonfilter -e @.model"
+  mxl,osp-tb341-v2
+
+  $ R ba-cli 'WANManager.WANMode?' | grep -Ev '^>|^$'
+  WANManager.WANMode="Ethernet_DHCP"
+
+  $ R ba-cli 'SFPs.SFPCage.1.?' | grep -Ev '^>|^$'
+  SFPs.SFPCage.1.
+  SFPs.SFPCage.1.Alias="cpe-cage-1"
+  SFPs.SFPCage.1.IsAllowed=1
+  SFPs.SFPCage.1.MgmtInterface="SFF-8472"
+  SFPs.SFPCage.1.Name="sfp0"
+  SFPs.SFPCage.1.SFF8024Identifier=3
+  SFPs.SFPCage.1.SFPPresent=1
+  SFPs.SFPCage.1.SFPReference="Device.SFPs.Mgmt.SFF8472.1"
+  SFPs.SFPCage.1.SFPType="Optical Ethernet"
+
+  $ R usp-cli 'Device.SFPs.SFPCage.1.?' | grep -Ev '^>|^$'
+  Device.SFPs.SFPCage.1.
+  Device.SFPs.SFPCage.1.Alias="cpe-cage-1"
+  Device.SFPs.SFPCage.1.IsAllowed=1
+  Device.SFPs.SFPCage.1.MgmtInterface="SFF-8472"
+  Device.SFPs.SFPCage.1.Name="sfp0"
+  Device.SFPs.SFPCage.1.SFF8024Identifier=3
+  Device.SFPs.SFPCage.1.SFPPresent=1
+  Device.SFPs.SFPCage.1.SFPReference="Device.SFPs.Mgmt.SFF8472.1"
+  Device.SFPs.SFPCage.1.SFPType="Optical Ethernet"
+
+# Uncomment next test and replace the default GW by the one on your HGW if you
+# want to check if the 'ip r' command returns the correct default GW. Uncomment
+# by inserting 2 spaces at the beginning of each line. The 'sed' command strips
+# any whitespace from the end.
+
+$ R ip r | grep default | sed -e 's/[[:space:]]*$//'
+default via 10.100.0.1 dev vlan100 proto static
+
+# Check HGW received default route via vlan100.
+
+  $ R ip r | grep default | cut -d" " -f1
+  default
+
+  $ R ip r | grep default | cut -d" " -f5
+  vlan100
+
+# Check implementation details
+  $ R fw_printenv -n wantype
+  eth
+
diff --git a/.gitlab/manual_tests/cram/mxl25641-hdk-6/test_gpon_dhcp.t b/.gitlab/manual_tests/cram/mxl25641-hdk-6/test_gpon_dhcp.t
new file mode 100644
index 0000000000..1f02c74e6e
--- /dev/null
+++ b/.gitlab/manual_tests/cram/mxl25641-hdk-6/test_gpon_dhcp.t
@@ -0,0 +1,90 @@
+# Purpose: manually test GPON_DHCP mode to test PON via SFP
+#
+# Before running this script, prepare the setup manually by following the steps
+# below. cram tests cannot pause mid-test and interactively ask a human for
+# input.
+#
+# - Log in on the HGW, run 'firstboot -yr', and wait until HGW has rebooted.
+# - Plug in XGS-PON SFP.
+# - Plug in XGS-PON fiber into SFP.
+# - Connect other end of XGS-PON fiber to a link partner, typically an OLT.
+# - The network behind the OLT must run a DHCP server which assigns IPv4
+#   addresses on a certain network VLAN.
+# - Log in on the HGW and change the WAN mode to GPON_DHCP with the command:
+#   ba-cli "WANManager.setWANMode(WANMode = GPON_DHCP)"
+# - Wait a few seconds. If the HGW reboots, wait until the HGW has rebooted.
+# - Let the OLT activate the ONU and send OMCI config. The OMCI config must
+#   configure (at least) one bidirectional unicast GEM port which supports VLAN
+#   translation between VLAN 100 on the HGW and the network VLAN mentioned
+#   before.
+# - Wait until the HGW has rebooted and the PON WAN IF has received an
+#   IPv4 address. You can check this by running following command on the HGW:
+#   ip a show dev vlan_data
+
+  $ alias R="${CRAM_REMOTE_COMMAND:-ssh root@192.168.1.1}"
+
+# Check if we're on the right board
+
+  $ R "ubus call system board | jsonfilter -e @.model"
+  mxl,osp-tb341-v2
+
+  $ R ba-cli 'WANManager.WANMode?' | grep -Ev '^>|^$'
+  WANManager.WANMode="GPON_DHCP"
+
+  $ R ba-cli 'SFPs.SFPCage.1.?' | grep -Ev '^>|^$'
+  SFPs.SFPCage.1.
+  SFPs.SFPCage.1.Alias="cpe-cage-1"
+  SFPs.SFPCage.1.IsAllowed=1
+  SFPs.SFPCage.1.MgmtInterface="SFF-8472"
+  SFPs.SFPCage.1.Name="sfp0"
+  SFPs.SFPCage.1.SFF8024Identifier=3
+  SFPs.SFPCage.1.SFPPresent=1
+  SFPs.SFPCage.1.SFPReference="Device.SFPs.Mgmt.SFF8472.1"
+  SFPs.SFPCage.1.SFPType="XGS-PON"
+
+  $ R usp-cli 'Device.SFPs.SFPCage.1.?' | grep -Ev '^>|^$'
+  Device.SFPs.SFPCage.1.
+  Device.SFPs.SFPCage.1.Alias="cpe-cage-1"
+  Device.SFPs.SFPCage.1.IsAllowed=1
+  Device.SFPs.SFPCage.1.MgmtInterface="SFF-8472"
+  Device.SFPs.SFPCage.1.Name="sfp0"
+  Device.SFPs.SFPCage.1.SFF8024Identifier=3
+  Device.SFPs.SFPCage.1.SFPPresent=1
+  Device.SFPs.SFPCage.1.SFPReference="Device.SFPs.Mgmt.SFF8472.1"
+  Device.SFPs.SFPCage.1.SFPType="XGS-PON"
+
+  $ R ba-cli 'XPON.ONU.1.ANI.1.Transceiver.1.PONMode?' | grep -Ev '^>|^$'
+  XPON.ONU.1.ANI.1.Transceiver.1.PONMode="XGS-PON"
+
+  $ R ba-cli 'XPON.ONU.1.ANI.1.PONMode?' | grep -Ev '^>|^$'
+  XPON.ONU.1.ANI.1.PONMode="XGS-PON"
+
+  $ R ba-cli 'XPON.ONU.1.ANI.1.Status?' | grep -Ev '^>|^$'
+  XPON.ONU.1.ANI.1.Status="Up"
+
+  $ R ba-cli 'XPON.ONU.1.ANI.1.TC.ONUActivation.ONUState?' | grep -Ev '^>|^$'
+  XPON.ONU.1.ANI.1.TC.ONUActivation.ONUState="O5"
+
+  $ R ba-cli 'XPON.ONU.1.EthernetUNI.1.Status?' | grep -Ev '^>|^$'
+  XPON.ONU.1.EthernetUNI.1.Status="Up"
+
+# Uncomment next test and replace the default GW by the one on your HGW if you
+# want to check if the 'ip r' command returns the correct default GW. Uncomment
+# by inserting 2 spaces at the beginning of each line. The 'sed' command strips
+# any whitespace from the end.
+
+$ R ip r | grep default | sed -e 's/[[:space:]]*$//'
+default via 10.100.0.1 dev vlan100 proto static
+
+# Check HGW received default route via vlan100.
+
+  $ R ip r | grep default | cut -d" " -f1
+  default
+
+  $ R ip r | grep default | cut -d" " -f5
+  vlan100
+
+# Check implementation details
+  $ R fw_printenv -n wantype
+  pon
+
diff --git a/.gitlab/manual_tests/cram/mxl25641-hdk-6/test_gpon_onboard_dhcp.t b/.gitlab/manual_tests/cram/mxl25641-hdk-6/test_gpon_onboard_dhcp.t
new file mode 100644
index 0000000000..5ca2a758d5
--- /dev/null
+++ b/.gitlab/manual_tests/cram/mxl25641-hdk-6/test_gpon_onboard_dhcp.t
@@ -0,0 +1,91 @@
+# Purpose: manually test GPON_ONBOARD_DHCP mode to test PON via onboard BOSA
+#
+# Before running this script, prepare the setup manually by following the steps
+# below. cram tests cannot pause mid-test and interactively ask a human for
+# input.
+#
+# - Log in on the HGW, run 'firstboot -yr', and wait until HGW has rebooted.
+# - Remove any SFP.
+# - Plug in XGS-PON fiber into onboard BOSA.
+# - Connect other end of XGS-PON fiber to a link partner, typically an OLT.
+# - The network behind the OLT must run a DHCP server which assigns IPv4
+#   addresses on a certain network VLAN.
+# - Log in on the HGW and change the WAN mode to GPON_ONBOARD_DHCP with the
+#   command:
+#   ba-cli "WANManager.setWANMode(WANMode = GPON_ONBOARD_DHCP)"
+# - Wait a few seconds. If the HGW reboots, wait until the HGW has rebooted.
+# - Let the OLT activate the ONU and send OMCI config. The OMCI config must
+#   configure (at least) one bidirectional unicast GEM port which supports VLAN
+#   translation between VLAN 100 on the HGW and the network VLAN mentioned
+#   before.
+# - Wait until the HGW has rebooted and the PON WAN IF has received an
+#   IPv4 address. You can check this by running following command on the HGW:
+#   ip a show dev vlan_data
+
+  $ alias R="${CRAM_REMOTE_COMMAND:-ssh root@192.168.1.1}"
+
+# Check if we're on the right board
+
+  $ R "ubus call system board | jsonfilter -e @.model"
+  mxl,osp-tb341-v2
+
+  $ R ba-cli 'WANManager.WANMode?' | grep -Ev '^>|^$'
+  WANManager.WANMode="GPON_ONBOARD_DHCP"
+
+  $ R ba-cli 'SFPs.SFPCage.1.?' | grep -Ev '^>|^$'
+  SFPs.SFPCage.1.
+  SFPs.SFPCage.1.Alias="cpe-cage-1"
+  SFPs.SFPCage.1.IsAllowed=1
+  SFPs.SFPCage.1.MgmtInterface="SFF-8472"
+  SFPs.SFPCage.1.Name="sfp0"
+  SFPs.SFPCage.1.SFF8024Identifier=2
+  SFPs.SFPCage.1.SFPPresent=1
+  SFPs.SFPCage.1.SFPReference="Device.SFPs.Mgmt.SFF8472.1"
+  SFPs.SFPCage.1.SFPType="XGS-PON"
+
+  $ R usp-cli 'Device.SFPs.SFPCage.1.?' | grep -Ev '^>|^$'
+  Device.SFPs.SFPCage.1.
+  Device.SFPs.SFPCage.1.Alias="cpe-cage-1"
+  Device.SFPs.SFPCage.1.IsAllowed=1
+  Device.SFPs.SFPCage.1.MgmtInterface="SFF-8472"
+  Device.SFPs.SFPCage.1.Name="sfp0"
+  Device.SFPs.SFPCage.1.SFF8024Identifier=2
+  Device.SFPs.SFPCage.1.SFPPresent=1
+  Device.SFPs.SFPCage.1.SFPReference="Device.SFPs.Mgmt.SFF8472.1"
+  Device.SFPs.SFPCage.1.SFPType="XGS-PON"
+
+  $ R ba-cli 'XPON.ONU.1.ANI.1.Transceiver.1.PONMode?' | grep -Ev '^>|^$'
+  XPON.ONU.1.ANI.1.Transceiver.1.PONMode="XGS-PON"
+
+  $ R ba-cli 'XPON.ONU.1.ANI.1.PONMode?' | grep -Ev '^>|^$'
+  XPON.ONU.1.ANI.1.PONMode="XGS-PON"
+
+  $ R ba-cli 'XPON.ONU.1.ANI.1.Status?' | grep -Ev '^>|^$'
+  XPON.ONU.1.ANI.1.Status="Up"
+
+  $ R ba-cli 'XPON.ONU.1.ANI.1.TC.ONUActivation.ONUState?' | grep -Ev '^>|^$'
+  XPON.ONU.1.ANI.1.TC.ONUActivation.ONUState="O5"
+
+  $ R ba-cli 'XPON.ONU.1.EthernetUNI.1.Status?' | grep -Ev '^>|^$'
+  XPON.ONU.1.EthernetUNI.1.Status="Up"
+
+# Uncomment next test and replace the default GW by the one on your HGW if you
+# want to check if the 'ip r' command returns the correct default GW. Uncomment
+# by inserting 2 spaces at the beginning of each line. The 'sed' command strips
+# any whitespace from the end.
+
+$ R ip r | grep default | sed -e 's/[[:space:]]*$//'
+default via 10.100.0.1 dev vlan100 proto static
+
+# Check HGW received default route via vlan100.
+
+  $ R ip r | grep default | cut -d" " -f1
+  default
+
+  $ R ip r | grep default | cut -d" " -f5
+  vlan100
+
+# Check implementation details
+  $ R fw_printenv -n wantype
+  pon
+