diff --git a/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config b/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config
index 5c6c5b463bf1..0cef1554599e 100644
--- a/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config
+++ b/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config
@@ -1,6 +1,5 @@
 CONFIG_QGKI=y
 CONFIG_LOCALVERSION="-qgki"
-CONFIG_DEBUG_FS=y
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_REGULATOR_QTI_DEBUG=y
 # CONFIG_DETECT_HUNG_TASK is not set
@@ -53,7 +52,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
 CONFIG_CAN=y
 CONFIG_QTI_CAN=y
 CONFIG_HDCP_QSEECOM=y
-CONFIG_IOMMU_DEBUG=y
 CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_IOMMU_TESTS=y
 CONFIG_ION_POOL_AUTO_REFILL=y
diff --git a/arch/arm64/configs/vendor/sdmsteppeauto_debug.config b/arch/arm64/configs/vendor/sdmsteppeauto_debug.config
index 324757a921d2..42870c62ed6d 100644
--- a/arch/arm64/configs/vendor/sdmsteppeauto_debug.config
+++ b/arch/arm64/configs/vendor/sdmsteppeauto_debug.config
@@ -9,3 +9,5 @@ CONFIG_PM_DEBUG=y
 CONFIG_COMMON_CLK_QCOM_DEBUG=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+CONFIG_DEBUG_FS=y
+CONFIG_IOMMU_DEBUG=y