diff --git a/boards.sh b/boards.sh
index a39a94b7c..63a37cb75 100644
--- a/boards.sh
+++ b/boards.sh
@@ -180,15 +180,9 @@ install_kernel (){
 	# configure MIN / MAX speed for cpufrequtils
 	echo "ENABLE=true" > $DEST/cache/sdcard/etc/default/cpufrequtils
 	echo "MIN_SPEED=$CPUMIN" >> $DEST/cache/sdcard/etc/default/cpufrequtils
-	echo "MAX_SPEED=$CPUMAX" >> $DEST/cache/sdcard/etc/default/cpufrequtils
-
-	# interactive currently available only on 3.4
-	if [[ $BRANCH != *next* ]];then
-		echo "GOVERNOR=interactive" >> $DEST/cache/sdcard/etc/default/cpufrequtils
-	else
-		echo "GOVERNOR=ondemand" >> $DEST/cache/sdcard/etc/default/cpufrequtils
-	fi
-
+	echo "MAX_SPEED=$CPUMAX" >> $DEST/cache/sdcard/etc/default/cpufrequtils	
+	echo "GOVERNOR=$GOVERNOR" >> $DEST/cache/sdcard/etc/default/cpufrequtils
+	
 	# set hostname 
 	echo $HOST > $DEST/cache/sdcard/etc/hostname
 
diff --git a/configuration.sh b/configuration.sh
index be1afca05..c97116991 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -391,12 +391,13 @@
 	[[ -z $BOOTSOURCE ]] && eval BOOTSOURCE=\$UBOOT_${BRANCH^^}"_SOURCE"
 	[[ -z $BOOTBRANCH ]] && eval BOOTBRANCH=\$UBOOT_${BRANCH^^}"_BRANCH"
 	[[ -z $CPUMIN && $LINUXFAMILY == sun*i ]] && CPUMIN="480000" && CPUMAX="1010000" && GOVERNOR="interactive"
+	[[ $BRANCH != "default" && $LINUXFAMILY == sun*i ]] && GOVERNOR="ondemand"
 	[[ -z $CPUMIN && $LINUXFAMILY == odroid ]] && CPUMIN="600000" && CPUMAX="1800000" && GOVERNOR="conservative"
 	[[ -z $CPUMIN && $LINUXFAMILY == cubox ]] && CPUMIN="396000" && CPUMAX="996000" && GOVERNOR="interactive"
 	[[ -z $CPUMIN && $LINUXFAMILY == s500 ]] && CPUMIN="408000" && CPUMAX="1104000" && GOVERNOR="interactive"
 	[[ -z $CPUMIN && ($LINUXFAMILY == udoo || $LINUXFAMILY == neo ) ]] && CPUMIN="392000" && CPUMAX="996000" && GOVERNOR="interactive"
-
-
+	[[ -z $GOVERNOR ]] && GOVERNOR="ondemand"
+	
 # debug
 echo -e "Config: $LINUXCONFIG\nKernel source: $LINUXKERNEL\nBranch: $KERNELBRANCH" >> $DEST/debug/install.log 
 echo -e "linuxsource: $LINUXSOURCE\nOffset: $OFFSET\nbootsize: $BOOTSIZE" >> $DEST/debug/install.log