diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
index 3753b46a0b..5236ba56f6 100644
--- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
+++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
@@ -132,7 +132,13 @@ chip soc/intel/alderlake
 			end
 		end
 		device ref shared_sram	on  end
-		device ref cnvi_wifi	on  end
+		device ref cnvi_wifi	on
+			chip drivers/wifi/generic
+				register "add_acpi_dma_property"	= "true"
+				register "enable_cnvi_ddr_rfim"		= "true"
+				device generic 0 on end
+			end
+		end
 		device ref sata		on
 			register "sata_salp_support"		= "1"
 			register "sata_ports_enable[0]"		= "1"
diff --git a/src/mainboard/starlabs/lite/variants/glk/devicetree.cb b/src/mainboard/starlabs/lite/variants/glk/devicetree.cb
index b93d56683a..629668e3be 100644
--- a/src/mainboard/starlabs/lite/variants/glk/devicetree.cb
+++ b/src/mainboard/starlabs/lite/variants/glk/devicetree.cb
@@ -60,7 +60,8 @@ chip soc/intel/apollolake
 		end
 		device ref cnvi		on
 			chip drivers/wifi/generic
-				register "wake" = "GPE0A_CNVI_PME_STS"
+				register "add_acpi_dma_property"	= "true"
+				register "enable_cnvi_ddr_rfim"		= "true"
 				device generic 0 on end
 			end
 		end
diff --git a/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb b/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb
index 65ac609aee..549c022216 100644
--- a/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb
+++ b/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb
@@ -60,7 +60,8 @@ chip soc/intel/apollolake
 		end
 		device ref cnvi		on
 			chip drivers/wifi/generic
-				register "wake" = "GPE0A_CNVI_PME_STS"
+				register "add_acpi_dma_property"	= "true"
+				register "enable_cnvi_ddr_rfim"		= "true"
 				device generic 0 on end
 			end
 		end
diff --git a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
index 330e440508..3d17a1927a 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
@@ -145,7 +145,7 @@ chip soc/intel/alderlake
 		end
 		device ref pcie_rp5	on				# WiFi
 			chip drivers/wifi/generic
-				register "wake"				= "GPE0_PME_B0"
+				register "enable_cnvi_ddr_rfim"		= "true"
 				device generic 0 on end
 			end
 			register "pch_pcie_rp[PCH_RP(5)]" = "{
@@ -163,7 +163,7 @@ chip soc/intel/alderlake
 				register "enable_gpio"			= "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D13)"
 				register "reset_gpio"			= "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H2)"
 				register "srcclk_pin"			= "2"
-				register "add_acpi_dma_property"	= "1"
+				register "add_acpi_dma_property"	= "true"
 				register "skip_on_off_support"		= "1"
 				register "ext_pm_support"		= "ACPI_PCIE_RP_EMIT_ALL"
 				register "use_rp_mutex"			= "1"
diff --git a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
index 6569b04ada..d390a881b5 100644
--- a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
@@ -132,7 +132,8 @@ chip soc/intel/cannonlake
 		device ref shared_sram on  end
 		device ref cnvi_wifi on
 			chip drivers/wifi/generic
-				register "wake"			= "GPE0_PME_B0"
+				register "add_acpi_dma_property"	= "true"
+				register "enable_cnvi_ddr_rfim"		= "true"
 				device generic 0 on end
 			end
 		end
diff --git a/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb
index a594f7a1f7..f50e35d956 100644
--- a/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb
@@ -90,6 +90,8 @@ chip soc/intel/skylake
 			register "PcieRpClkSrcNumber[5]"	= "4"
 			register "PcieRpLtrEnable[5]"		= "1"
 			chip drivers/wifi/generic
+				register "add_acpi_dma_property"	= "true"
+				register "enable_cnvi_ddr_rfim"		= "true"
 				device generic 0 on end
 			end
 		end
diff --git a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb
index dc27e4e5da..c54a9b4f80 100644
--- a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb
@@ -182,7 +182,7 @@ chip soc/intel/alderlake
 		device ref shared_sram	on  end
 		device ref pcie_rp5	on				# WiFi
 			chip drivers/wifi/generic
-				register "wake"				= "GPE0_PME_B0"
+				register "enable_cnvi_ddr_rfim"		= "true"
 				device generic 0 on end
 			end
 			register "pch_pcie_rp[PCH_RP(5)]" = "{
@@ -200,8 +200,8 @@ chip soc/intel/alderlake
 				register "enable_gpio"			= "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D13)"
 				register "reset_gpio"			= "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H2)"
 				register "srcclk_pin"			= "2"
-				register "add_acpi_dma_property"	= "1"
 				register "skip_on_off_support"		= "1"
+				register "add_acpi_dma_property"	= "true"
 				register "ext_pm_support"		= "ACPI_PCIE_RP_EMIT_ALL"
 				register "use_rp_mutex"			= "1"
 				device generic 0 on end
diff --git a/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb
index b7b93d5d10..8dfece7561 100644
--- a/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb
@@ -164,7 +164,8 @@ chip soc/intel/tigerlake
 		device ref shared_ram	on  end
 		device ref cnvi_wifi	on
 			chip drivers/wifi/generic
-				register "wake"			= "GPE0_PME_B0"
+				register "add_acpi_dma_property"	= "true"
+				register "enable_cnvi_ddr_rfim"		= "true"
 				device generic 0 on end
 			end
 		end
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
index c3b9792923..1f5bf5ebfc 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
@@ -189,7 +189,7 @@ chip soc/intel/alderlake
                 end
 		device ref pcie_rp5	on			# WiFi
 			chip drivers/wifi/generic
-				register "wake"				= "GPE0_PME_B0"
+				register "enable_cnvi_ddr_rfim"		= "true"
 				device generic 0 on end
 			end
 			register "pch_pcie_rp[PCH_RP(5)]" = "{
@@ -207,7 +207,7 @@ chip soc/intel/alderlake
 				register "enable_gpio"			= "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D13)"
 				register "reset_gpio"			= "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H2)"
 				register "srcclk_pin"			= "2"
-				register "add_acpi_dma_property"	= "1"
+				register "add_acpi_dma_property"	= "true"
 				register "skip_on_off_support"		= "1"
 				register "ext_pm_support"		= "ACPI_PCIE_RP_EMIT_ALL"
 				register "use_rp_mutex"			= "1"
diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
index b1277161e2..43e5bc9b76 100644
--- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
+++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
@@ -125,10 +125,8 @@ chip soc/intel/alderlake
 		device ref shared_sram	on  end
 		device ref cnvi_wifi	on
 			chip drivers/wifi/generic
-				register "wake"				= "GPE0_PME_B0"
 				register "add_acpi_dma_property"	= "true"
 				register "enable_cnvi_ddr_rfim"		= "true"
-				use usb2_port10 as bluetooth_companion
 				device generic 0 on end
 			end
 		end