diff --git a/packages/cca/cca.0.2/opam b/packages/cca/cca.0.2/opam
index 7e9e5bee7c4..ce7e86d003a 100644
--- a/packages/cca/cca.0.2/opam
+++ b/packages/cca/cca.0.2/opam
@@ -16,7 +16,7 @@ depends: [
   "camlzip"
   "cryptokit"
   "csv"
-  "git-unix" {>= "3.3.0"}
+  "git-unix" {>= "3.3.0" & < "3.7.0"}
   "menhir"
   "ocamlnet"
   "pxp"
diff --git a/packages/cca/cca.0.4/opam b/packages/cca/cca.0.4/opam
index af64bbadf44..f13802c3e0d 100644
--- a/packages/cca/cca.0.4/opam
+++ b/packages/cca/cca.0.4/opam
@@ -16,7 +16,7 @@ depends: [
   "camlzip"
   "cryptokit"
   "csv"
-  "git-unix" {>= "3.3.0"}
+  "git-unix" {>= "3.3.0" & < "3.7.0"}
   "menhir" {>= "20170418"}
   "ocamlnet"
   "pxp"
diff --git a/packages/git-mirage/git-mirage.3.7.0/opam b/packages/git-mirage/git-mirage.3.7.0/opam
new file mode 100644
index 00000000000..4e80674d077
--- /dev/null
+++ b/packages/git-mirage/git-mirage.3.7.0/opam
@@ -0,0 +1,61 @@
+opam-version: "2.0"
+synopsis: "A package to use ocaml-git with MirageOS backend"
+maintainer: ["thomas@gazagnaire.org" "romain.calascibetta@gmail.com"]
+authors: "Thomas Gazagnaire"
+license: "ISC"
+homepage: "https://github.com/mirage/ocaml-git"
+doc: "https://mirage.github.io/ocaml-git/"
+bug-reports: "https://github.com/mirage/ocaml-git/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.8.0"}
+  "mimic"
+  "git" {= version}
+  "git-paf" {= version}
+  "awa" {>= "0.0.5"}
+  "awa-mirage" {>= "0.0.5"}
+  "dns" {>= "6.1.3"}
+  "dns-client" {>= "6.1.3"}
+  "tls"
+  "tls-mirage"
+  "uri"
+  "hex"
+  "happy-eyeballs-mirage" {>= "0.1.2"}
+  "happy-eyeballs" {>= "0.1.2"}
+  "ca-certs-nss"
+  "mirage-crypto"
+  "ptime"
+  "x509"
+  "cstruct"
+  "tcpip" {>= "7.0.0"}
+  "domain-name" {>= "0.3.0"}
+  "fmt" {>= "0.8.9"}
+  "ipaddr" {>= "5.0.1"}
+  "lwt" {>= "5.3.0"}
+  "mirage-clock" {>= "4.0.0"}
+  "mirage-flow" {>= "2.0.1"}
+  "mirage-random" {>= "2.0.0"}
+  "mirage-time" {>= "2.0.1"}
+  "result" {>= "1.5"}
+  "rresult" {>= "0.6.0"}
+  "alcotest" {>= "1.2.3" & with-test}
+  "alcotest-lwt" {>= "1.2.3" & with-test}
+  "bigstringaf" {>= "0.7.0" & with-test}
+  "cstruct" {>= "6.0.0" & with-test}
+  "logs" {>= "0.7.0" & with-test}
+  "ke" {>= "0.4" & with-test}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs "--no-buffer"] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-git.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-git/releases/download/3.7.0/git-3.7.0.tbz"
+  checksum: [
+    "sha256=ee30231a00f0a3548d3c2e1266537afe5f2a877d2c24369ed771cb91ec47610d"
+    "sha512=e0b0d209cf35edead52916fb215ef83739f0be00501b6898a91a14503544d96718b1c248febc1abbe9bf5bd9e07eb0ea3ea5f120c32065fd32a20632b534c481"
+  ]
+}
+x-commit-hash: "45d90b8792ab8f3866751f462619c7dd7860e5d5"
diff --git a/packages/git-paf/git-paf.3.7.0/opam b/packages/git-paf/git-paf.3.7.0/opam
new file mode 100644
index 00000000000..8fd608b3b67
--- /dev/null
+++ b/packages/git-paf/git-paf.3.7.0/opam
@@ -0,0 +1,47 @@
+opam-version: "2.0"
+synopsis: "A package to use HTTP-based ocaml-git with MirageOS backend"
+maintainer: ["thomas@gazagnaire.org" "romain.calascibetta@gmail.com"]
+authors: "Thomas Gazagnaire"
+license: "ISC"
+homepage: "https://github.com/mirage/ocaml-git"
+doc: "https://mirage.github.io/ocaml-git/"
+bug-reports: "https://github.com/mirage/ocaml-git/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.8.0"}
+  "git" {= version}
+  "mimic" {>= "0.0.4"}
+  "paf" {>= "0.0.7"}
+  "ca-certs-nss"
+  "fmt"
+  "ipaddr"
+  "logs"
+  "lwt"
+  "mirage-clock"
+  "tcpip" {>= "7.0.0"}
+  "mirage-time"
+  "result"
+  "rresult"
+  "tls" {>= "0.14.0"}
+  "uri"
+  "bigarray-compat"
+  "bigstringaf"
+  "domain-name"
+  "httpaf"
+  "mirage-flow"
+  "tls-mirage"
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs "--no-buffer"] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-git.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-git/releases/download/3.7.0/git-3.7.0.tbz"
+  checksum: [
+    "sha256=ee30231a00f0a3548d3c2e1266537afe5f2a877d2c24369ed771cb91ec47610d"
+    "sha512=e0b0d209cf35edead52916fb215ef83739f0be00501b6898a91a14503544d96718b1c248febc1abbe9bf5bd9e07eb0ea3ea5f120c32065fd32a20632b534c481"
+  ]
+}
+x-commit-hash: "45d90b8792ab8f3866751f462619c7dd7860e5d5"
diff --git a/packages/git-unix/git-unix.3.3.0/opam b/packages/git-unix/git-unix.3.3.0/opam
index a6d3255b8f1..f849bdde5bc 100644
--- a/packages/git-unix/git-unix.3.3.0/opam
+++ b/packages/git-unix/git-unix.3.3.0/opam
@@ -28,7 +28,7 @@ depends: [
   "base64" {with-test & >= "3.0.0"}
   "git-cohttp-unix" {= version}
   "mirage-clock"
-  "mirage-clock-unix"
+  "mirage-clock-unix" {>= "4.0.0"}
   "astring" {>= "0.8.5"}
   "awa"
   "cmdliner" {>= "1.0.4"}
diff --git a/packages/git-unix/git-unix.3.7.0/opam b/packages/git-unix/git-unix.3.7.0/opam
new file mode 100644
index 00000000000..46060e53cb1
--- /dev/null
+++ b/packages/git-unix/git-unix.3.7.0/opam
@@ -0,0 +1,69 @@
+opam-version: "2.0"
+synopsis: "Virtual package to install and configure ocaml-git's Unix backend"
+maintainer: ["thomas@gazagnaire.org" "romain.calascibetta@gmail.com"]
+authors: "Thomas Gazagnaire"
+license: "ISC"
+homepage: "https://github.com/mirage/ocaml-git"
+doc: "https://mirage.github.io/ocaml-git/"
+bug-reports: "https://github.com/mirage/ocaml-git/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.8.0"}
+  "mmap" {>= "1.1.0"}
+  "git" {= version}
+  "git-mirage" {= version}
+  "happy-eyeballs-lwt" {>= "0.1.2"}
+  "rresult"
+  "result"
+  "bigstringaf"
+  "bigarray-compat"
+  "fmt" {>= "0.8.7"}
+  "bos"
+  "fpath"
+  "uri" {with-test}
+  "digestif" {>= "0.8.1"}
+  "logs"
+  "lwt"
+  "base-unix"
+  "alcotest" {with-test & >= "1.1.0"}
+  "alcotest-lwt" {with-test & >= "1.1.0"}
+  "base64" {with-test & >= "3.0.0"}
+  "mirage-clock" {>= "4.0.0"}
+  "mirage-clock-unix" {>= "4.0.0"}
+  "astring" {>= "0.8.5"}
+  "awa" {>= "0.0.5"}
+  "mirage-time"
+  "mirage-unix" {>= "4.0.0"}
+  "cmdliner" {>= "1.0.4"}
+  "decompress" {>= "1.4.0"}
+  "domain-name" {>= "0.3.0"}
+  "ipaddr" {>= "5.0.1"}
+  "mtime" {>= "1.2.0"}
+  "ocamlfind" {>= "1.8.1"}
+  "tcpip" {>= "7.0.0"}
+  "cstruct" {>= "6.0.0"}
+  "awa-mirage" {>= "0.0.5"}
+  "mirage-flow" {>= "2.0.1"}
+  "ke" {>= "0.4" & with-test}
+  "mirage-crypto-rng" {>= "0.8.8" & with-test}
+  "ptime"
+  "mimic"
+  "ca-certs-nss" {>= "3.60"}
+  "tls" {>= "0.14.0"}
+  "tls-mirage" {>= "0.14.0"}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs "--no-buffer"] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-git.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-git/releases/download/3.7.0/git-3.7.0.tbz"
+  checksum: [
+    "sha256=ee30231a00f0a3548d3c2e1266537afe5f2a877d2c24369ed771cb91ec47610d"
+    "sha512=e0b0d209cf35edead52916fb215ef83739f0be00501b6898a91a14503544d96718b1c248febc1abbe9bf5bd9e07eb0ea3ea5f120c32065fd32a20632b534c481"
+  ]
+}
+x-commit-hash: "45d90b8792ab8f3866751f462619c7dd7860e5d5"
+x-ci-accept-failures: [ "centos-7" "oraclelinux-7" ]
diff --git a/packages/git/git.3.7.0/opam b/packages/git/git.3.7.0/opam
new file mode 100644
index 00000000000..7e2ccc4d6c6
--- /dev/null
+++ b/packages/git/git.3.7.0/opam
@@ -0,0 +1,71 @@
+opam-version: "2.0"
+synopsis: "Git format and protocol in pure OCaml"
+description: """\
+Support for on-disk and in-memory Git stores. Can read and write all
+the Git objects: the usual blobs, trees, commits and tags but also
+the pack files, pack indexes and the index file (where the staging area
+lives).
+
+All the objects share a consistent API, and convenience functions are
+provided to manipulate the different objects."""
+maintainer: ["thomas@gazagnaire.org" "romain.calascibetta@gmail.com"]
+authors: "Thomas Gazagnaire"
+license: "ISC"
+homepage: "https://github.com/mirage/ocaml-git"
+doc: "https://mirage.github.io/ocaml-git/"
+bug-reports: "https://github.com/mirage/ocaml-git/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.8.0"}
+  "digestif" {>= "0.8.1"}
+  "rresult"
+  "base64" {>= "3.0.0"}
+  "result"
+  "bigstringaf"
+  "bigarray-compat"
+  "optint"
+  "decompress" {>= "1.4.0"}
+  "logs"
+  "lwt"
+  "mimic" {>= "0.0.4"}
+  "cstruct" {>= "6.0.0"}
+  "angstrom" {>= "0.14.0"}
+  "carton" {>= "0.4.3"}
+  "carton-lwt" {>= "0.4.3"}
+  "carton-git" {>= "0.4.3"}
+  "ke" {>= "0.4"}
+  "fmt" {>= "0.8.7"}
+  "checkseum" {>= "0.2.1"}
+  "ocamlgraph" {>= "1.8.8"}
+  "astring"
+  "fpath"
+  "encore" {>= "0.8"}
+  "alcotest" {with-test & >= "1.1.0"}
+  "alcotest-lwt" {with-test & >= "1.1.0"}
+  "mirage-crypto-rng" {with-test & >= "0.8.0"}
+  "cmdliner" {with-test}
+  "base-unix" {with-test}
+  "fpath"
+  "hxd" {>= "0.3.1"}
+  "mirage-flow" {>= "2.0.1"}
+  "domain-name" {>= "0.3.0"}
+  "emile" {>= "1.1"}
+  "ipaddr" {>= "5.0.1"}
+  "psq" {>= "0.2.0"}
+  "uri" {>= "4.1.0"}
+  "crowbar" {>= "0.2" & with-test}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-git.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-git/releases/download/3.7.0/git-3.7.0.tbz"
+  checksum: [
+    "sha256=ee30231a00f0a3548d3c2e1266537afe5f2a877d2c24369ed771cb91ec47610d"
+    "sha512=e0b0d209cf35edead52916fb215ef83739f0be00501b6898a91a14503544d96718b1c248febc1abbe9bf5bd9e07eb0ea3ea5f120c32065fd32a20632b534c481"
+  ]
+}
+x-commit-hash: "45d90b8792ab8f3866751f462619c7dd7860e5d5"
diff --git a/packages/irmin-mirage-git/irmin-mirage-git.2.8.0/opam b/packages/irmin-mirage-git/irmin-mirage-git.2.8.0/opam
index da64b677e4d..bdbcc5feb5b 100644
--- a/packages/irmin-mirage-git/irmin-mirage-git.2.8.0/opam
+++ b/packages/irmin-mirage-git/irmin-mirage-git.2.8.0/opam
@@ -17,9 +17,9 @@ depends: [
   "irmin-mirage" {= version}
   "irmin-git"    {= version}
   "mirage-kv"    {>= "3.0.0"}
-  "git-paf"      {>= "3.5.0"}
+  "git-paf"      {>= "3.5.0" & < "3.7.0"}
   "fmt"
-  "git"          {>= "3.5.0"}
+  "git"          {>= "3.5.0" & < "3.7.0"}
   "lwt"          {>= "5.3.0"}
   "mirage-clock"
   "uri"
diff --git a/packages/irmin-mirage-git/irmin-mirage-git.2.9.0/opam b/packages/irmin-mirage-git/irmin-mirage-git.2.9.0/opam
index 94c64b7f15e..a2cad8c0b42 100644
--- a/packages/irmin-mirage-git/irmin-mirage-git.2.9.0/opam
+++ b/packages/irmin-mirage-git/irmin-mirage-git.2.9.0/opam
@@ -17,9 +17,9 @@ depends: [
   "irmin-mirage" {= version}
   "irmin-git"    {= version}
   "mirage-kv"    {>= "3.0.0"}
-  "git-paf"      {>= "3.5.0"}
+  "git-paf"      {>= "3.5.0" & < "3.7.0"}
   "fmt"
-  "git"          {>= "3.5.0"}
+  "git"          {>= "3.5.0" & < "3.7.0"}
   "lwt"          {>= "5.3.0"}
   "mirage-clock"
   "uri"