diff --git a/scripts/docker/Dockerfile.build b/scripts/docker/Dockerfile
similarity index 77%
rename from scripts/docker/Dockerfile.build
rename to scripts/docker/Dockerfile
index fd9de4aabb..016743f99c 100644
--- a/scripts/docker/Dockerfile.build
+++ b/scripts/docker/Dockerfile
@@ -1,6 +1,43 @@
-# syntax = devthefuture/dockerfile-x
+ARG BASE_LAYER=base
+ARG BASE_BUILD_LAYER=base-build
+ARG BUILD_LAYER=build
 
-FROM ./Dockerfile.base as base-build
+# Base environment
+FROM debian:stable AS base
+
+LABEL org.opencontainers.image.maintainer="Pierre-Yves Strub <pierre-yves@strub.nu>"
+
+ARG user=charlie
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN \
+	apt-get -q -y update && \
+	apt-get -q -y upgrade && \
+	apt-get -q -y install sudo && \
+	apt-get -q -y clean
+
+COPY --chown=root:root --chmod=0400 docker-parts/sudoers /etc/sudoers.d/
+
+RUN \
+	useradd -ms /bin/bash -d /home/$user -g root -G sudo -u 1001 $user
+
+RUN \
+	apt-get -q -y install opam && \
+	apt-get -q -y clean
+
+USER    $user
+WORKDIR /home/$user
+
+ENV OPAMYES=true OPAMVERBOSE=0 OPAMJOBS=4
+
+ARG OCAML_VERSION=4.14.2
+
+RUN \
+	opam init --disable-sandboxing --compiler=ocaml-base-compiler.${OCAML_VERSION}
+
+# Build environment
+FROM ${BASE_LAYER} AS base-build
 
 RUN \
 	sudo apt-get -q -y install wget curl python3 python3-pip python3-yaml && \
@@ -13,6 +50,8 @@ RUN \
 
 ENV PATH="/home/charlie/bin:$PATH"
 
+FROM ${BASE_BUILD_LAYER} AS build
+
 RUN \
 	version=2.6.3 && \
   wget -O alt-ergo https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-v${version}-x86_64-linux-musl && \
@@ -25,8 +64,6 @@ RUN \
   sudo install -m 0755 alt-ergo /usr/local/bin/alt-ergo-${version} && \
   rm -f alt-ergo
 
-FROM base-build as main-linux-amd64
-
 RUN \
 	version=1.8 && \
 	wget -O cvc4 https://github.com/CVC4/CVC4-archived/releases/download/${version}/cvc4-${version}-x86_64-linux-opt && \
@@ -102,7 +139,16 @@ RUN \
 	sudo install -m 0755 z3 /usr/local/bin/z3-${version} && \
 	rm -f z3 z3.zip
 
-FROM main-linux-amd64
-
 RUN \
 	opam exec -- why3 config detect
+
+# Test environment
+FROM ${BUILD_LAYER} AS test
+
+ARG EC_VERSION=main
+ARG EC_REPO=https://github.com/EasyCrypt/easycrypt.git#${EC_VERSION}
+
+RUN \
+	opam pin add -n easycrypt ${EC_REPO} && \
+	opam install -v easycrypt && \
+	rm -rf .opam/packages.dev/*
diff --git a/scripts/docker/Dockerfile.base b/scripts/docker/Dockerfile.base
deleted file mode 100644
index 1a43903b01..0000000000
--- a/scripts/docker/Dockerfile.base
+++ /dev/null
@@ -1,34 +0,0 @@
-# syntax = devthefuture/dockerfile-x
-
-FROM debian:stable
-
-LABEL org.opencontainers.image.maintainer="Pierre-Yves Strub <pierre-yves@strub.nu>"
-
-ARG user=charlie
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN \
-	apt-get -q -y update && \
-	apt-get -q -y upgrade && \
-	apt-get -q -y install sudo && \
-	apt-get -q -y clean
-
-COPY --chown=root:root --chmod=0400 docker-parts/sudoers /etc/sudoers.d/
-
-RUN \
-	useradd -ms /bin/bash -d /home/$user -g root -G sudo -u 1001 $user
-
-RUN \
-	apt-get -q -y install opam && \
-	apt-get -q -y clean
-
-USER    $user
-WORKDIR /home/$user
-
-ENV OPAMYES=true OPAMVERBOSE=0 OPAMJOBS=4
-
-ARG OCAML_VERSION=4.14.2
-
-RUN \
-	opam init --disable-sandboxing --compiler=ocaml-base-compiler.${OCAML_VERSION}
diff --git a/scripts/docker/Dockerfile.formosa b/scripts/docker/Dockerfile.formosa
deleted file mode 100644
index 8ff3767340..0000000000
--- a/scripts/docker/Dockerfile.formosa
+++ /dev/null
@@ -1,7 +0,0 @@
-# syntax = devthefuture/dockerfile-x
-
-FROM ./Dockerfile.build as build-formosa
-
-RUN \
-	opam install --deps-only --confirm-level=unsafe-yes jasmin && \
-	opam clean
diff --git a/scripts/docker/Dockerfile.test b/scripts/docker/Dockerfile.test
deleted file mode 100644
index 2e9522d3aa..0000000000
--- a/scripts/docker/Dockerfile.test
+++ /dev/null
@@ -1,10 +0,0 @@
-# syntax = devthefuture/dockerfile-x
-
-FROM ./Dockerfile.build
-
-ARG EC_VERSION=main
-
-RUN \
-	opam pin add -n easycrypt https://github.com/EasyCrypt/easycrypt.git#${EC_VERSION} && \
-	opam install -v easycrypt && \
-	rm -rf .opam/packages.dev/*
diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 1ca81eb283..383c39702c 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -3,7 +3,8 @@
 # --------------------------------------------------------------------
 VARIANT ?= build
 TAG     ?= main
-BARGS   += --build-arg EC_VERSION=$(TAG)
+VERSION ?= $(TAG)
+BARGS   += --build-arg EC_VERSION=$(VERSION)
 
 # --------------------------------------------------------------------
 .PHONY: default build publish
@@ -11,7 +12,7 @@ BARGS   += --build-arg EC_VERSION=$(TAG)
 default: build
 
 build:
-	docker build -f Dockerfile.$(VARIANT) \
+	docker build --target $(VARIANT) \
 	  --platform linux/amd64 \
 	  $(BARGS) \
 	  -t ghcr.io/easycrypt/ec-$(VARIANT)-box:$(TAG) \