diff --git a/ExerciseChecker/package-lock.json b/ExerciseChecker/package-lock.json
index bc17bf89d7aa6a08a36c4cd8087e8708930a1366..df751ab1e2b0ab99830654c483ff489112b2c486 100644
--- a/ExerciseChecker/package-lock.json
+++ b/ExerciseChecker/package-lock.json
@@ -15,6 +15,7 @@
                 "chalk": "^4.1.2",
                 "dockerode": "^3.3.5",
                 "dotenv": "^16.3.1",
+                "dotenv-expand": "^10.0.0",
                 "fs-extra": "^11.1.1",
                 "http-status-codes": "^2.2.0",
                 "json5": "^2.2.3",
@@ -1450,6 +1451,14 @@
                 "url": "https://github.com/motdotla/dotenv?sponsor=1"
             }
         },
+        "node_modules/dotenv-expand": {
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
+            "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/dotenv-vault": {
             "version": "1.25.0",
             "resolved": "https://registry.npmjs.org/dotenv-vault/-/dotenv-vault-1.25.0.tgz",
diff --git a/ExerciseChecker/package.json b/ExerciseChecker/package.json
index dd642ad59ea36467d750324b532b6d596e78a3e9..fd510d64ba1d49aed5e2f54bcb3c2ecb328fcdae 100644
--- a/ExerciseChecker/package.json
+++ b/ExerciseChecker/package.json
@@ -34,6 +34,7 @@
         "chalk"            : "^4.1.2",
         "dockerode"        : "^3.3.5",
         "dotenv"           : "^16.3.1",
+        "dotenv-expand"    : "^10.0.0",
         "fs-extra"         : "^11.1.1",
         "http-status-codes": "^2.2.0",
         "json5"            : "^2.2.3",
diff --git a/ExerciseChecker/src/app.ts b/ExerciseChecker/src/app.ts
index 1f025d2a7d79a5f8d7d11a35c57cd2568dcc5c54..63eef070ae3635dcf2c0245dd9e39337469df870 100644
--- a/ExerciseChecker/src/app.ts
+++ b/ExerciseChecker/src/app.ts
@@ -1,10 +1,11 @@
 // Read from the .env file
 // ATTENTION : This lines MUST be the first of this file (except for the path import)
 const path = require('node:path');
-require('dotenv').config({
-                             path      : path.join(__dirname, '../.env'),
-                             DOTENV_KEY: 'dotenv://:key_bebfddf18e3dd9a0bafafe0e383313f75add1da6fbe41ea5fde51f37ef1776aa@dotenv.local/vault/.env.vault?environment=development'
-                         });
+const myEnv = require('dotenv').config({
+                                           path      : path.join(__dirname, '../.env'),
+                                           DOTENV_KEY: 'dotenv://:key_bebfddf18e3dd9a0bafafe0e383313f75add1da6fbe41ea5fde51f37ef1776aa@dotenv.local/vault/.env.vault?environment=development'
+                                       });
+require('dotenv-expand').expand(myEnv);
 require('./shared/helpers/TypeScriptExtensions'); // ATTENTION : This line MUST be the second of this file
 
 import ClientsSharedConfig                  from './sharedByClients/config/ClientsSharedConfig';
diff --git a/ExerciseChecker/src/shared b/ExerciseChecker/src/shared
index 8424367748a6fc47f8da10b85e7663f3f7d07620..efe1bf313f57d1826faf935c183d37a0835f8c2d 160000
--- a/ExerciseChecker/src/shared
+++ b/ExerciseChecker/src/shared
@@ -1 +1 @@
-Subproject commit 8424367748a6fc47f8da10b85e7663f3f7d07620
+Subproject commit efe1bf313f57d1826faf935c183d37a0835f8c2d
diff --git a/ExerciseChecker/src/sharedByClients b/ExerciseChecker/src/sharedByClients
index 97ba763f9517880ecfa6245c172a0e330ebdd11a..d9379b055a4626e4b35cf4cc4a7429040a4aeaf7 160000
--- a/ExerciseChecker/src/sharedByClients
+++ b/ExerciseChecker/src/sharedByClients
@@ -1 +1 @@
-Subproject commit 97ba763f9517880ecfa6245c172a0e330ebdd11a
+Subproject commit d9379b055a4626e4b35cf4cc4a7429040a4aeaf7