diff --git a/SysManager/SysManager/Services/MemoryTestService.cs b/SysManager/SysManager/Services/MemoryTestService.cs
index 9c12302..aee8a6b 100644
--- a/SysManager/SysManager/Services/MemoryTestService.cs
+++ b/SysManager/SysManager/Services/MemoryTestService.cs
@@ -81,7 +81,7 @@ public async Task<MemoryErrorSummary> CheckErrorLogsAsync(CancellationToken ct =
             catch (UnauthorizedAccessException) { /* EventLog access denied */ }
 
             return new MemoryErrorSummary(wheaCount, diagCount, lastError);
-        }, ct);
+        }, ct).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -142,6 +142,6 @@ public async Task<IReadOnlyList<MemoryModuleHealth>> GetModulesAsync()
             catch (FormatException) { /* malformed WMI value */ }
             catch (OverflowException) { /* WMI value out of range */ }
             return list;
-        });
+        }).ConfigureAwait(false);
     }
 }
diff --git a/SysManager/SysManager/Services/SystemReportService.cs b/SysManager/SysManager/Services/SystemReportService.cs
index c72e50c..ce09304 100644
--- a/SysManager/SysManager/Services/SystemReportService.cs
+++ b/SysManager/SysManager/Services/SystemReportService.cs
@@ -33,7 +33,7 @@ public async Task<string> GenerateReportAsync(CancellationToken ct = default)
         var snapshot = await _sysInfo.CaptureAsync(ct).ConfigureAwait(false);
         var diskHealth = await _diskHealth.CollectAsync(ct).ConfigureAwait(false);
 
-        return await Task.Run(() => BuildReport(snapshot, diskHealth), ct);
+        return await Task.Run(() => BuildReport(snapshot, diskHealth), ct).ConfigureAwait(false);
     }
 
     private static string BuildReport(SystemSnapshot snapshot, IReadOnlyList<DiskHealthReport> diskHealth)
diff --git a/SysManager/SysManager/Services/TemperatureService.cs b/SysManager/SysManager/Services/TemperatureService.cs
index cad77e7..996801a 100644
--- a/SysManager/SysManager/Services/TemperatureService.cs
+++ b/SysManager/SysManager/Services/TemperatureService.cs
@@ -35,15 +35,15 @@ public async Task<List<TemperatureReading>> ReadAllAsync()
 
         if (isAdmin)
         {
-            await Task.Run(() => ReadViaLibreHardwareMonitor(readings));
+            await Task.Run(() => ReadViaLibreHardwareMonitor(readings)).ConfigureAwait(false);
 
             // LHM storage often has bad names — enrich from DiskHealthService
-            await EnrichStorageNamesAsync(readings);
+            await EnrichStorageNamesAsync(readings).ConfigureAwait(false);
         }
         else
         {
-            await Task.Run(() => ReadNvidiaGpuTemperatures(readings));
-            await ReadDiskTemperaturesAsync(readings);
+            await Task.Run(() => ReadNvidiaGpuTemperatures(readings)).ConfigureAwait(false);
+            await ReadDiskTemperaturesAsync(readings).ConfigureAwait(false);
 
             readings.Add(new TemperatureReading("CPU", "CPU Package", null, RequiresAdmin: true));
         }