diff --git a/configs/fedora/generic/riscv/CONFIG_CPUFREQ_DT b/configs/fedora/generic/riscv/CONFIG_CPUFREQ_DT
deleted file mode 100644
index 0c7667d7e..000000000
--- a/configs/fedora/generic/riscv/CONFIG_CPUFREQ_DT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CPUFREQ_DT=y
diff --git a/configs/fedora/generic/riscv/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND b/configs/fedora/generic/riscv/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
deleted file mode 100644
index 39bec5884..000000000
--- a/configs/fedora/generic/riscv/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
diff --git a/configs/fedora/generic/riscv/CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE b/configs/fedora/generic/riscv/CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE
deleted file mode 100644
index 90044ac60..000000000
--- a/configs/fedora/generic/riscv/CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config
index f1db861ce..7eb6f878f 100644
--- a/kernel-riscv64-debug.config
+++ b/kernel-riscv64-debug.config
@@ -770,12 +770,12 @@ CONFIG_CORTINA_PHY=m
 # CONFIG_CPU5_WDT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPUFREQ_DT=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPUFREQ_DT is not set
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
diff --git a/kernel-riscv64.config b/kernel-riscv64.config
index bceaf4859..1bc4b0939 100644
--- a/kernel-riscv64.config
+++ b/kernel-riscv64.config
@@ -769,12 +769,12 @@ CONFIG_CORTINA_PHY=m
 # CONFIG_CPU5_WDT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPUFREQ_DT=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPUFREQ_DT is not set
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y