diff --git a/config/vsc_hortense.py b/config/vsc_hortense.py
index e295c4c7..aa2eb1a9 100644
--- a/config/vsc_hortense.py
+++ b/config/vsc_hortense.py
@@ -20,8 +20,6 @@
 #    reframe --detect-host-topology \
 #        ~/.reframe/topology/hortense-{partition_name}/processor.json
 # ```
-import os
-
 from eessi.testsuite.common_config import (common_general_config, common_logging_config,
                                            get_sbatch_account, set_common_required_config)
 from eessi.testsuite.constants import EXTRAS, DEVICE_TYPES, FEATURES, GPU_VENDORS, SCALES
@@ -45,15 +43,8 @@
 # We need to unset SLURM_EXPORT_ENV in the job because otherwise this causes problems for `mpirun`
 post_init = 'unset SLURM_EXPORT_ENV'
 launcher = "mpirun"
-
 eessi_modulepath = '/cvmfs/software.eessi.io/init/modules'
-modulepaths = os.getenv('MODULEPATH', '').split(':')
-if eessi_modulepath in modulepaths:
-    prepare_eessi_init = f"module --force purge && module use {eessi_modulepath}"
-    mpi_module = "env/vsc/dodrio/{}"
-else:
-    prepare_eessi_init = ""
-    mpi_module = "vsc-mympirun"
+prepare_eessi_init = f"module --force purge && module use {eessi_modulepath}"
 
 site_configuration = {
     'systems': [
@@ -81,8 +72,7 @@
                     'descr': 'CPU nodes (AMD Rome, 256GiB RAM)',
                     'max_jobs': 20,
                     'launcher': launcher,
-                    'environs': ['default'],
-                    'modules': [mpi_module.format('cpu_rome_rhel9')],
+                    'environs': ['cpu_rome'],
                     'features': [
                         FEATURES.CPU,
                     ] + list(SCALES.keys()),
@@ -107,8 +97,7 @@
                     'descr': 'CPU nodes (AMD Rome, 512GiB RAM)',
                     'max_jobs': 20,
                     'launcher': launcher,
-                    'environs': ['default'],
-                    'modules': [mpi_module.format('cpu_rome_512_rhel9')],
+                    'environs': ['cpu_rome'],
                     'features': [
                         FEATURES.CPU,
                     ] + list(SCALES.keys()),
@@ -133,8 +122,7 @@
                     'descr': 'CPU nodes (AMD Milan, 256GiB RAM)',
                     'max_jobs': 20,
                     'launcher': launcher,
-                    'environs': ['default'],
-                    'modules': [mpi_module.format('cpu_milan_rhel9')],
+                    'environs': ['cpu_milan'],
                     'features': [
                         FEATURES.CPU,
                     ] + list(SCALES.keys()),
@@ -159,8 +147,7 @@
                     'descr': 'GPU nodes (A100 40GB)',
                     'max_jobs': 20,
                     'launcher': launcher,
-                    'environs': ['default'],
-                    'modules': [mpi_module.format('gpu_rome_a100_40')],
+                    'environs': ['gpu_rome_a100'],
                     'features': [
                         FEATURES.GPU,
                     ] + list(SCALES.keys()),
@@ -193,8 +180,7 @@
                     'descr': 'GPU nodes (A100 80GB)',
                     'max_jobs': 20,
                     'launcher': launcher,
-                    'environs': ['default'],
-                    'modules': [mpi_module.format('gpu_rome_a100_80')],
+                    'environs': ['gpu_rome_a100'],
                     'features': [
                         FEATURES.GPU,
                     ] + list(SCALES.keys()),
@@ -216,9 +202,9 @@
         },
     ],
     'environments': [
-        {
-            'name': 'default',
-        },
+        {'name': 'cpu_rome', 'modules': ['cluster/dodrio/cpu_rome_rhel9', 'vsc-mympirun']},
+        {'name': 'cpu_milan', 'modules': ['cluster/dodrio/cpu_milan_rhel9', 'vsc-mympirun']},
+        {'name': 'gpu_rome_a100', 'modules': ['cluster/dodrio/gpu_rome_a100_rhel9', 'vsc-mympirun']},
     ],
     'general': [
         {