diff --git a/modules/hardware/misc/cpu-thermal.nix b/modules/hardware/misc/cpu-thermal.nix
index b1a86e6..58d8180 100644
--- a/modules/hardware/misc/cpu-thermal.nix
+++ b/modules/hardware/misc/cpu-thermal.nix
@@ -2,7 +2,7 @@
   services = {
     thermald.enable = false;
     throttled.enable = true;
-    power-profiles-daemon.enable = true; # replacement for tlp and auto-cpufreq due to bugs
+    power-profiles-daemon.enable = false; # replacement for tlp and auto-cpufreq due to bugs
     tlp = {
       enable = false; # buggy and inconsistent with frequency scaling
       settings = {
@@ -50,17 +50,23 @@
       };
     };
     auto-cpufreq = {
-      enable = false; # wait for fix: https://github.com/AdnanHodzic/auto-cpufreq/issues/906
+      enable = true; # wait for fix: https://github.com/AdnanHodzic/auto-cpufreq/issues/906
       settings = {
         charger = {
           governor = "performance";
           energy_performance_preference = "performance";
           turbo = "auto";
+          platform_profile = "performance";
+          scaling_min_freq = 800000;
+          scaling_max_freq = 3600000;
         };
         battery = {
           governor = "powersave";
           energy_performance_preference = "power";
+          platform_profile = "low-power";
           turbo = "never";
+          scaling_min_freq = 400000;
+          scaling_max_freq = 1000000;
         };
       };
     };
diff --git a/modules/hardware/thinkpad.nix b/modules/hardware/thinkpad.nix
index 63bbcab..d79881c 100644
--- a/modules/hardware/thinkpad.nix
+++ b/modules/hardware/thinkpad.nix
@@ -15,6 +15,9 @@
     kernel.sysctl."vm.laptop_mode" = 5;
     initrd.availableKernelModules = [ "thinkpad_acpi" ];
   };
-  hardware.bluetooth.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = false;
+  };
   services.hardware.bolt.enable = true;
 }