diff --git a/.gitmodules b/.gitmodules
index b795dd8..a20571b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,7 +17,7 @@
 [submodule "models/eCLM"]
 	path = models/eCLM
 	url = https://github.com/HPSCTerrSys/eCLM.git
-	branch = beta-0.6
+	branch = beta-0.7
 [submodule "models/oasis3-mct"]
         path = models/oasis3-mct
         url = https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct
diff --git a/env/default.2025.env b/env/default.2025.env
index 3e1a6ca..510f29e 100644
--- a/env/default.2025.env
+++ b/env/default.2025.env
@@ -41,7 +41,7 @@ elif [[ $SYSTEMNAME == *"marvin"* ]]; then
 elif [[ $SYSTEMNAME == *"UBUNTU"* ]]; then
   export TSMP2_ENV_FILE=${env_dir}/ubuntu.gnu.openmpi
 else
-  echo "WARNING: Unknown default environment for machine '$(hostname)'"
+  echo "WARNING: Unknown default environment for machine '${SYSTEMNAME}'"
   known_machine="false"
 fi
 
diff --git a/env/uni-bonn.gnu.openmpi b/env/uni-bonn.gnu.openmpi
index fca4ac0..a3be772 100644
--- a/env/uni-bonn.gnu.openmpi
+++ b/env/uni-bonn.gnu.openmpi
@@ -12,6 +12,7 @@ module --force purge
 # Primary compiler toolchain
 module load GCC/12.3.0
 module load OpenMPI/4.1.5-GCC-12.3.0
+module load ScaLAPACK/2.2.0-gompi-2023a-fb
 
 # Basic scripting and build tools
 module load Python/3.11.3-GCCcore-12.3.0
@@ -32,7 +33,7 @@ module load Tcl/8.6.13-GCCcore-12.3.0
 module load ecCodes/2.31.0-gompi-2023a
 
 # Set SYSTEMNAME and STAGE for Marvin
-export SYSTEMNAME="Marvin"
+export SYSTEMNAME="marvin"
 export STAGE="${EBVERSIONGOMPI}${EBVERSIONIIMPI}"
 
 # Set default compilers
diff --git a/models/eCLM b/models/eCLM
index 98054f5..81bc52f 160000
--- a/models/eCLM
+++ b/models/eCLM
@@ -1 +1 @@
-Subproject commit 98054f5eb6df272fb79183b8d87f3f8e8a626131
+Subproject commit 81bc52f4d0e9275f8b87d186978e8198093b4927