diff --git a/arch/arm64/configs/vendor/gen3auto_GKI.config b/arch/arm64/configs/vendor/gen3auto_GKI.config
index e2ba50d33716..24dcad8ef47c 100644
--- a/arch/arm64/configs/vendor/gen3auto_GKI.config
+++ b/arch/arm64/configs/vendor/gen3auto_GKI.config
@@ -34,3 +34,10 @@ 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
diff --git a/arch/arm64/configs/vendor/gen3auto_QGKI.config b/arch/arm64/configs/vendor/gen3auto_QGKI.config
index 04531cb0bd79..533dd0954eae 100644
--- a/arch/arm64/configs/vendor/gen3auto_QGKI.config
+++ b/arch/arm64/configs/vendor/gen3auto_QGKI.config
@@ -22,3 +22,6 @@ CONFIG_ARM_QCOM_LPM_CPUIDLE=y
 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