diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7c67a21..9d1999e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,6 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        # when updating channels, also update .mergify.yml
         channel: [ nixos-unstable, nixos-24.05 ]
     steps:
     - uses: actions/checkout@v4
diff --git a/.mergify.yml b/.mergify.yml
index 45ffb1e..dc3bf77 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,7 +1,8 @@
 queue_rules:
   - name: default
     merge_conditions:
-      - check-success=tests
+      - check-success=tests (nixos-24.05)
+      - check-success=tests (nixos-unstable)
 defaults:
   actions:
     queue:
diff --git a/microsoft/surface/surface-pro-intel/default.nix b/microsoft/surface/surface-pro-intel/default.nix
index a1ab89c..20ebbba 100644
--- a/microsoft/surface/surface-pro-intel/default.nix
+++ b/microsoft/surface/surface-pro-intel/default.nix
@@ -15,4 +15,9 @@
 
   services.iptsd.enable = lib.mkDefault true;
   environment.systemPackages = [ pkgs.surface-control ];
+  
+  services.thermald = lib.mkDefault {
+    enable = true;
+    configFile = ./thermal-conf.xml;
+  };
 }
diff --git a/microsoft/surface/surface-pro-intel/thermal-conf.xml b/microsoft/surface/surface-pro-intel/thermal-conf.xml
new file mode 100644
index 0000000..459ef81
--- /dev/null
+++ b/microsoft/surface/surface-pro-intel/thermal-conf.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<ThermalConfiguration>
+<Platform>
+	<Name>Surface Pro Intel Thermal Workaround</Name>
+	<ProductName>*</ProductName>
+	<Preference>QUIET</Preference>
+	<ThermalZones>
+		<ThermalZone>
+			<Type>cpu</Type>
+			<TripPoints>
+				<TripPoint>
+					<SensorType>x86_pkg_temp</SensorType>
+					<Temperature>65000</Temperature>
+					<type>passive</type>
+					<ControlType>SEQUENTIAL</ControlType>
+					<CoolingDevice>
+						<index>1</index>
+						<type>rapl_controller</type>
+						<influence>100</influence>
+						<SamplingPeriod>10</SamplingPeriod>
+					</CoolingDevice>
+				</TripPoint>
+			</TripPoints>
+		</ThermalZone>
+	</ThermalZones>
+</Platform>
+</ThermalConfiguration>