diff --git a/.gitlab/ci/templates.yml b/.gitlab/ci/templates.yml
index 1e14b3fdbe53c02568f94e512c0498d8b53252ac..05f723ff71a8f21c9476e8a06acb0a7e20aec90f 100644
--- a/.gitlab/ci/templates.yml
+++ b/.gitlab/ci/templates.yml
@@ -2,7 +2,7 @@ variables:
   # /!\ CI_REGISTRY is overriden to use a private Docker registry mirror in AWS ECR
   # in GitLab namespaces `nomadic-labs` and `tezos`
   ## This value MUST be the same as `opam_repository_tag` in `scripts/version.sh`
-  build_deps_image_version: df8d0aa9d9a08a49cf97f27e58662c10fb3f70f2
+  build_deps_image_version: d97ef23a0dadf1a8133e76d3e4cc175dfc9ee8ec
   build_deps_image_name: "${CI_REGISTRY}/tezos/opam-repository"
   GIT_STRATEGY: fetch
   GIT_DEPTH: "1"
diff --git a/scripts/version.sh b/scripts/version.sh
index 57350db7585a6b08f95e583b018f26d9484813cf..99bc927d54430eadce7e2df4b9d2e581c3d03648 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -20,12 +20,12 @@ export recommended_node_version=14.12.0
 
 ## full_opam_repository is a commit hash of the public OPAM repository, i.e.
 ## https://github.com/ocaml/opam-repository
-export full_opam_repository_tag=5b15e5ee8adbd7522032018e1694f547555ba2b6
+export full_opam_repository_tag=efe0e53484b1a5a3bde1d762dca7277d0f326ba2
 
 ## opam_repository is an additional, tezos-specific opam repository.
 ## This value MUST be the same as `build_deps_image_version` in `.gitlab/ci/templates.ym
 export opam_repository_url=https://gitlab.com/tezos/opam-repository
-export opam_repository_tag=df8d0aa9d9a08a49cf97f27e58662c10fb3f70f2
+export opam_repository_tag=d97ef23a0dadf1a8133e76d3e4cc175dfc9ee8ec
 export opam_repository_git=$opam_repository_url.git
 export opam_repository=$opam_repository_git\#$opam_repository_tag
 
diff --git a/src/lib_context/disk/context.ml b/src/lib_context/disk/context.ml
index ce1e7c196eb74e2905a1a5e6491b213b37a0bc73..223fc413b26752b5205344defa8a69ca89dbb22a 100644
--- a/src/lib_context/disk/context.ml
+++ b/src/lib_context/disk/context.ml
@@ -783,7 +783,9 @@ module Make (Encoding : module type of Tezos_context_encoding.Context) = struct
     in
     {path = root; repo; patch_context; readonly}
 
-  let close index = Store.Repo.close index.repo
+  let close index =
+    let _interrupted_gc = Store.Gc.cancel index.repo in
+    Store.Repo.close index.repo
 
   let get_branch chain_id = Format.asprintf "%a" Chain_id.pp chain_id
 
@@ -942,7 +944,8 @@ module Make (Encoding : module type of Tezos_context_encoding.Context) = struct
         (* All commit objects in the context are indexed, so it's safe to build a
            hash-only key referencing them. *)
         List.map
-          (fun h -> Hash.of_context_hash h |> Irmin_pack.Pack_key.v_indexed)
+          (fun h ->
+            Hash.of_context_hash h |> Irmin_pack_unix.Pack_key.v_indexed)
           parents
       in
       let+ c = Store.Commit.v ctxt.index.repo ~info ~parents ctxt.tree in