diff --git a/arch/arm64/configs/vendor/gen3auto_GKI.config b/arch/arm64/configs/vendor/gen3auto_GKI.config
index 26cffe2e36f6..0636ee2646d0 100644
--- a/arch/arm64/configs/vendor/gen3auto_GKI.config
+++ b/arch/arm64/configs/vendor/gen3auto_GKI.config
@@ -134,3 +134,9 @@ CONFIG_MSM_BT_POWER=m
 CONFIG_MSM_SPSS_UTILS=m
 CONFIG_MSM_SPCOM=m
 CONFIG_QCOM_CDSP_RM=m
+CONFIG_CNSS2=m
+CONFIG_CNSS2_QMI=y
+CONFIG_CNSS_ASYNC=y
+CONFIG_CNSS_UTILS=m
+CONFIG_CNSS_GENL=m
+CONFIG_QRTR_MHI=m
diff --git a/arch/arm64/configs/vendor/gen3auto_debug.config b/arch/arm64/configs/vendor/gen3auto_debug.config
index 95b78d635157..382a224fc2a1 100644
--- a/arch/arm64/configs/vendor/gen3auto_debug.config
+++ b/arch/arm64/configs/vendor/gen3auto_debug.config
@@ -12,3 +12,4 @@ CONFIG_COMMON_CLK_QCOM_DEBUG=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 CONFIG_DEBUG_FS=y
+CONFIG_CNSS2_DEBUG=y