diff --git a/.gitlab/ci/templates.yml b/.gitlab/ci/templates.yml
index 1d8a30dbf2a9c035df481d12f2d15baed555ba5b..7d175e6cfa69fb4c08488f25f71689f81aaf7923 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: a999d04a567ffcb1d9f018ed12f1cca91948663c
+  build_deps_image_version: a8bf0e7d55f866f4aebb28a2fc65aefff727d847
   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 d3fd7ab73d0a13b69d5e73baf67cfa1e82e149af..10653fc5d157721ac809c7563bcdade9dde37653 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=231273e96a862099add322413688f896afb02464
+export full_opam_repository_tag=b52ec3157016ea7c3c021bf6a099fc3adbe6ce9a
 
 ## 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=a999d04a567ffcb1d9f018ed12f1cca91948663c
+export opam_repository_tag=a8bf0e7d55f866f4aebb28a2fc65aefff727d847
 export opam_repository_git=$opam_repository_url.git
 export opam_repository=$opam_repository_git\#$opam_repository_tag