diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 53815a3f748428c99f53543dbc1b5be7187ab5b8..a9eef9eee259f2651bc8cfcdd96bb21786c46806 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -51,11 +51,14 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
 
 ## Update environment
 ARG USE_ZSH_FOR_ROOT
-ARG SET_LANG
-ARG SET_TZ
+ARG LANG
+ARG TZ
 
-ENV LANG=${SET_LANG:-$LANG} \
-    TZ=${SET_TZ:-$TZ}
+ARG LANG_OVERRIDE=${LANG}
+ARG TZ_OVERRIDE=${TZ}
+
+ENV LANG=${LANG_OVERRIDE:-$LANG} \
+    TZ=${TZ_OVERRIDE:-$TZ}
 
   ## Change root's shell to ZSH
 RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
diff --git a/.devcontainer/GHC-legacy.Dockerfile b/.devcontainer/GHC-legacy.Dockerfile
index 293e9319f609abb78299a4b7170f31268719e0f3..7b4f364c18cf9d8c8b5158aeef19cb497c03cd2c 100644
--- a/.devcontainer/GHC-legacy.Dockerfile
+++ b/.devcontainer/GHC-legacy.Dockerfile
@@ -59,11 +59,14 @@ RUN sysArch="$(uname -m)" \
 
 ## Update environment
 ARG USE_ZSH_FOR_ROOT
-ARG SET_LANG
-ARG SET_TZ
+ARG LANG
+ARG TZ
 
-ENV TZ=${SET_TZ:-$TZ} \
-    LANG=${SET_LANG:-$LANG}
+ARG LANG_OVERRIDE=${LANG}
+ARG TZ_OVERRIDE=${TZ}
+
+ENV LANG=${LANG_OVERRIDE:-$LANG} \
+    TZ=${TZ_OVERRIDE:-$TZ}
 
   ## Change root's shell to ZSH
 RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
diff --git a/.devcontainer/GHC.Dockerfile b/.devcontainer/GHC.Dockerfile
index 4e0e9f45dc2a404612c9977169a2ad5920b6ea10..ac36cd57215191c1bcae4ebb471fc1a217c9c9ee 100644
--- a/.devcontainer/GHC.Dockerfile
+++ b/.devcontainer/GHC.Dockerfile
@@ -57,11 +57,14 @@ RUN sysArch="$(uname -m)" \
 
 ## Update environment
 ARG USE_ZSH_FOR_ROOT
-ARG SET_LANG
-ARG SET_TZ
+ARG LANG
+ARG TZ
 
-ENV TZ=${SET_TZ:-$TZ} \
-    LANG=${SET_LANG:-$LANG}
+ARG LANG_OVERRIDE=${LANG}
+ARG TZ_OVERRIDE=${TZ}
+
+ENV LANG=${LANG_OVERRIDE:-$LANG} \
+    TZ=${TZ_OVERRIDE:-$TZ}
 
   ## Change root's shell to ZSH
 RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index af8bbc192cdd2ef33870a055120481e1498dc160..a170044ccc1ddbbb4fb09234238397defe55ffe3 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,8 +6,8 @@
       "BUILD_ON_IMAGE": "glcr.b-data.ch/python/base",
       "PYTHON_VERSION": "latest",
       "USE_ZSH_FOR_ROOT": "unset-to-use-bash",
-      "SET_LANG": "en_US.UTF-8",
-      "SET_TZ": "Etc/UTC"
+      "LANG": "en_US.UTF-8",
+      "TZ": "Etc/UTC"
     }
   },
 
diff --git a/.devcontainer/ghc-9.10/devcontainer.json b/.devcontainer/ghc-9.10/devcontainer.json
index 6b41be7de9b8911fd45c5f51e7d7596a422c16a2..93af95bf72433a6d772f5e7abcda6b55fd52b82f 100644
--- a/.devcontainer/ghc-9.10/devcontainer.json
+++ b/.devcontainer/ghc-9.10/devcontainer.json
@@ -7,8 +7,8 @@
       "GHC_VERSION": "9.10",
       "HLS_VERSION": "2.10.0.0",
       "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
-      "SET_LANG": "C.UTF-8",
-      "SET_TZ": ""
+      "LANG": "C.UTF-8",
+      "TZ": ""
     }
   },
 
diff --git a/.devcontainer/ghc-9.12/devcontainer.json b/.devcontainer/ghc-9.12/devcontainer.json
index c12965ab9c139d8fa3d25c431f0f37ed81c172d9..d1a3303aedd5b15948a7f7fc838be894da2044b0 100644
--- a/.devcontainer/ghc-9.12/devcontainer.json
+++ b/.devcontainer/ghc-9.12/devcontainer.json
@@ -7,8 +7,8 @@
       "GHC_VERSION": "9.12",
       "HLS_VERSION": "2.10.0.0",
       "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
-      "SET_LANG": "C.UTF-8",
-      "SET_TZ": ""
+      "LANG": "C.UTF-8",
+      "TZ": ""
     }
   },
 
diff --git a/.devcontainer/ghc-9.6/devcontainer.json b/.devcontainer/ghc-9.6/devcontainer.json
index 02fc18d4da3d63f938788ec43cf217d30281c595..b247a3e61782661b8dcb1b7801fd743656c1163b 100644
--- a/.devcontainer/ghc-9.6/devcontainer.json
+++ b/.devcontainer/ghc-9.6/devcontainer.json
@@ -8,8 +8,8 @@
       "HLS_VERSION": "2.10.0.0",
       "STACK_VERSION": "3.1.1",
       "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
-      "SET_LANG": "C.UTF-8",
-      "SET_TZ": ""
+      "LANG": "C.UTF-8",
+      "TZ": ""
     }
   },
 
diff --git a/.devcontainer/ghc-9.8/devcontainer.json b/.devcontainer/ghc-9.8/devcontainer.json
index b4f5ed4172470120b93ed36827f41783c239f25b..98ce90fb7051526a42d4fbbfc707c633ee5b7613 100644
--- a/.devcontainer/ghc-9.8/devcontainer.json
+++ b/.devcontainer/ghc-9.8/devcontainer.json
@@ -7,8 +7,8 @@
       "GHC_VERSION": "9.8",
       "HLS_VERSION": "2.10.0.0",
       "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
-      "SET_LANG": "C.UTF-8",
-      "SET_TZ": ""
+      "LANG": "C.UTF-8",
+      "TZ": ""
     }
   },