diff --git a/scripts/install_build_deps.sh b/scripts/install_build_deps.sh
index 62a492e12..267c268af 100755
--- a/scripts/install_build_deps.sh
+++ b/scripts/install_build_deps.sh
@@ -16,9 +16,15 @@ fi
 set -e
 set -x
 
+### Temporary HACK
+
+## Should be in sync with `opam-pin.sh` and `opam-unpin.sh`
 opam pin --yes add --no-action --dev-repo sodium
 opam pin --yes add --no-action --dev-repo ocp-ocamlres
 opam pin --yes add --no-action --dev-repo ocplib-json-typed
+
+### End of temporary HACK
+
 ## Force opam to take account of the new `tezos-deps.opam`
 opam pin --yes remove tezos-deps
 opam pin --yes add --no-action tezos-deps $src_dir
diff --git a/scripts/opam-pin.sh b/scripts/opam-pin.sh
index 095707440..315a5e1e0 100755
--- a/scripts/opam-pin.sh
+++ b/scripts/opam-pin.sh
@@ -19,3 +19,14 @@ for opam in $opams; do
 done
 
 packages=$(opam list --short --all --sort $packages)
+
+### Temporary HACK
+
+## Should be in sync with `install-build-deps.sh` and `opam-unpin.sh`
+opam pin add --no-action --dev-repo sodium
+opam pin add --no-action --dev-repo ocp-ocamlres
+opam pin add --no-action --dev-repo ocplib-json-typed
+
+opam remove tezos-deps || true
+
+### End of temporary HACK
diff --git a/scripts/opam-unpin.sh b/scripts/opam-unpin.sh
index 5cf38ae5d..a6ef9db3f 100755
--- a/scripts/opam-unpin.sh
+++ b/scripts/opam-unpin.sh
@@ -9,3 +9,14 @@ src_dir="$(dirname "$script_dir")"
 
 opam pin remove $packages
 
+### Temporary HACK
+
+## Should be in sync with `install-build-deps.sh` and `opam-pin.sh`
+opam pin remove --no-action sodium
+opam pin remove --no-action ocp-ocamlres
+opam pin remove --no-action ocplib-json-typed
+
+## Unpin package we used to pin...
+opam pin remove --no-action ocplib-resto
+
+### End of temporary HACK