diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0ed22ac0917597f2bf2e693297660afa180d6b9..6a42611b4d2e34a3520d516a2552284c19fafdac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,8 +35,8 @@
     DOCKER_DRIVER: overlay2
     DOCKER_TLS_CERTDIR: "/certs"
     BUILDX_NO_DEFAULT_ATTESTATIONS: "true"
-    GHC_VERSION_BUILD: "9.6.2"
-    CABAL_VERSION_BUILD: "3.10.1.0"
+    GHC_VERSION_BUILD: "9.4.6"
+    CABAL_VERSION_BUILD: "3.8.1.0"
     STACK_VERSION: "2.11.1"
   before_script:
     - *before-script-build
@@ -201,6 +201,13 @@ build-manifest:version-linux-multiarch:
           $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
       fi
       docker manifest push $CI_APP_REPO:$CI_APP_TAG
+    - |
+      docker manifest create $CI_APP_REPO:$VERSION_MAJ_MIN $CI_MANIFEST_LIST
+      if echo $OS_ARCH | grep "linux-arm64v8" >/dev/null ; then
+        docker manifest annotate --variant v8 $CI_APP_REPO:$VERSION_MAJ_MIN \
+          $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
+      fi
+      docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN
   rules:
     - if: $CI_COMMIT_BRANCH == "freeze-version"
       changes:
diff --git a/prior/9.2.8.Dockerfile b/prior/9.2.8.Dockerfile
index b0b4af9031bec332a40a091afeaed9fce007e48d..970333b989588e0dc50eca3ad84f1f956c6ead5f 100644
--- a/prior/9.2.8.Dockerfile
+++ b/prior/9.2.8.Dockerfile
@@ -98,6 +98,7 @@ RUN apk add --no-cache \
     pcre2 \
     pcre2-dev \
     perl \
+    shadow \
     wget \
     xz \
     xz-dev \
diff --git a/prior/9.4.6.Dockerfile b/prior/9.4.6.Dockerfile
index 8e6b898ffdc623fb1444ad65eb5631332ed04241..c51fb2c7fb52c3dc5472e2c90acd90347098e14f 100644
--- a/prior/9.4.6.Dockerfile
+++ b/prior/9.4.6.Dockerfile
@@ -91,6 +91,7 @@ RUN apk add --no-cache \
     pcre2 \
     pcre2-dev \
     perl \
+    shadow \
     wget \
     xz \
     xz-dev \