diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index d21d86f214c93031654af54bd5404f1cc34aa244..f3d03814d04bcf4317ced9788f644dc45187647d 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -67,6 +67,10 @@ For local/remote usage with VS Code, please follow the instructions at
 For use with Github Codespaces, please follow the instruction at
 [Creating a codespace for a repository](https://docs.github.com/en/codespaces/developing-in-codespaces/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository).
 
+### Versions
+
+See the [Version Matrix](VERSION_MATRIX.md) for detailed information.
+
 ### Uniqueness
 
 What makes these Dev Containers unique:
diff --git a/.devcontainer/VERSION_MATRIX.md b/.devcontainer/VERSION_MATRIX.md
index 2caa7f9879917e87ac8c98354510943f052417fe..10a4cbeda6892239a1d35883289d9b5561948034 100644
--- a/.devcontainer/VERSION_MATRIX.md
+++ b/.devcontainer/VERSION_MATRIX.md
@@ -8,6 +8,8 @@
 | 9.4.7<br>9.4                | 3.8.1.0   | ≥ 2.13.1    | 2.3.0.0<br>2.2.0.0<br>2.1.0.0<br>2.0.0.1 |
 | 9.2.8<br>9.2                | 3.6.2.0   | ≥ 2.13.1    | 2.3.0.0<br>2.2.0.0<br>2.1.0.0<br>2.0.0.1 |
 
+[^1]: built-in version; see [GHC musl > Version Matrix](../VERSION_MATRIX.md)
+
 ## Legacy
 
 | GHC   | Cabal[^1] | Stack[^2]             | HLS                           |
@@ -18,5 +20,4 @@
 | 9.4.5 | 3.8.1.0   | 2.11.1[^1]<br>2.9.3.1 | 2.1.0.0<br>2.0.0.1            |
 | 9.2.8 | 3.6.2.0   | 2.11.1[^1]<br>2.9.3.1 | 2.2.0.0<br>2.1.0.0<br>2.0.0.1 |
 
-[^1]: built-in version; see [GHC musl > Version Matrix](../VERSION_MATRIX.md)
 [^2]: unsupported build; *statically linked* binary
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12c798455b0e1d7d3bddeeef138c117e083d39ea..58b5ede5f32f0f30d82ae9344e48a78398db0f1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 .env:
   variables:
-    GHC_VERSION_BUILD: "9.6.3"
-    CABAL_VERSION_BUILD: "3.10.1.0"
+    GHC_VERSION: "9.6.3"
+    CABAL_VERSION: "3.10.1.0"
     STACK_VERSION: "2.13.1"
     HLS_VERSION: "2.3.0.0"
     BUILD_GHC: "true"
@@ -18,7 +18,7 @@
     if [[ $CI_COMMIT_BRANCH == "main" ]]; then
       export CI_APP_TAG=${CI_APP_TAG:-latest}
     elif [[ $CI_COMMIT_BRANCH == "freeze-version" ]]; then
-      export CI_APP_TAG=${CI_APP_TAG:-$GHC_VERSION_BUILD}
+      export CI_APP_TAG=${CI_APP_TAG:-$GHC_VERSION}
     else
       export CI_APP_TAG=${CI_APP_TAG:-$CI_COMMIT_SHA}
     fi
@@ -26,7 +26,7 @@
     echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER
     --password-stdin $CI_REGISTRY
   - >
-    export VERSION_MAJ_MIN_PAT=$GHC_VERSION_BUILD
+    export VERSION_MAJ_MIN_PAT=$GHC_VERSION
 
     export VERSION_MAJ_MIN=`echo $VERSION_MAJ_MIN_PAT |
     sed -n "s|\([[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"`
@@ -66,8 +66,8 @@ build:latest-linux-amd64:
   script:
     - >
       docker build
-      --build-arg GHC_VERSION_BUILD
-      --build-arg CABAL_VERSION_BUILD
+      --build-arg GHC_VERSION
+      --build-arg CABAL_VERSION
       --build-arg STACK_VERSION
       --target tester
       -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
@@ -75,8 +75,8 @@ build:latest-linux-amd64:
       -f latest.Dockerfile .
     - >
       docker build
-      --build-arg GHC_VERSION_BUILD
-      --build-arg CABAL_VERSION_BUILD
+      --build-arg GHC_VERSION
+      --build-arg CABAL_VERSION
       --build-arg STACK_VERSION
       -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
       -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-amd64
@@ -98,8 +98,8 @@ build:latest-linux-arm64v8:
   script:
     - >
       docker build
-      --build-arg GHC_VERSION_BUILD
-      --build-arg CABAL_VERSION_BUILD
+      --build-arg GHC_VERSION
+      --build-arg CABAL_VERSION
       --build-arg STACK_VERSION
       --target tester
       -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
@@ -107,8 +107,8 @@ build:latest-linux-arm64v8:
       -f latest.Dockerfile .
     - >
       docker build
-      --build-arg GHC_VERSION_BUILD
-      --build-arg CABAL_VERSION_BUILD
+      --build-arg GHC_VERSION
+      --build-arg CABAL_VERSION
       --build-arg STACK_VERSION
       -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
       -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-arm64v8
@@ -132,16 +132,16 @@ build:version-linux-amd64:
       docker build
       --target tester
       -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-      -f prior/$GHC_VERSION_BUILD.Dockerfile .
+      -f prior/$GHC_VERSION.Dockerfile .
     - >
       docker build
       -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-      -f prior/$GHC_VERSION_BUILD.Dockerfile .
+      -f prior/$GHC_VERSION.Dockerfile .
     - docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64
   rules:
     - if: $BUILD_GHC == "true" && $CI_COMMIT_BRANCH == "freeze-version" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
       changes:
-        - prior/$GHC_VERSION_BUILD.Dockerfile
+        - prior/$GHC_VERSION.Dockerfile
 
 build:version-linux-arm64v8:
   extends: .build
@@ -154,16 +154,16 @@ build:version-linux-arm64v8:
       docker build
       --target tester
       -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-      -f prior/$GHC_VERSION_BUILD.Dockerfile .
+      -f prior/$GHC_VERSION.Dockerfile .
     - >
       docker build
       -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-      -f prior/$GHC_VERSION_BUILD.Dockerfile .
+      -f prior/$GHC_VERSION.Dockerfile .
     - docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
   rules:
     - if: $BUILD_GHC == "true" && $CI_COMMIT_BRANCH == "freeze-version" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
       changes:
-        - prior/$GHC_VERSION_BUILD.Dockerfile
+        - prior/$GHC_VERSION.Dockerfile
 
 build-manifest:latest-linux-multiarch:
   extends: .build
@@ -226,7 +226,7 @@ build-manifest:version-linux-multiarch:
   rules:
     - if: $BUILD_GHC == "true" && $CI_COMMIT_BRANCH == "freeze-version"
       changes:
-        - prior/$GHC_VERSION_BUILD.Dockerfile
+        - prior/$GHC_VERSION.Dockerfile
 
 build-package-hls:latest-linux-amd64:
   extends: .build
@@ -237,14 +237,14 @@ build-package-hls:latest-linux-amd64:
   script:
     - >
       docker build
-      --build-arg GHC_VERSION=$GHC_VERSION_BUILD
+      --build-arg GHC_VERSION
       --build-arg HLS_VERSION
       -t $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-amd64
-      -t $CI_APP_REPO/$GHC_VERSION_BUILD/hls:$HLS_VERSION-linux-amd64
+      -t $CI_APP_REPO/$GHC_VERSION/hls:$HLS_VERSION-linux-amd64
       -f packages/hls/$HLS_VERSION.Dockerfile .
     - |
       docker push $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-amd64
-      docker push $CI_APP_REPO/$GHC_VERSION_BUILD/hls:$HLS_VERSION-linux-amd64
+      docker push $CI_APP_REPO/$GHC_VERSION/hls:$HLS_VERSION-linux-amd64
   rules:
     - if: $BUILD_HLS == "true" && $CI_COMMIT_BRANCH == "main" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
       changes:
@@ -259,14 +259,14 @@ build-package-hls:latest-linux-arm64v8:
   script:
     - >
       docker build
-      --build-arg GHC_VERSION=$GHC_VERSION_BUILD
+      --build-arg GHC_VERSION
       --build-arg HLS_VERSION
       -t $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-arm64v8
-      -t $CI_APP_REPO/$GHC_VERSION_BUILD/hls:$HLS_VERSION-linux-arm64v8
+      -t $CI_APP_REPO/$GHC_VERSION/hls:$HLS_VERSION-linux-arm64v8
       -f packages/hls/$HLS_VERSION.Dockerfile .
     - |
       docker push $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-arm64v8
-      docker push $CI_APP_REPO/$GHC_VERSION_BUILD/hls:$HLS_VERSION-linux-arm64v8
+      docker push $CI_APP_REPO/$GHC_VERSION/hls:$HLS_VERSION-linux-arm64v8
   rules:
     - if: $BUILD_HLS == "true" && $CI_COMMIT_BRANCH == "main" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
       changes:
@@ -281,7 +281,7 @@ build-package-hls:version-linux-amd64:
   script:
     - >
       docker build
-      --build-arg GHC_VERSION=$GHC_VERSION_BUILD
+      --build-arg GHC_VERSION
       -t $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-amd64
       -f packages/hls/$HLS_VERSION.Dockerfile .
     - docker push $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-amd64
@@ -299,7 +299,7 @@ build-package-hls:version-linux-arm64v8:
   script:
     - >
       docker build
-      --build-arg GHC_VERSION=$GHC_VERSION_BUILD
+      --build-arg GHC_VERSION
       -t $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-arm64v8
       -f packages/hls/$HLS_VERSION.Dockerfile .
     - docker push $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-arm64v8
diff --git a/README.md b/README.md
index d9ab88957377f702c2580924edc91e26f8e2f4ba..f95f047d74eae4039d7db8135059edd9456b6609 100644
--- a/README.md
+++ b/README.md
@@ -46,8 +46,8 @@ To install docker, follow the instructions for your platform:
 
 ```bash
 docker build \
-  --build-arg GHC_VERSION_BUILD=9.6.3 \
-  --build-arg CABAL_VERSION_BUILD=3.10.1.0 \
+  --build-arg GHC_VERSION=9.6.3 \
+  --build-arg CABAL_VERSION=3.10.1.0 \
   --build-arg STACK_VERSION=2.13.1 \
   -t ghc-musl \
   -f latest.Dockerfile .
@@ -85,8 +85,8 @@ include the Haskell Tool Stack (Stack).
 
 There is currently no GHC binary distribution for Alpine Linux (AArch64)
 available!  
-:exclamation: Use flags <nobr>`--no-install-ghc --system-ghc`</nobr> to ensure
-that only the GHC available in the container is used.
+:exclamation: Use flags <nobr>`--no-install-ghc --system-ghc`</nobr> with
+Stack to ensure that only the GHC available in the container is used.
 
 ## Similar projects
 
diff --git a/bootstrap/amd64.Dockerfile b/bootstrap/amd64.Dockerfile
index 4b28a054d47329ccf4590ed3a34d41b2f03ee637..7fc18514aaddd2d5e67d24038574fb7c80445700 100644
--- a/bootstrap/amd64.Dockerfile
+++ b/bootstrap/amd64.Dockerfile
@@ -1,9 +1,14 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=8.8.3
+ARG CABAL_VERSION=3.2.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM alpine:3.12 as bootstrap
 
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG CABAL_VERSION_BUILD
+
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 COPY ghc-8.8.patch /tmp/
 COPY cabal-0001-force-ld.gold.patch /tmp/
@@ -40,8 +45,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.8.3}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk add --no-cache \
     bash \
diff --git a/bootstrap/arm64.Dockerfile b/bootstrap/arm64.Dockerfile
index aa0c3115e042998ea4cada20fa87e2448042ffa7..fbe03263e9d0b174c94907c41eddde326bb311ad 100644
--- a/bootstrap/arm64.Dockerfile
+++ b/bootstrap/arm64.Dockerfile
@@ -1,9 +1,14 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=8.8.3
+ARG CABAL_VERSION=3.2.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM alpine:3.12 as bootstrap
 
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG CABAL_VERSION_BUILD
+
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 COPY ghc-8.8.patch /tmp/
 COPY cabal-0001-force-ld.gold.patch /tmp/
@@ -41,8 +46,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.8.3}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk add --no-cache \
     bash \
diff --git a/latest.Dockerfile b/latest.Dockerfile
index 9f2249e2086415a4abbfcb4046f400227d7a6c06..c1a7d7a218e9dac1de082d9f590c75d75d516a49 100644
--- a/latest.Dockerfile
+++ b/latest.Dockerfile
@@ -1,7 +1,10 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION
+ARG CABAL_VERSION
 ARG STACK_VERSION
 
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
+
 FROM glcr.b-data.ch/ghc/ghc-musl:9.4.7 as bootstrap
 
 ARG GHC_VERSION_BUILD
diff --git a/prior/8.10.1.Dockerfile b/prior/8.10.1.Dockerfile
index bcbd91c3487a4e7d0504b149d07305760b716c53..92f90806b106a01828a47b0d94fb1e5073c4fcea 100644
--- a/prior/8.10.1.Dockerfile
+++ b/prior/8.10.1.Dockerfile
@@ -1,10 +1,16 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=8.10.1
+ARG CABAL_VERSION=3.2.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.8.4 as bootstrap
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.10.1}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk upgrade --no-cache \
   && apk add --no-cache \
@@ -65,8 +71,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.10.1}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk add --no-cache \
     bash \
diff --git a/prior/8.10.4.Dockerfile b/prior/8.10.4.Dockerfile
index 98a3029c2a4b90eaed2573cc9754d5ba8ce37351..e53f6626182eabf970d5eb1c330d36379599e338 100644
--- a/prior/8.10.4.Dockerfile
+++ b/prior/8.10.4.Dockerfile
@@ -1,10 +1,16 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=8.10.4
+ARG CABAL_VERSION=3.2.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.8.4 as bootstrap
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.10.4}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk upgrade --no-cache \
   && apk add --no-cache \
@@ -65,8 +71,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.10.4}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk add --no-cache \
     bash \
diff --git a/prior/8.10.5.Dockerfile b/prior/8.10.5.Dockerfile
index 4f04d811d0727eb422a8bc6244eadccf28f2ad10..ad36a6b9f2b7fca6afc01c4c994fb60f8327c158 100644
--- a/prior/8.10.5.Dockerfile
+++ b/prior/8.10.5.Dockerfile
@@ -1,10 +1,16 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=8.10.5
+ARG CABAL_VERSION=3.2.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.8.4 as bootstrap
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.10.5}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk upgrade --no-cache \
   && apk add --no-cache \
@@ -65,8 +71,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.10.5}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk add --no-cache \
     bash \
diff --git a/prior/8.10.6.Dockerfile b/prior/8.10.6.Dockerfile
index d43182d0643e24877c230e38a60566a41287d57a..10ebff59eb8d802f626cbc98602fe5c080e80678 100644
--- a/prior/8.10.6.Dockerfile
+++ b/prior/8.10.6.Dockerfile
@@ -1,10 +1,16 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=8.10.6
+ARG CABAL_VERSION=3.2.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.8.4 as bootstrap
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.10.6}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk upgrade --no-cache \
   && apk add --no-cache \
@@ -65,8 +71,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.10.6}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk add --no-cache \
     bash \
diff --git a/prior/8.10.7.Dockerfile b/prior/8.10.7.Dockerfile
index 50680c40e188cb05fcf76a36b8e0bc96e1cfa670..783ee0882404a85804d1994289bc139e22fdf986 100644
--- a/prior/8.10.7.Dockerfile
+++ b/prior/8.10.7.Dockerfile
@@ -1,10 +1,16 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=8.10.7
+ARG CABAL_VERSION=3.2.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.8.4 as bootstrap
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.10.7}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk upgrade --no-cache \
   && apk add --no-cache \
@@ -65,8 +71,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.10.7}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk add --no-cache \
     bash \
diff --git a/prior/8.8.4.Dockerfile b/prior/8.8.4.Dockerfile
index 6ac95449773928e98889241cce3b8e7cb628536d..d7ad5092b45a83689a521e128c97d8eb17cdc91a 100644
--- a/prior/8.8.4.Dockerfile
+++ b/prior/8.8.4.Dockerfile
@@ -1,10 +1,16 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=8.8.4
+ARG CABAL_VERSION=3.2.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:bootstrap as bootstrap
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.8.4}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk upgrade --no-cache \
   && apk add --no-cache \
@@ -65,8 +71,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.8.4}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk add --no-cache \
     bash \
diff --git a/prior/9.0.1.Dockerfile b/prior/9.0.1.Dockerfile
index 03bad97beef746f6058a8abd12940b6739953d99..815d835237461682a0b2bdc36fd464f052a696f7 100644
--- a/prior/9.0.1.Dockerfile
+++ b/prior/9.0.1.Dockerfile
@@ -1,10 +1,16 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=9.0.1
+ARG CABAL_VERSION=3.4.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.10.7 as bootstrap
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.0.1}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.4.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk upgrade --no-cache \
   && apk add --no-cache \
@@ -65,8 +71,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.0.1}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.4.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 ENV PATH=$PATH:/usr/lib/llvm10/bin
 
 RUN apk add --no-cache \
diff --git a/prior/9.0.2.Dockerfile b/prior/9.0.2.Dockerfile
index 2910f83c270a6aab8fc69b1c134c8e2da0ee4a08..99d988535c150305c331bee545eed9b30dc17c95 100644
--- a/prior/9.0.2.Dockerfile
+++ b/prior/9.0.2.Dockerfile
@@ -1,10 +1,16 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=9.0.2
+ARG CABAL_VERSION=3.4.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.10.7 as bootstrap
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.0.2}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.4.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk upgrade --no-cache \
   && apk add --no-cache \
@@ -65,8 +71,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.0.2}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.4.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 ENV PATH=$PATH:/usr/lib/llvm10/bin
 
 RUN apk add --no-cache \
diff --git a/prior/9.2.1.Dockerfile b/prior/9.2.1.Dockerfile
index 30ba4cac05a89af5c44ae6e809bfc12e8eddb663..9c06e3e82cc2bd6a077114bd7da9dcd07de0dac5 100644
--- a/prior/9.2.1.Dockerfile
+++ b/prior/9.2.1.Dockerfile
@@ -1,12 +1,18 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=9.2.1
+ARG CABAL_VERSION=3.6.0.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.0.2 as bootstrap
 
 COPY patches/* /tmp/
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.2.1}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.6.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk upgrade --no-cache \
   && apk add --no-cache \
@@ -70,8 +76,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.2.1}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.6.0.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk add --no-cache \
     bash \
diff --git a/prior/9.2.2.Dockerfile b/prior/9.2.2.Dockerfile
index dd84fa68e7b73941dcaaa8a328a4fd53bef975e5..0705d0eeb4988046ed70bf3866eacf12de3a21f4 100644
--- a/prior/9.2.2.Dockerfile
+++ b/prior/9.2.2.Dockerfile
@@ -1,10 +1,16 @@
-ARG GHC_VERSION_BUILD
-ARG CABAL_VERSION_BUILD
+ARG GHC_VERSION=9.2.2
+ARG CABAL_VERSION=3.6.2.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.0.2 as bootstrap
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.2.2}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.6.2.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk upgrade --no-cache \
   && apk add --no-cache \
@@ -65,8 +71,11 @@ LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.2.2}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.6.2.0}
+ARG GHC_VERSION_BUILD
+ARG CABAL_VERSION_BUILD
+
+ENV GHC_VERSION=${GHC_VERSION_BUILD}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD}
 
 RUN apk add --no-cache \
     bash \
diff --git a/prior/9.2.3.Dockerfile b/prior/9.2.3.Dockerfile
index 11899a06633fa7202359999e81b30bec46902d6c..1465de04ac39d0573cf81d8cd2ac123adadc168c 100644
--- a/prior/9.2.3.Dockerfile
+++ b/prior/9.2.3.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.2.3
-ARG CABAL_VERSION_BUILD=3.6.2.0
+ARG GHC_VERSION=9.2.3
+ARG CABAL_VERSION=3.6.2.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.0.2 as bootstrap
 
diff --git a/prior/9.2.4.Dockerfile b/prior/9.2.4.Dockerfile
index 5550645efc27ab2c86fd18a7ff39fd96f3c1fa62..9e27347bc976e14dd4d7b0acd2c121f9f8f4115d 100644
--- a/prior/9.2.4.Dockerfile
+++ b/prior/9.2.4.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.2.4
-ARG CABAL_VERSION_BUILD=3.6.2.0
+ARG GHC_VERSION=9.2.4
+ARG CABAL_VERSION=3.6.2.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.0.2 as bootstrap
 
diff --git a/prior/9.2.5.Dockerfile b/prior/9.2.5.Dockerfile
index 69a1bcae7edb5ed86f50761f3cc7917624e97f83..55ecfc07c41b8fcb59db1bdf60378948c648d98d 100644
--- a/prior/9.2.5.Dockerfile
+++ b/prior/9.2.5.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.2.5
-ARG CABAL_VERSION_BUILD=3.6.2.0
+ARG GHC_VERSION=9.2.5
+ARG CABAL_VERSION=3.6.2.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.0.2 as bootstrap
 
diff --git a/prior/9.2.6.Dockerfile b/prior/9.2.6.Dockerfile
index 8147719bed4b3be692fe3527aa2c311504ced15d..c9f98ad3f7a57b9161b6f5737f851a7fc14f7b9a 100644
--- a/prior/9.2.6.Dockerfile
+++ b/prior/9.2.6.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.2.6
-ARG CABAL_VERSION_BUILD=3.6.2.0
+ARG GHC_VERSION=9.2.6
+ARG CABAL_VERSION=3.6.2.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.0.2 as bootstrap
 
diff --git a/prior/9.2.7.Dockerfile b/prior/9.2.7.Dockerfile
index 81ba50bddb69bc0b0897affaec2da52ef4b583b3..7a8d5376f2ae7489d12288602c057e91c00dc5a8 100644
--- a/prior/9.2.7.Dockerfile
+++ b/prior/9.2.7.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.2.7
-ARG CABAL_VERSION_BUILD=3.6.2.0
+ARG GHC_VERSION=9.2.7
+ARG CABAL_VERSION=3.6.2.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.0.2 as bootstrap
 
diff --git a/prior/9.2.8.Dockerfile b/prior/9.2.8.Dockerfile
index e40fc49c4880a46df947b74c115fe1cb69214b52..30c126508bb9fb2967244fecddeddcbe7b79fb25 100644
--- a/prior/9.2.8.Dockerfile
+++ b/prior/9.2.8.Dockerfile
@@ -1,7 +1,10 @@
-ARG GHC_VERSION_BUILD=9.2.8
-ARG CABAL_VERSION_BUILD=3.6.2.0
+ARG GHC_VERSION=9.2.8
+ARG CABAL_VERSION=3.6.2.0
 ARG STACK_VERSION=2.13.1
 
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
+
 FROM glcr.b-data.ch/ghc/ghc-musl:9.0.2 as bootstrap
 
 ARG GHC_VERSION_BUILD
diff --git a/prior/9.4.1.Dockerfile b/prior/9.4.1.Dockerfile
index e4ba413c9d982d2d2600562dab9a3ba26fdabcff..3438ba5fb70765a441e9a190e5615a4fc8d44531 100644
--- a/prior/9.4.1.Dockerfile
+++ b/prior/9.4.1.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.4.1
-ARG CABAL_VERSION_BUILD=3.8.1.0
+ARG GHC_VERSION=9.4.1
+ARG CABAL_VERSION=3.8.1.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.2.4 as bootstrap
 
diff --git a/prior/9.4.2.Dockerfile b/prior/9.4.2.Dockerfile
index 9316e386ce0a6a36e3564e3243d6d6975269bbec..dd75a9e22ab43e8dfca7b2229763d15323dbe004 100644
--- a/prior/9.4.2.Dockerfile
+++ b/prior/9.4.2.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.4.2
-ARG CABAL_VERSION_BUILD=3.8.1.0
+ARG GHC_VERSION=9.4.2
+ARG CABAL_VERSION=3.8.1.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.2.4 as bootstrap
 
diff --git a/prior/9.4.3.Dockerfile b/prior/9.4.3.Dockerfile
index ae190df3d4f9464a1eb7d62c25df78f8b8722338..551b1662abe1dceb097312c4b0edaebea85e3c64 100644
--- a/prior/9.4.3.Dockerfile
+++ b/prior/9.4.3.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.4.3
-ARG CABAL_VERSION_BUILD=3.8.1.0
+ARG GHC_VERSION=9.4.3
+ARG CABAL_VERSION=3.8.1.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.2.5 as bootstrap
 
diff --git a/prior/9.4.4.Dockerfile b/prior/9.4.4.Dockerfile
index f49fd9a05852edc50587ca0f56a6d8da7522fd77..4c001b18affafc2244d84a83722ea8aaf09d1252 100644
--- a/prior/9.4.4.Dockerfile
+++ b/prior/9.4.4.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.4.4
-ARG CABAL_VERSION_BUILD=3.8.1.0
+ARG GHC_VERSION=9.4.4
+ARG CABAL_VERSION=3.8.1.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.2.7 as bootstrap
 
diff --git a/prior/9.4.5.Dockerfile b/prior/9.4.5.Dockerfile
index 26229b28f402f0f76ae30cc7b6e6faca061fab8d..97025c62569a80a46280fa6df33a4b785828adda 100644
--- a/prior/9.4.5.Dockerfile
+++ b/prior/9.4.5.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.4.5
-ARG CABAL_VERSION_BUILD=3.8.1.0
+ARG GHC_VERSION=9.4.5
+ARG CABAL_VERSION=3.8.1.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM glcr.b-data.ch/ghc/ghc-musl:9.2.7 as bootstrap
 
diff --git a/prior/9.4.6.Dockerfile b/prior/9.4.6.Dockerfile
index 19838310cd75f69cad50319b30c05c190ea0b965..fe41f02ba4b15a1f748ce6d0bad195ec66de0489 100644
--- a/prior/9.4.6.Dockerfile
+++ b/prior/9.4.6.Dockerfile
@@ -1,7 +1,10 @@
-ARG GHC_VERSION_BUILD=9.4.6
-ARG CABAL_VERSION_BUILD=3.8.1.0
+ARG GHC_VERSION=9.4.6
+ARG CABAL_VERSION=3.8.1.0
 ARG STACK_VERSION=2.11.1
 
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
+
 FROM glcr.b-data.ch/ghc/ghc-musl:9.2.8 as bootstrap
 
 ARG GHC_VERSION_BUILD
diff --git a/prior/9.4.7.Dockerfile b/prior/9.4.7.Dockerfile
index c4dba935bf7292d6b84402e4dcb74e65c902406b..416f1181b5759af877a25a3db7053bb214d49a53 100644
--- a/prior/9.4.7.Dockerfile
+++ b/prior/9.4.7.Dockerfile
@@ -1,7 +1,10 @@
-ARG GHC_VERSION_BUILD=9.4.7
-ARG CABAL_VERSION_BUILD=3.8.1.0
+ARG GHC_VERSION=9.4.7
+ARG CABAL_VERSION=3.8.1.0
 ARG STACK_VERSION=2.13.1
 
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
+
 FROM glcr.b-data.ch/ghc/ghc-musl:9.2.8 as bootstrap
 
 ARG GHC_VERSION_BUILD
diff --git a/prior/9.6.1.Dockerfile b/prior/9.6.1.Dockerfile
index 6d495695283798c5f29b2c273001d5d8fad59026..93965ea57dd3367d9b550ef53c7211e9a753e8ff 100644
--- a/prior/9.6.1.Dockerfile
+++ b/prior/9.6.1.Dockerfile
@@ -1,5 +1,8 @@
-ARG GHC_VERSION_BUILD=9.6.1
-ARG CABAL_VERSION_BUILD=3.10.1.0
+ARG GHC_VERSION=9.6.1
+ARG CABAL_VERSION=3.10.1.0
+
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
 
 FROM glcr.b-data.ch/ghc/ghc-musl:9.4.5 as bootstrap
 
diff --git a/prior/9.6.2.Dockerfile b/prior/9.6.2.Dockerfile
index 21de1a9e5be8bb5fe4bf82827ea805d07d1170c4..d2fc387c96bf80d854c520f55e92ed4fc90de429 100644
--- a/prior/9.6.2.Dockerfile
+++ b/prior/9.6.2.Dockerfile
@@ -1,7 +1,10 @@
-ARG GHC_VERSION_BUILD=9.6.2
-ARG CABAL_VERSION_BUILD=3.10.1.0
+ARG GHC_VERSION=9.6.2
+ARG CABAL_VERSION=3.10.1.0
 ARG STACK_VERSION=2.11.1
 
+ARG GHC_VERSION_BUILD=${GHC_VERSION}
+ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
+
 FROM glcr.b-data.ch/ghc/ghc-musl:9.4.7 as bootstrap
 
 ARG GHC_VERSION_BUILD