diff --git a/prepare-opam.sh b/prepare-opam.sh
index 75b0808142b2965bba4d8cfe1bef5449adb5a77a..e65223189a14c5bff90859b759226a9724c8d454 100644
--- a/prepare-opam.sh
+++ b/prepare-opam.sh
@@ -70,7 +70,7 @@ echo
 if [[ -z "$FRESH_OPAM" ]]; then # skip if this is a fresh opam root
     # Upgrade cached things
     echo_color "$BOLDGREEN" "[prepare-opam] Upgrading packages"
-    opam upgrade -y
+    opam upgrade -y --fixup && opam upgrade -y
     echo
 fi