diff --git a/arch/arm64/configs/vendor/gen3auto_GKI.config b/arch/arm64/configs/vendor/gen3auto_GKI.config
index 6737ed4a2ebf..92e670a1f11b 100644
--- a/arch/arm64/configs/vendor/gen3auto_GKI.config
+++ b/arch/arm64/configs/vendor/gen3auto_GKI.config
@@ -20,3 +20,38 @@ CONFIG_KERNEL_HEADER_TEST=y
 CONFIG_UAPI_HEADER_TEST=y
 CONFIG_QCOM_PDC=m
 CONFIG_QCOM_RPMH=m
+CONFIG_QCOM_COMMAND_DB=m
+CONFIG_QCOM_RPMH=m
+CONFIG_INTERCONNECT_QCOM=m
+CONFIG_INTERCONNECT_QCOM_SM8150=m
+CONFIG_INTERCONNECT_TEST=m
+CONFIG_SM_CAMCC_8150=m
+CONFIG_SM_DISPCC_8150=m
+CONFIG_SM_GPUCC_8150=m
+CONFIG_SM_NPUCC_8150=m
+CONFIG_SM_SCC_8150=m
+CONFIG_SM_VIDEOCC_8150=m
+CONFIG_MSM_CLK_AOP_QMP=m
+CONFIG_ARM_QCOM_CPUFREQ_HW=m
+CONFIG_INTERCONNECT_QCOM_OSM_L3=m
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_V4=m
+CONFIG_SCSI_UFS_QCOM=m
+CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_UFS_CRYPTO_QTI=m
+CONFIG_QTI_CRYPTO_COMMON=m
+CONFIG_QTI_HW_KEY_MANAGER=m
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
+CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_MSM_QMP=m
+CONFIG_RPMSG_QCOM_GLINK_SMEM=m
+CONFIG_RPMSG_QCOM_GLINK_SPSS=m
+CONFIG_RPMSG_QCOM_GLINK_SPI=m
+CONFIG_QCOM_SMEM=m
+CONFIG_QCOM_SMP2P=m
+CONFIG_QCOM_GLINK_PKT=m
+CONFIG_QSEE_IPC_IRQ_BRIDGE=m
+CONFIG_QCOM_SMP2P_SLEEPSTATE=m
+CONFIG_QSEE_IPC_IRQ=m
+CONFIG_QCOM_GLINK=m
diff --git a/arch/arm64/configs/vendor/gen3auto_QGKI.config b/arch/arm64/configs/vendor/gen3auto_QGKI.config
index de91ec9691e0..533dd0954eae 100644
--- a/arch/arm64/configs/vendor/gen3auto_QGKI.config
+++ b/arch/arm64/configs/vendor/gen3auto_QGKI.config
@@ -19,3 +19,9 @@ CONFIG_REGULATOR_QTI_DEBUG=y
 CONFIG_QCOM_SOC_SLEEP_STATS=y
 CONFIG_ARM_QCOM_LPM_CPUIDLE=y
 # CONFIG_ARM_CPUIDLE is not set
+CONFIG_INTERCONNECT_TEST=y
+CONFIG_SM_DEBUGCC_8150=y
+CONFIG_ARM_QCOM_CPUFREQ_HW=y
+CONFIG_SCSI_UFSHCD_QTI=y
+CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_UFSHCD=y