diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index de554c29f..8fb0e4730 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -15,18 +15,11 @@ jobs:
     runs-on: ubuntu-24.04
     permissions:
       packages: write
+    env:
+      TAG: ${{ github.ref_name }}
     steps:
     - uses: actions/checkout@v4
 
-    - name: Build `base` Image
-      run: TAG=${{ github.ref_name }} VARIANT=base make -C scripts/docker
-
-    - name: Build `build` Image
-      run: TAG=${{ github.ref_name }} VARIANT=build make -C scripts/docker
-
-    - name: Build `formosa` Image
-      run: TAG=${{ github.ref_name }} VARIANT=formosa make -C scripts/docker
-
     - name: Log in to the Container registry
       uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
       with:
@@ -34,8 +27,27 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Push All Images
+    - name: Build and push `base` Image
+      env:
+        VARIANT: base
+      run: |
+        make -C scripts/docker build publish
+
+    - name: Build and push `build` Image
+      env:
+        VARIANT: build
+      run: |
+        make -C scripts/docker build publish
+
+    - name: Build and push `formosa` Image
+      env:
+        VARIANT: formosa
+      run: |
+        make -C scripts/docker build publish
+
+    - name: Build and push `test` Image
+      if: github.ref_name != 'main'
+      env:
+        VARIANT: test
       run: |
-        TAG=${{ github.ref_name }} VARIANT=base make -C scripts/docker publish
-        TAG=${{ github.ref_name }} VARIANT=build make -C scripts/docker publish
-        TAG=${{ github.ref_name }} VARIANT=formosa make -C scripts/docker publish
+        make -C scripts/docker build publish
diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 040023702..1ca81eb28 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -3,6 +3,7 @@
 # --------------------------------------------------------------------
 VARIANT ?= build
 TAG     ?= main
+BARGS   += --build-arg EC_VERSION=$(TAG)
 
 # --------------------------------------------------------------------
 .PHONY: default build publish
@@ -12,6 +13,7 @@ default: build
 build:
 	docker build -f Dockerfile.$(VARIANT) \
 	  --platform linux/amd64 \
+	  $(BARGS) \
 	  -t ghcr.io/easycrypt/ec-$(VARIANT)-box:$(TAG) \
 	  .