diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 0db72e6249f9..22a1e63ddef2 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -39,6 +39,7 @@ CONFIG_USB_CONFIGFS_F_DIAG=m
 CONFIG_USB_CONFIGFS_F_CCID=m
 CONFIG_USB_CONFIGFS_F_CDEV=m
 CONFIG_USB_CONFIGFS_F_GSI=m
+CONFIG_USB_CONFIGFS_F_QDSS=m
 CONFIG_USB_CONFIGFS_F_UAC2=m
 CONFIG_USB_STORAGE=m
 CONFIG_TYPEC_UCSI=m
@@ -216,7 +217,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_SPS=m
 CONFIG_SPS_SUPPORT_NDP_BAM=y
 # CONFIG_SPS_SUPPORT_BAMDMA is not set
-# CONFIG_USB_BAM is not set
+CONFIG_USB_BAM=m
 CONFIG_UTS_NS=y
 CONFIG_HH_IRQ_LEND=m
 CONFIG_SM_GCC_SHIMA=m
diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index b1136a81f29a..200542311b23 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -126,8 +126,6 @@ CONFIG_QTI_SDPM_CLOCK_MONITOR=y
 CONFIG_SPS=y
 # CONFIG_SPS_SUPPORT_BAMDMA is not set
 CONFIG_SPS_SUPPORT_NDP_BAM=y
-CONFIG_USB_BAM=y
-CONFIG_USB_CONFIGFS_F_QDSS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y
 CONFIG_CRYPTO_DEV_QCRYPTO=y