diff --git a/.gitlab/ci/templates.yml b/.gitlab/ci/templates.yml
index 05f723ff71a8f21c9476e8a06acb0a7e20aec90f..ee16b5f3c2de03add7762d42b754bbf96e72a829 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: d97ef23a0dadf1a8133e76d3e4cc175dfc9ee8ec
+  build_deps_image_version: 05199a11ba5c3eef247c4b7bbf69b19c7d78a600
   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 99bc927d54430eadce7e2df4b9d2e581c3d03648..4eface506f5ceacccd8c7a03cdf1ea9ab6d1d4d0 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=efe0e53484b1a5a3bde1d762dca7277d0f326ba2
+export full_opam_repository_tag=87ee6c685f0d3e809d1c09a26038eb3b07cfebed
 
 ## 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=d97ef23a0dadf1a8133e76d3e4cc175dfc9ee8ec
+export opam_repository_tag=05199a11ba5c3eef247c4b7bbf69b19c7d78a600
 export opam_repository_git=$opam_repository_url.git
 export opam_repository=$opam_repository_git\#$opam_repository_tag