diff --git a/arch/arm/configs/vendor/monaco-debug.config b/arch/arm/configs/vendor/monaco-debug.config
index f7b0c925dc46..9388e2811d19 100644
--- a/arch/arm/configs/vendor/monaco-debug.config
+++ b/arch/arm/configs/vendor/monaco-debug.config
@@ -51,13 +51,7 @@ CONFIG_PANIC_ON_DATA_CORRUPTION=y
 CONFIG_SERIAL_MSM_GENI_CONSOLE=y
 CONFIG_MSM_GPI_DMA_DEBUG=y
 # CONFIG_DETECT_HUNG_TASK is not set
-CONFIG_SDW_GCC_MONACO=y
 # CONFIG_PAGE_POISONING is not set
-CONFIG_SDW_GPUCC_MONACO=y
-CONFIG_ARM_QCOM_CPUFREQ_HW=y
-CONFIG_ARM_QCOM_CPUFREQ_HW_DEBUG=y
-CONFIG_SDW_DISPCC_MONACO=y
-CONFIG_SDW_DEBUGCC_MONACO=y
 CONFIG_VIDEO_V4L2=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
diff --git a/arch/arm/configs/vendor/monaco.config b/arch/arm/configs/vendor/monaco.config
index 536848af4970..c06368348556 100644
--- a/arch/arm/configs/vendor/monaco.config
+++ b/arch/arm/configs/vendor/monaco.config
@@ -275,9 +275,6 @@ CONFIG_MSM_GPI_DMA=y
 CONFIG_REGULATOR_QCOM_PM8008=y
 CONFIG_REGULATOR_QCOM_SMD_RPM=y
 CONFIG_REGULATOR_RPM_SMD=y
-CONFIG_QM_GPUCC_SCUBA=y
-CONFIG_QM_DISPCC_SCUBA=y
-CONFIG_QM_DEBUGCC_SCUBA=y
 CONFIG_MSM_RPM_SMD=y
 CONFIG_QCOM_CLK_SMD_RPM=y
 CONFIG_F2FS_FS=y
@@ -601,3 +598,8 @@ CONFIG_QTI_CPU_ISOLATE_COOLING_DEVICE=y
 CONFIG_QTI_THERMAL_LIMITS_DCVS=y
 CONFIG_REGULATOR_COOLING_DEVICE=y
 CONFIG_QTI_LMH_CPU_VDD_COOLING_DEVICE=y
+CONFIG_ARM_QCOM_CPUFREQ_HW=y
+CONFIG_ARM_QCOM_CPUFREQ_HW_DEBUG=y
+CONFIG_SDW_GPUCC_MONACO=y
+CONFIG_SDW_DISPCC_MONACO=y
+CONFIG_SDW_DEBUGCC_MONACO=y