diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 70fdb4aea302..6add4d882170 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -172,6 +172,8 @@ CONFIG_MSM_GPI_DMA_DEBUG=y
 CONFIG_QSEECOM=m
 CONFIG_QCOM_SMCINVOKE=m
 CONFIG_HDCP_QSEECOM=m
+CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=m
+CONFIG_CRYPTO_DEV_QCEDEV=m
 CONFIG_HW_RANDOM_MSM_LEGACY=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_UCI=m
diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 411ed0e0a0f6..325608473153 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -137,9 +137,7 @@ CONFIG_SPS=y
 # CONFIG_SPS_SUPPORT_BAMDMA is not set
 CONFIG_SPS_SUPPORT_NDP_BAM=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y
 CONFIG_CRYPTO_DEV_QCRYPTO=y
-CONFIG_CRYPTO_DEV_QCEDEV=y
 CONFIG_THERMAL_TSENS=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_HAVE_USERSPACE_LOW_MEMORY_KILLER=y