diff --git a/.devcontainer/GHC-legacy.Dockerfile b/.devcontainer/GHC-legacy.Dockerfile
index e9925b74f3293709dfcdade98f78e256c47e2d9d..7fe90a7e72675d1bb47561b800aa493c2b1d8279 100644
--- a/.devcontainer/GHC-legacy.Dockerfile
+++ b/.devcontainer/GHC-legacy.Dockerfile
@@ -74,10 +74,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
   ## Update timezone if needed
   && if [ "$TZ" != "" ]; then \
     apk add --no-cache tzdata; \
-    echo "Setting TZ to $TZ"; \
-    ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime \
-      && echo "$TZ" > /etc/timezone; \
   fi \
+  ## Info about timezone
+  && echo "TZ is set to $TZ" \
   ## Add/Update locale if needed
   && if [ "$LANG" != "C.UTF-8" ]; then \
     if [ -n "$LANG" ]; then \
@@ -87,7 +86,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
     sed -i "s/LANG:-C.UTF-8/LANG:-$LANG/" /etc/profile.d/*locale.sh; \
     sed -i "s/LC_COLLATE=C/LC_COLLATE=$LANG/" /etc/profile.d/*locale.sh; \
     sed -i "s/LC_COLLATE:-C/LC_COLLATE:-$LANG/" /etc/profile.d/*locale.sh; \
-  fi
+  fi \
+  ## Info about locale
+  && echo "LANG is set to $LANG"
 
 ## Copy binaries as late as possible to avoid cache busting
 ## Install Stack
diff --git a/.devcontainer/GHC.Dockerfile b/.devcontainer/GHC.Dockerfile
index 77fbb2b7eda4ee257570da798d1b79af641cb9a4..cce8667eecadef9c4028f01c48683d1d74f2b308 100644
--- a/.devcontainer/GHC.Dockerfile
+++ b/.devcontainer/GHC.Dockerfile
@@ -72,10 +72,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
   ## Update timezone if needed
   && if [ "$TZ" != "" ]; then \
     apk add --no-cache tzdata; \
-    echo "Setting TZ to $TZ"; \
-    ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime \
-      && echo "$TZ" > /etc/timezone; \
   fi \
+  ## Info about timezone
+  && echo "TZ is set to $TZ" \
   ## Add/Update locale if needed
   && if [ "$LANG" != "C.UTF-8" ]; then \
     if [ -n "$LANG" ]; then \
@@ -85,7 +84,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
     sed -i "s/LANG:-C.UTF-8/LANG:-$LANG/" /etc/profile.d/*locale.sh; \
     sed -i "s/LC_COLLATE=C/LC_COLLATE=$LANG/" /etc/profile.d/*locale.sh; \
     sed -i "s/LC_COLLATE:-C/LC_COLLATE:-$LANG/" /etc/profile.d/*locale.sh; \
-  fi
+  fi \
+  ## Info about locale
+  && echo "LANG is set to $LANG"
 
 ## Copy binaries as late as possible to avoid cache busting
 ## Install HLS
diff --git a/VERSION_MATRIX.md b/VERSION_MATRIX.md
index 8019400d5e9163cdf6de6f0a3941bbd168b3a355..d72c98f0ce2c03bcf6d41575b268100e055570a4 100644
--- a/VERSION_MATRIX.md
+++ b/VERSION_MATRIX.md
@@ -4,10 +4,10 @@ Topmost entry = Tag `latest`
 
 | GHC        | Cabal    | Stack      | LLVM | Linux distro |
 |:-----------|:---------|:-----------|:---- |:-------------|
-| 9.10.1     | 3.12.1.0 | 3.1.1     | 18   | Alpine 3.20  |
-| 9.8.2      | 3.10.3.0 | 3.1.1     | 16   | Alpine 3.20  |
+| 9.10.1     | 3.12.1.0 | 3.1.1      | 18   | Alpine 3.20  |
+| 9.8.2      | 3.10.3.0 | 3.1.1      | 16   | Alpine 3.20  |
 | 9.8.1      | 3.10.2.1 | 2.15.1     | 14   | Alpine 3.19  |
-| 9.6.6      | 3.10.3.0 | 3.1.1     | 16   | Alpine 3.20  |
+| 9.6.6      | 3.10.3.0 | 3.1.1      | 16   | Alpine 3.20  |
 | 9.6.5      | 3.10.3.0 | 2.15.7     | 16   | Alpine 3.20  |
 | 9.6.4      | 3.10.3.0 | 2.15.5     | 14   | Alpine 3.19  |
 | 9.6.3      | 3.10.1.0 | 2.13.1     | 14   | Alpine 3.19  |