diff --git a/packages/linux/install b/packages/linux/install
index 94076019ed..606e08de8a 100755
--- a/packages/linux/install
+++ b/packages/linux/install
@@ -47,5 +47,4 @@ if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then
     cp -rP $PKG_BUILD/tools/perf/scripts/python/* $INSTALL/usr/libexec/perf-core/scripts/python/
 fi
 
-enable_service cpupower-start.service
-enable_service cpupower-end.timer
+enable_service cpufreq-threshold.service
diff --git a/packages/linux/system.d/cpufreq-threshold.service b/packages/linux/system.d/cpufreq-threshold.service
new file mode 100644
index 0000000000..3bebb4e262
--- /dev/null
+++ b/packages/linux/system.d/cpufreq-threshold.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Set ondemand threshold
+DefaultDependencies=false
+
+[Service]
+Type=oneshot
+ExecStart=-/bin/sh -c 'echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold'
+RemainAfterExit=yes
+
+[Install]
+WantedBy=basic.target
diff --git a/packages/linux/system.d/cpupower-end.service b/packages/linux/system.d/cpupower-end.service
deleted file mode 100644
index 1ea8d71c79..0000000000
--- a/packages/linux/system.d/cpupower-end.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Set cpupower to ondemand
-DefaultDependencies=false
-
-[Service]
-Type=oneshot
-ExecStart=-/bin/sh -c 'for i in /sys/devices/system/cpu/*/cpufreq/scaling_governor; do printf "ondemand" > $i; done'
-ExecStartPost=-/bin/sh -c 'echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold'
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target
diff --git a/packages/linux/system.d/cpupower-end.timer b/packages/linux/system.d/cpupower-end.timer
deleted file mode 100644
index 7995eeb241..0000000000
--- a/packages/linux/system.d/cpupower-end.timer
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Set cpupower to ondemand
-
-[Timer]
-OnBootSec=40sec
-
-[Install]
-WantedBy=basic.target
diff --git a/packages/linux/system.d/cpupower-start.service b/packages/linux/system.d/cpupower-start.service
deleted file mode 100644
index b967eb78d5..0000000000
--- a/packages/linux/system.d/cpupower-start.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Set cpupower to performance
-DefaultDependencies=false
-
-[Service]
-Type=oneshot
-ExecStart=-/bin/sh -c 'for i in /sys/devices/system/cpu/*/cpufreq/scaling_governor; do printf "performance" > $i; done'
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target