diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/SettingsTestCase.php b/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/SettingsTestCase.php
index ee438d536..bafacd49e 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/SettingsTestCase.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/SettingsTestCase.php
@@ -132,19 +132,13 @@ protected function tearDown(): void {
    */
   protected function setEnvVars(array $vars): void {
     // Unset the existing environment variable if not set in the test.
-    if (!isset($vars['TMP'])) {
-      $vars['TMP'] = NULL;
-    }
+    $vars['TMP'] ??= NULL;
 
     // Unset the existing environment variable if not set in the test.
-    if (!isset($vars['DRUPAL_CONFIG_PATH'])) {
-      $vars['DRUPAL_CONFIG_PATH'] = NULL;
-    }
+    $vars['DRUPAL_CONFIG_PATH'] ??= NULL;
 
     // Do not enforce the CI environment unless it is explicitly set.
-    if (!isset($vars['CI'])) {
-      $vars['CI'] = FALSE;
-    }
+    $vars['CI'] ??= FALSE;
 
     // Filtered real vars without a value to unset them in the lines below.
     $vars_real = self::getRealEnvVarsFilteredNoValues(static::ALLOWED_ENV_VARS);
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/SettingsTestCase.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/SettingsTestCase.php
index e4dea1a63..7823a4cb7 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/SettingsTestCase.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/SettingsTestCase.php
@@ -1,4 +1,4 @@
-@@ -193,7 +193,7 @@
+@@ -187,7 +187,7 @@
     * Require settings file.
     */
    protected function requireSettingsFile(array $pre_settings = [], array $pre_config = []): void {
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/SettingsTestCase.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/SettingsTestCase.php
index e4dea1a63..7823a4cb7 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/SettingsTestCase.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/SettingsTestCase.php
@@ -1,4 +1,4 @@
-@@ -193,7 +193,7 @@
+@@ -187,7 +187,7 @@
     * Require settings file.
     */
    protected function requireSettingsFile(array $pre_settings = [], array $pre_config = []): void {
diff --git a/docker-compose.yml b/docker-compose.yml
index f22ae4719..c1342eaa2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -189,7 +189,7 @@ services:
       context: .
       dockerfile: .docker/database.dockerfile
       args:
-        IMAGE: "${VORTEX_DB_IMAGE:-uselagoon/mysql-8.4:26.8.0}" # Use custom database image (if defined) or fallback to standard database image.
+        IMAGE: "${VORTEX_DB_IMAGE:-uselagoon/mysql-8.4:26.8.1}" # Use custom database image (if defined) or fallback to standard database image.
     environment:
       <<: *default-environment
     <<: *default-user
@@ -202,7 +202,7 @@ services:
 
   #;< MIGRATION
   database2:
-    image: "${VORTEX_DB2_IMAGE:-uselagoon/mysql-8.4:26.8.0}" # Use custom database image (if defined) or fallback to standard database image.
+    image: "${VORTEX_DB2_IMAGE:-uselagoon/mysql-8.4:26.8.1}" # Use custom database image (if defined) or fallback to standard database image.
     environment:
       <<: *default-environment
       MYSQL_DATABASE: drupal
diff --git a/tests/phpunit/Drupal/SettingsTestCase.php b/tests/phpunit/Drupal/SettingsTestCase.php
index dabf01d3c..4e4bfedd2 100644
--- a/tests/phpunit/Drupal/SettingsTestCase.php
+++ b/tests/phpunit/Drupal/SettingsTestCase.php
@@ -135,19 +135,13 @@ protected function tearDown(): void {
    */
   protected function setEnvVars(array $vars): void {
     // Unset the existing environment variable if not set in the test.
-    if (!isset($vars['TMP'])) {
-      $vars['TMP'] = NULL;
-    }
+    $vars['TMP'] ??= NULL;
 
     // Unset the existing environment variable if not set in the test.
-    if (!isset($vars['DRUPAL_CONFIG_PATH'])) {
-      $vars['DRUPAL_CONFIG_PATH'] = NULL;
-    }
+    $vars['DRUPAL_CONFIG_PATH'] ??= NULL;
 
     // Do not enforce the CI environment unless it is explicitly set.
-    if (!isset($vars['CI'])) {
-      $vars['CI'] = FALSE;
-    }
+    $vars['CI'] ??= FALSE;
 
     // Filtered real vars without a value to unset them in the lines below.
     $vars_real = self::getRealEnvVarsFilteredNoValues(static::ALLOWED_ENV_VARS);