diff --git a/BaseLib/Algorithm.h b/BaseLib/Algorithm.h
index 6bef36eae22131c09c4e04db7a0a6da911249849..f613f1d7c11fd1de988c5b4e9eb0a528076c8636 100644
--- a/BaseLib/Algorithm.h
+++ b/BaseLib/Algorithm.h
@@ -320,9 +320,8 @@ struct Overloaded : Ts...
     using Ts::operator()...;
 };
 #if defined(__clang__)
-#if ((__clang_major__ == 16 && !defined(__apple_build_version__)) || \
-     (__clang_major__ == 15 && defined(__apple_build_version__)))
-/// Explicit deduction guide needed for apple's clang-15 and clang-16.
+#if (__clang_major__ <= 16)
+/// Explicit deduction guide needed for clang <= 16.
 template <class... Ts>
 Overloaded(Ts...) -> Overloaded<Ts...>;
 #endif
diff --git a/scripts/ci/jobs/build-guix.yml b/scripts/ci/jobs/build-guix.yml
index a3adf903beb3aaaf49e00248f80864ad99765e84..90eaad7d86c59df8deb38c82efdd99b28283c728 100644
--- a/scripts/ci/jobs/build-guix.yml
+++ b/scripts/ci/jobs/build-guix.yml
@@ -39,28 +39,33 @@ deploy container:
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
       allow_failure: true
+  parallel:
+    matrix:
+      - GUIX_PACKAGE: ["ogs", "ogs-petsc", "ogs-mkl", "ogs-petsc-mkl"]
   script:
     - which guix
     - guix describe
+    - |
+      if [[ "$GUIX_PACKAGE" =~ .*-mkl ]]; then
+        GUIX_ARGS="--with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4 --without-tests=eigen --with-configure-flag=vtk-9.3=-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=OFF"
+      fi
     # Build phase, retry once if failed
     - guix time-machine -C scripts/guix/channels.scm -- build bash coreutils
     - if [ $? -ne 0 ]; then !!; fi
-    - guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc --with-source=ogs-petsc=$PWD
+    - guix time-machine -C scripts/guix/channels.scm -- build ${GUIX_PACKAGE} --with-source=${GUIX_PACKAGE}=$PWD ${GUIX_ARGS}
     - if [ $? -ne 0 ]; then !!; fi
     # Pack phase
-    - image=$( guix time-machine -C scripts/guix/channels.scm -- pack -RR --format=squashfs bash coreutils ogs-petsc --with-source=ogs-petsc=$PWD | tee | tail -1 )
-    - echo "Image $image"
-    - ssh sonjenk@frontend2.eve.ufz.de rm -f ${GUIX_PETSC_CONTAINER}
-    - scp $image sonjenk@frontend2.eve.ufz.de:${GUIX_PETSC_CONTAINER}
-    # Minio upload
     - mcli alias set minio https://minio.ufz.de $MINIO_PUBLIC_ACCESS_KEY $MINIO_PUBLIC_SECRET_KEY
-    - mcli cp $image minio/ogs/public/container/ogs/master/ogs-petsc.squashfs
-    # Build serial image
-    - guix time-machine -C scripts/guix/channels.scm -- build ogs --with-source=ogs=$PWD
-    - if [ $? -ne 0 ]; then !!; fi
-    - image=$( guix time-machine -C scripts/guix/channels.scm -- pack -RR --format=squashfs bash coreutils ogs --with-source=ogs=$PWD | tee | tail -1 )
-    - echo "Image (serial) $image"
-    - mcli cp $image minio/ogs/public/container/ogs/master/ogs-serial.squashfs
+    # Pack serial image
+    - image=$( guix time-machine -C scripts/guix/channels.scm -- pack -RR --format=squashfs bash coreutils ${GUIX_PACKAGE} --with-source=${GUIX_PACKAGE}=$PWD ${GUIX_ARGS} | tee | tail -1 )
+    - echo "Image (${GUIX_PACKAGE}) $image"
+    - mcli cp $image minio/ogs/public/container/ogs/master/${GUIX_PACKAGE}.squashfs
+    # Copy petsc image to eve as well
+    - |
+      if [[ "$GUIX_PACKAGE" == ogs-petsc ]]; then
+        ssh sonjenk@frontend2.eve.ufz.de rm -f ${GUIX_PETSC_CONTAINER}
+        scp $image sonjenk@frontend2.eve.ufz.de:${GUIX_PETSC_CONTAINER}
+      fi
 
 test container eve:
   stage: build
diff --git a/scripts/guix/channels.scm b/scripts/guix/channels.scm
index 33298192c2bd5d392336828069b2c40c8c371d31..57991845b4550d44d35814a6bbb81cd8b714e817 100644
--- a/scripts/guix/channels.scm
+++ b/scripts/guix/channels.scm
@@ -2,13 +2,13 @@
         (name 'guix-ogs)
         (url "https://gitlab.opengeosys.org/ogs/inf/guix-ogs.git")
         (branch "master")
-        (commit "151fe23f8610b85a84dbaf6888a5afc1256cbb10"))
+        (commit "49ad517d788eff70640a22920f4ca0ccbfeffb23"))
       (channel
         (name 'guix)
         (url "https://git.savannah.gnu.org/git/guix.git")
         (branch "master")
         (commit
-          "6cb181c07f83dfdeae1882208941086f3717a165")
+          "51de844a0ff6ea224367a384092896bce6848b9f")
         (introduction
           (make-channel-introduction
             "cdf1d7dded027019f0ebbd5d6f0147b13dfdd28d"
diff --git a/web/content/releases/_index.md b/web/content/releases/_index.md
index 162de446d3a2563247ccf31948510614c35d4352..e705a9295e3243b84579aac9aa52f96b5ad9776a 100644
--- a/web/content/releases/_index.md
+++ b/web/content/releases/_index.md
@@ -15,27 +15,39 @@ icon = "far fa-arrow-right"
 
 # url encode job name, https://www.w3schools.com/tags/ref_urlencode.ASP
 [[head_downloads]]
-name = "Latest Windows CLI with Utilities"
+name = "Latest Windows CLI"
 url = "https://gitlab.opengeosys.org/ogs/ogs/-/jobs/artifacts/master/browse/build/release?job=build+win"
 note = "Download and unpack .zip-file"
 icon = "fab fa-windows"
 
 [[head_downloads]]
-name = "Latest Windows Data Explorer with Utilities"
+name = "Latest Windows Data Explorer"
 url = "https://gitlab.opengeosys.org/ogs/ogs/-/jobs/artifacts/master/browse/build/release-gui?job=build+gui+win"
 note = "Download and unpack .zip-file"
 icon = "fab fa-windows"
 
 [[head_downloads]]
-name = "Latest container CLI with Utilities"
-url = "https://minio.ufz.de/ogs/public/container/ogs/master/ogs-serial.squashfs"
-note = "Download and run .squashfs-file with [Singularity](/docs/userguide/basics/container/)"
+name = "Latest container CLI"
+url = "https://minio.ufz.de/ogs/public/container/ogs/master/ogs.squashfs"
+note = "Download and run .squashfs-file with [Singularity / Apptainer](/docs/userguide/basics/container/)"
 icon = "far fa-container-storage"
 
 [[head_downloads]]
-name = "Latest container CLI with PETSc-support and Utilities"
+name = "Latest container CLI with PETSc-support"
 url = "https://minio.ufz.de/ogs/public/container/ogs/master/ogs-petsc.squashfs"
-note = "Download and run .squashfs-file with [Singularity](/docs/userguide/basics/container/)"
+note = "Download and run .squashfs-file with [Singularity / Apptainer](/docs/userguide/basics/container/)"
+icon = "far fa-container-storage"
+
+[[head_downloads]]
+name = "Latest container CLI with Intel MKL-support"
+url = "https://minio.ufz.de/ogs/public/container/ogs/master/ogs-mkl.squashfs"
+note = "Download and run .squashfs-file with [Singularity / Apptainer](/docs/userguide/basics/container/)"
+icon = "far fa-container-storage"
+
+[[head_downloads]]
+name = "Latest container CLI with PETSc- and Intel MKL-support"
+url = "https://minio.ufz.de/ogs/public/container/ogs/master/ogs-petsc-mkl.squashfs"
+note = "Download and run .squashfs-file with [Singularity / Apptainer](/docs/userguide/basics/container/)"
 icon = "far fa-container-storage"
 
 [[head_downloads]]