diff --git a/config/kernel/linux-mvebu64-default.config b/config/kernel/linux-mvebu64-default.config
index 650848229..a27e09af1 100644
--- a/config/kernel/linux-mvebu64-default.config
+++ b/config/kernel/linux-mvebu64-default.config
@@ -538,9 +538,9 @@ CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
diff --git a/config/sources/mvebu64.conf b/config/sources/mvebu64.conf
index 43d1ec089..2042510fa 100644
--- a/config/sources/mvebu64.conf
+++ b/config/sources/mvebu64.conf
@@ -17,7 +17,7 @@ HAS_UUID_SUPPORT=yes
 case $BRANCH in
 	default)
 	KERNELSOURCE='https://github.com/MarvellEmbeddedProcessors/linux-marvell.git'
-	KERNELBRANCH='branch:linux-4.4.52-armada-17.08'
+	KERNELBRANCH='branch:linux-4.4.52-armada-17.04'
 	KERNELDIR='linux-marvell'
 
 	KERNEL_USE_GCC='> 6.0'
@@ -41,7 +41,7 @@ case $BRANCH in
 esac
 
 CPUMIN=250000
-CPUMAX=800000
+CPUMAX=1000000
 GOVERNOR=ondemand
 
 write_uboot_platform()