diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 1af7652..6e38501 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -21,7 +21,8 @@
             {
                "if": "matrix.host.platform_name == 'windows_amd64'",
                "name": "Install WinFSP",
-               "run": "choco install winfsp"
+               "run": "winget install --id=WinFsp.WinFsp --source=winget",
+               "shell": "powershell"
             },
             {
                "if": "matrix.host.platform_name == 'windows_amd64'",
@@ -151,7 +152,7 @@
                   {
                      "bazel_os": "windows",
                      "cross_compile": false,
-                     "os": "windows-2022",
+                     "os": "windows-latest",
                      "platform_name": "windows_amd64",
                      "upload": false
                   }
diff --git a/.github/workflows/pull-requests.yaml b/.github/workflows/pull-requests.yaml
index 678f9df..acd4a5e 100644
--- a/.github/workflows/pull-requests.yaml
+++ b/.github/workflows/pull-requests.yaml
@@ -21,7 +21,8 @@
             {
                "if": "matrix.host.platform_name == 'windows_amd64'",
                "name": "Install WinFSP",
-               "run": "choco install winfsp"
+               "run": "winget install --id=WinFsp.WinFsp --source=winget",
+               "shell": "powershell"
             },
             {
                "if": "matrix.host.platform_name == 'windows_amd64'",
@@ -36,7 +37,18 @@
             {
                "if": "matrix.host.platform_name == 'windows_amd64'",
                "name": "Override .bazelrc",
-               "run": "echo \"startup --output_base=D:/bazel_output\" >> .bazelrc"
+               "run": "echo \"startup --output_base=D:/bazel_output\" >> .bazelrc",
+               "continue-on-error": true,
+            },
+            {
+               "name": "Test bare deployment (Unix)",
+               "run": "tools/test-deployment-bare.sh",
+               "shell": "bash"
+            },
+            {
+               "if": "matrix.host.platform_name == 'windows_amd64'",
+               "name": "Test bare deployment (Windows)",
+               "run": "tools/run-with-console.ps1 -Command 'bash.exe -c ./tools/test-deployment-bare.sh'"
             },
             {
                "if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_amd64'",
@@ -109,11 +121,6 @@
                "run": "tools/test-deployment-bare.sh",
                "shell": "bash"
             },
-            {
-               "if": "matrix.host.platform_name == 'windows_amd64'",
-               "name": "Test bare deployment (Windows)",
-               "run": "tools/run-with-console.ps1 -Command 'bash.exe -c ./tools/test-deployment-bare.sh'"
-            },
             {
                "if": "matrix.host.platform_name == 'linux_amd64'",
                "name": "Test docker-compose deployment",
@@ -128,17 +135,10 @@
          "strategy": {
             "matrix": {
                "host": [
-                  {
-                     "bazel_os": "linux",
-                     "cross_compile": true,
-                     "os": "ubuntu-latest",
-                     "platform_name": "linux_amd64",
-                     "upload": true
-                  },
                   {
                      "bazel_os": "windows",
                      "cross_compile": false,
-                     "os": "windows-2022",
+                     "os": "windows-latest",
                      "platform_name": "windows_amd64",
                      "upload": false
                   }
diff --git a/MODULE.bazel b/MODULE.bazel
index 53d1329..d14a80d 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -93,10 +93,7 @@ git_override(
 git_override(
     module_name = "com_github_buildbarn_bb_storage",
     commit = "d0c6f2633bb9e199fc7285687cdd677660dc688c",
-    patches = [
-        "//:patches/com_github_buildbarn_bb_storage/github-workflow-windows-2022.patch",
-        "//:patches/com_github_buildbarn_bb_storage/workflows-template-bazel-8.diff",
-    ],
+    patches = ["//:patches/com_github_buildbarn_bb_storage/workflows-template-bazel-8.diff"],
     remote = "https://github.com/buildbarn/bb-storage.git",
 )
 
diff --git a/patches/com_github_buildbarn_bb_storage/github-workflow-windows-2022.patch b/patches/com_github_buildbarn_bb_storage/github-workflow-windows-2022.patch
deleted file mode 100644
index 770fc86..0000000
--- a/patches/com_github_buildbarn_bb_storage/github-workflow-windows-2022.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git tools/github_workflows/workflows_template.libsonnet tools/github_workflows/workflows_template.libsonnet
-index 73bc06c..d52c884 100644
---- tools/github_workflows/workflows_template.libsonnet
-+++ tools/github_workflows/workflows_template.libsonnet
-@@ -50,7 +50,7 @@
-             {
-               bazel_os: 'windows',
-               cross_compile: false,
--              os: 'windows-latest',
-+              os: 'windows-2022',
-               platform_name: 'windows_amd64',
-               upload: false,
-             },
diff --git a/tools/github_workflows/github_workflows.jsonnet b/tools/github_workflows/github_workflows.jsonnet
index 22b977c..40a9b60 100644
--- a/tools/github_workflows/github_workflows.jsonnet
+++ b/tools/github_workflows/github_workflows.jsonnet
@@ -20,7 +20,8 @@ workflows_template.getWorkflows(
     },
     {
       name: 'Install WinFSP',
-      run: 'choco install winfsp',
+      shell: 'powershell',
+      run: 'winget install --id=WinFsp.WinFsp --source=winget',
       'if': "matrix.host.platform_name == 'windows_amd64'",
     },
     {
diff --git a/tools/update-container-image-versions.sh b/tools/update-container-image-versions.sh
index e21157e..5bc2079 100755
--- a/tools/update-container-image-versions.sh
+++ b/tools/update-container-image-versions.sh
@@ -74,8 +74,7 @@ check_module_overrides() {
     commit_hash=$(get_full_git_commit_hash "$repo")
     remote=https://github.com/buildbarn/"$repo".git
 
-    # As long as we use patches, -B3 is not enough.
-    override_stanza="$(grep -B5 -A1 "$remote" MODULE.bazel)"
+    override_stanza="$(grep -B3 -A1 "$remote" MODULE.bazel)"
     echo "$override_stanza" | grep -q "$commit_hash" || {
         echo >&2 "Error: Did not find the expected module version override for $repo."
         echo "Found: $override_stanza"