diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 803d3c3e0..927de5ed9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -68,7 +68,7 @@ jobs:
       - name: Build and test in release mode (windows)
         if: matrix.os == 'windows-latest'
         run: |
-          opam exec -- dune runtest -p merlin-lib,dot-merlin-reader,merlin,ocaml-index
+          opam exec -- dune runtest -p merlin-lib,dot-merlin-reader,ocaml-index,merlin
 
       - name: Build and test in release mode (macos/linux)
         if: matrix.os != 'windows-latest'
diff --git a/ocaml-index.opam b/ocaml-index.opam
index 511bd5a49..f0615f66c 100644
--- a/ocaml-index.opam
+++ b/ocaml-index.opam
@@ -6,8 +6,8 @@ description:
 maintainer: ["ulysse@tarides.com"]
 authors: ["ulysse@tarides.com"]
 license: "MIT"
-homepage: "https://github.com/voodoos/ocaml-index"
-bug-reports: "https://github.com/voodoos/ocaml-index/issues"
+homepage: "https://github.com/ocaml/merlin/ocaml-index"
+bug-reports: "https://github.com/ocaml/merlin/issues"
 depends: [
   "dune" {>= "3.0.0"}
   "ocaml" {>= "5.2"}
@@ -30,7 +30,4 @@ build: [
   ]
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
-dev-repo: "git+https://github.com/voodoos/ocaml-index.git"
-pin-depends: [
-  ["merlin-lib.5.1-502"  "git+https://github.com/ocaml/merlin"]
-]
+dev-repo: "git+https://github.com/ocaml/merlin.git"