diff --git a/docker/Makefile b/docker/Makefile
index 700c26a..90b5656 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -63,15 +63,12 @@ include docker-img-basics.mk
 
 # Shared between release
 include docker-img-stage-release-misc.mk
-# "Old" release, single Opam layer
-include docker-img-stage-release.mk
 # "New" release, multiple Opam layers, not yet ready
-# TODO enable
-# include docker-img-stage1-vendored.mk
-# include docker-img-stage2-auto.mk
-# include docker-img-stage2-auto-llvm.mk
-# include docker-img-stage3-cpp2v.mk
-# include docker-img-stage4-skylabs.mk
+include docker-img-stage1-vendored.mk
+include docker-img-stage2-auto.mk
+include docker-img-stage2-auto-llvm.mk
+include docker-img-stage3-cpp2v.mk
+include docker-img-stage4-skylabs.mk
 
 .PHONY: build
 build: $(DOCKER_BUILD_TARGETS)
diff --git a/docker/docker-img-stage-release.mk b/docker/docker-img-stage-release.mk
deleted file mode 100644
index 444a11b..0000000
--- a/docker/docker-img-stage-release.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-.PHONY: fm-$(BR_FMDEPS_VERSION)-release
-fm-$(BR_FMDEPS_VERSION)-release: fm-$(BR_FMDEPS_VERSION)-ext-deps-llvm-$(LLVM_MAIN_VERSION) prepare-fm-release
-	$(call opam-img-target,\
-	grep -E "rocq-skylabs-scaffold.dev|/fmdeps/(auto|BRiCk|vendored/(vsrocq|rocq-lsp))" | grep -E -v "rocq-skylabs-cpp-stdlib|rocq-brick-libstdcpp")
-# We exclude `rocq-skylabs-cpp-stdlib|rocq-brick-libstdcpp`: they shouldn't be
-# installed when developing the stdlib.
-# See https://github.com/SkyLabsAI/skylabs-fm/issues/134
-
-DOCKER_BUILD_TARGETS += fm-$(BR_FMDEPS_VERSION)-release
-DOCKER_PUSH_TARGETS += push-fm-$(BR_FMDEPS_VERSION)-release
-
-.PHONY: fm-release
-fm-release: fm-$(BR_FMDEPS_VERSION)-release
-	$(call tag-target,$<,$@)
-
-DOCKER_BUILD_TARGETS += fm-release
-
-ifeq ($(TAG_DEFAULTS),yes)
-DOCKER_PUSH_TARGETS += push-fm-release
-endif
diff --git a/docker/docker-img-stage3-cpp2v.mk b/docker/docker-img-stage3-cpp2v.mk
index 33fdb61..26da8b6 100644
--- a/docker/docker-img-stage3-cpp2v.mk
+++ b/docker/docker-img-stage3-cpp2v.mk
@@ -9,3 +9,13 @@ fm-$(BR_FMDEPS_VERSION)-stage3-release: fm-$(BR_FMDEPS_VERSION)-stage2-llvm-$(LL
 
 DOCKER_BUILD_TARGETS += fm-$(BR_FMDEPS_VERSION)-stage3-release
 DOCKER_PUSH_TARGETS += push-fm-$(BR_FMDEPS_VERSION)-stage3-release
+
+.PHONY: fm-release
+fm-release: fm-$(BR_FMDEPS_VERSION)-stage3-release
+	$(call tag-target,$<,$@)
+
+DOCKER_BUILD_TARGETS += fm-release
+
+ifeq ($(TAG_DEFAULTS),yes)
+DOCKER_PUSH_TARGETS += push-fm-release
+endif
diff --git a/docker/opam_build.sh b/docker/opam_build.sh
index a45ca91..e278067 100755
--- a/docker/opam_build.sh
+++ b/docker/opam_build.sh
@@ -9,7 +9,7 @@ opam pin add -y -k rsync --recursive -n --with-version dev .
 
 OPAM_PACKAGES=$(eval $2 | awk '{print $1}')
 
-opam install -y ${OPAM_PACKAGES}
+OCAMLRUNPARAM=b opam install --debug -y ${OPAM_PACKAGES}
 /tmp/files/opam-clean
 
 find $(opam var prefix) \( -path "*${ROCQ_LOG_PREFIX}*/*.v" -o -path "*${ROCQ_LOG_PREFIX}*/*.ml" \) -print0 |