diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index c6578233801fb..b6c40c8d1a958 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -74,6 +74,7 @@ CONFIG_QTI_PMIC_GLINK=m
 CONFIG_QTI_BATTERY_CHARGER=m
 CONFIG_QTI_BATTERY_GLINK_DEBUG=m
 CONFIG_QTI_ALTMODE_GLINK=m
+CONFIG_QRTR_MHI=m
 CONFIG_QSEE_IPC_IRQ_BRIDGE=m
 CONFIG_SENSORS_SSC=m
 CONFIG_POWER_RESET_MSM=m
diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index 8abcd823ea133..145a5914d2300 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -58,7 +58,6 @@ CONFIG_SLIMBUS=y
 CONFIG_SLIMBUS_MSM_NGD=y
 CONFIG_QCOM_SMCINVOKE=y
 CONFIG_MSM_DEBUGCC_LAHAINA=y
-CONFIG_QRTR_MHI=y
 CONFIG_DEBUG_PANIC_ON_OOM=y
 CONFIG_USB_F_FS_IPC_LOGGING=y
 CONFIG_DYNAMIC_DEBUG=y