diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9629b2a46a4f..bebcd1d73fc8 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -110,6 +110,7 @@ jobs:
           $pkgs = $env:ALL_CHANGED_PACKAGES | ConvertFrom-Json
           $failed = $false
           opam update
+          opam pin -y "https://github.com/dra27/ocamlfind.git#win-fixes"
           Foreach ($pkg in $pkgs) {
             Write-Host "::group::Testing `e[1;34m$pkg`e[0m"
             opam install --color=always --confirm-level=unsafe-yes "$pkg"
diff --git a/packages/topkg/topkg.1.1.0/opam b/packages/topkg/topkg.1.1.0/opam
index 42c16f6cf553..843c5b7ae879 100644
--- a/packages/topkg/topkg.1.1.0/opam
+++ b/packages/topkg/topkg.1.1.0/opam
@@ -47,4 +47,3 @@ url {
   checksum:
     "sha512=34d22ae5b6bd166dd4a601a7d12d89c336684b3c56d7c7f481b40837eab263616cc3a6e6f63602f3d4a7d53c911967bf261de6c1ac205341b98a9838e5ea7aeb"
 }
-x-maintenance-intent: ["(latest)"]
\ No newline at end of file