diff --git a/src/mainboard/system76/mtl/Kconfig b/src/mainboard/system76/mtl/Kconfig
index 5422730488..76a1dd9b82 100644
--- a/src/mainboard/system76/mtl/Kconfig
+++ b/src/mainboard/system76/mtl/Kconfig
@@ -31,26 +31,30 @@ config BOARD_SYSTEM76_DARP10
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
 	select SOC_INTEL_METEORLAKE_U_H
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER
 
 config BOARD_SYSTEM76_DARP10_B
 	select BOARD_SYSTEM76_MTL_COMMON
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
 	select SOC_INTEL_METEORLAKE_U_H
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER
 
 config BOARD_SYSTEM76_LEMP13
 	select BOARD_SYSTEM76_MTL_COMMON
 	select DRIVERS_I2C_TAS5825M
 	select HAVE_SPD_IN_CBFS
-	select SOC_INTEL_METEORLAKE_U_H
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select SOC_INTEL_METEORLAKE_U_H
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER
 
 config BOARD_SYSTEM76_LEMP13_B
 	select BOARD_SYSTEM76_MTL_COMMON
 	select DRIVERS_I2C_TAS5825M
 	select HAVE_SPD_IN_CBFS
-	select SOC_INTEL_METEORLAKE_U_H
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select SOC_INTEL_METEORLAKE_U_H
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER
 
 if BOARD_SYSTEM76_MTL_COMMON
 
diff --git a/src/mainboard/system76/rpl/Kconfig b/src/mainboard/system76/rpl/Kconfig
index c7043afcb7..76ca6a5c86 100644
--- a/src/mainboard/system76/rpl/Kconfig
+++ b/src/mainboard/system76/rpl/Kconfig
@@ -55,13 +55,15 @@ config BOARD_SYSTEM76_BONW15
 
 config BOARD_SYSTEM76_DARP9
 	select BOARD_SYSTEM76_RPL_COMMON
-	select PCIEXP_HOTPLUG
 	select SOC_INTEL_ALDERLAKE_PCH_P
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER
 
 config BOARD_SYSTEM76_GALP7
 	select BOARD_SYSTEM76_RPL_COMMON
-	select PCIEXP_HOTPLUG
 	select SOC_INTEL_ALDERLAKE_PCH_P
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER
 
 config BOARD_SYSTEM76_GAZE18
 	select BOARD_SYSTEM76_RPL_COMMON
@@ -75,6 +77,7 @@ config BOARD_SYSTEM76_LEMP12
 	select HAVE_SPD_IN_CBFS
 	select SOC_INTEL_ALDERLAKE_PCH_P
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER
 
 config BOARD_SYSTEM76_ORYP11
 	select BOARD_SYSTEM76_RPL_COMMON
@@ -83,6 +86,7 @@ config BOARD_SYSTEM76_ORYP11
 	select EC_SYSTEM76_EC_DGPU
 	select SOC_INTEL_ALDERLAKE_PCH_P
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER
 
 config BOARD_SYSTEM76_ORYP12
 	select BOARD_SYSTEM76_RPL_COMMON