diff --git a/.github/workflows/release_binary.yml b/.github/workflows/release_binary.yml
index f9a85dd6df..6a68a4b857 100644
--- a/.github/workflows/release_binary.yml
+++ b/.github/workflows/release_binary.yml
@@ -24,14 +24,14 @@ jobs:
     needs: build-webapp
     strategy:
       matrix:
-        # Note: macos-13 is intel-based, macos-latest is M1-based
         # See https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
-        os: [ubuntu-22.04, macos-13, macos-latest, windows-latest]
+        # Note: macos-15-intel is x86_64, available until Aug 2027. See https://github.com/actions/runner-images/issues/13045
+        os: [ubuntu-22.04, macos-15-intel, macos-latest, windows-latest]
         include:
           - os: ubuntu-22.04
             artifact_name: linux-artifact
             artifact_filename: stump_server
-          - os: macos-13
+          - os: macos-15-intel
             artifact_name: macos-intel-artifact
             artifact_filename: stump_server
           - os: macos-latest
diff --git a/Cargo.lock b/Cargo.lock
index 9b0b9e6db9..c2cc2ca44b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3121,6 +3121,7 @@ dependencies = [
  "tokio",
  "tower-sessions",
  "tracing",
+ "windows 0.58.0",
  "zip 1.1.3",
 ]
 
@@ -8394,7 +8395,6 @@ dependencies = [
  "tracing",
  "urlencoding",
  "uuid 1.18.1",
- "windows 0.58.0",
  "zip 1.1.3",
 ]
 
diff --git a/apps/server/Cargo.toml b/apps/server/Cargo.toml
index 41eca8819f..b8b931f5e3 100644
--- a/apps/server/Cargo.toml
+++ b/apps/server/Cargo.toml
@@ -77,6 +77,3 @@ openssl = { version = "0.10.66", features = ["vendored"] }
 
 [target.x86_64-unknown-linux-musl.dependencies]
 openssl = { version = "0.10.66", features = ["vendored"] }
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.58.0", features = ["Win32_Storage_FileSystem"] }
diff --git a/crates/graphql/Cargo.toml b/crates/graphql/Cargo.toml
index 5ab6dc2ed5..9e201c7fde 100644
--- a/crates/graphql/Cargo.toml
+++ b/crates/graphql/Cargo.toml
@@ -38,6 +38,9 @@ tracing.workspace = true
 zip.workspace = true
 bcrypt.workspace = true
 
+[target.'cfg(target_os = "windows")'.dependencies]
+windows = { version = "0.58.0", features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
+
 [dev-dependencies]
 maplit.workspace = true
 tempfile.workspace = true
diff --git a/crates/graphql/src/query/filesystem.rs b/crates/graphql/src/query/filesystem.rs
index a0cf360357..fcda295da9 100644
--- a/crates/graphql/src/query/filesystem.rs
+++ b/crates/graphql/src/query/filesystem.rs
@@ -165,9 +165,7 @@ mod windows_fs {
 
 		// We check for a failed read
 		if len == 0 {
-			return Err(APIError::InternalServerError(
-				"Failed to read Win32 list of logical drives".to_string(),
-			));
+			return Err("Failed to read Win32 list of logical drives".into());
 		}
 
 		// We can iterate over the buffer to fetch a list of drives with their info