diff --git a/apparmor.d/groups/freedesktop/cpupower b/apparmor.d/groups/freedesktop/cpupower
index b9811b1a..2d58faff 100644
--- a/apparmor.d/groups/freedesktop/cpupower
+++ b/apparmor.d/groups/freedesktop/cpupower
@@ -28,15 +28,10 @@ profile cpupower @{exec_path} {
   @{sys}/devices/system/cpu/{cpufreq,cpuidle}/** r,
   @{sys}/devices/system/cpu/cpu@{int}/{cpufreq,cpuidle}/ r,
   @{sys}/devices/system/cpu/cpu@{int}/{cpufreq,cpuidle}/** r,
-
-  @{sys}/devices/system/cpu/cpufreq/policy@{int}/scaling_{min,max}_freq rw,
-  @{sys}/devices/system/cpu/cpufreq/policy@{int}/scaling_governor rw,
-  @{sys}/devices/system/cpu/cpufreq/policy@{int}/scaling_setspeed rw,
   @{sys}/devices/system/cpu/cpu@{int}/cpuidle/state@{int}/disable rw,
-
-  @{sys}/devices/system/cpu/cpu@{int}/topology/{physical_package_id,core_id} r,
-
   @{sys}/devices/system/cpu/cpu@{int}/online r,
+  @{sys}/devices/system/cpu/cpu@{int}/topology/{physical_package_id,core_id} r,
+  @{sys}/devices/system/cpu/cpufreq/policy@{int}/* rw,
 
   /dev/cpu/@{int}/msr r,
 
diff --git a/apparmor.d/profiles-m-r/power-profiles-daemon b/apparmor.d/profiles-m-r/power-profiles-daemon
index b3968280..fe4e3572 100644
--- a/apparmor.d/profiles-m-r/power-profiles-daemon
+++ b/apparmor.d/profiles-m-r/power-profiles-daemon
@@ -40,8 +40,7 @@ profile power-profiles-daemon @{exec_path} flags=(attach_disconnected) {
   @{sys}/devices/system/cpu/*_pstate/status r,
   @{sys}/devices/system/cpu/cpu@{int}/power/energy_perf_bias rw,
   @{sys}/devices/system/cpu/cpufreq/ r,
-  @{sys}/devices/system/cpu/cpufreq/policy@{int}/energy_performance_preference rw,
-  @{sys}/devices/system/cpu/cpufreq/policy@{int}/scaling_governor rw,
+  @{sys}/devices/system/cpu/cpufreq/policy@{int}/* rw,
   @{sys}/firmware/acpi/platform_profile* rw,
   @{sys}/firmware/acpi/pm_profile* rw,