diff --git a/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18.py b/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18.py
index c0cd62e6..cd1ee4b0 100644
--- a/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18.py
+++ b/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18.py
@@ -65,7 +65,7 @@ def set_settings(self, state):
             # length of simulation (in seconds)
             settings.runlen = self._get_runlen(self._input_dir, "forcing_tracer.nc")
             # length of warmup simulation (in seconds)
-            settings.runlen_warmup = settings.runlen
+            settings.runlen_warmup = 2 * 365 * 24 * 60 * 60
             # total number of iterations
             settings.nitt = self._get_nitt(self._input_dir, "forcing_tracer.nc")
             # maximum water age (in days)
@@ -77,8 +77,8 @@ def set_settings(self, state):
             settings.dy = self._config["dy"]
 
             # origin of spatial grid
-            settings.x_origin = 0.0
-            settings.y_origin = 0.0
+            settings.x_origin = self._config["x_origin"]
+            settings.y_origin = self._config["y_origin"]
             # origin of time steps (e.g. 01-01-2023)
             settings.time_origin = "31-10-2019"
 
diff --git a/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18.sh b/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18.sh
index 2e923a5f..2dd5b4ea 100755
--- a/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18.sh
+++ b/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
-#SBATCH --time=8:00:00
+#SBATCH --time=6:00:00
 #SBATCH --nodes=1
-#SBATCH --ntasks=16
+#SBATCH --ntasks=10
 #SBATCH --cpus-per-task=1
-#SBATCH --mem=32000
+#SBATCH --mem=20000
 #SBATCH --mail-type=FAIL
 #SBATCH --mail-user=robin.schwemmle@hydrology.uni-freiburg.de
 #SBATCH --job-name=svat18O
 #SBATCH --output=svat18O.out
-#SBATCH --error=svat18Oout
+#SBATCH --error=svat18O_err.out
 #SBATCH --export=ALL
  
 # load module dependencies
@@ -35,8 +35,8 @@ while [ "${checksum_gws}" != "${checksum_ssd}" ]; do
 done
 echo "Copying was successful"
  
-mpirun --bind-to core --map-by core -report-bindings python svat_oxygen18.py -b jax -d cpu -n 16 1 -td "${TMPDIR}"
+mpirun --bind-to core --map-by core -report-bindings python svat_oxygen18.py -b jax -d cpu -n 10 1 -td "${TMPDIR}"
 # Move output from local SSD to global workspace
 echo "Move output to /home/fr/fr_fr/fr_rs1092/roger/examples/catchment_scale/eberbaechle/svat_oxygen18/output"
 mkdir -p /home/fr/fr_fr/fr_rs1092/roger/examples/catchment_scale/eberbaechle/svat_oxygen18/output
-mv "${TMPDIR}"/SVAT18O_*.nc /home/fr/fr_fr/fr_rs1092/roger/examples/catchment_scale/eberbaechle/svat_oxygen18/output
+mv "${TMPDIR}"/SVAT18O.*.nc /home/fr/fr_fr/fr_rs1092/roger/examples/catchment_scale/eberbaechle/svat_oxygen18/output
diff --git a/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18_gpu.sh b/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18_gpu.sh
index 4f3a4824..f239ad52 100644
--- a/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18_gpu.sh
+++ b/examples/catchment_scale/eberbaechle/svat_oxygen18_distributed/svat_oxygen18_gpu.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
-#SBATCH --time=8:00:00
+#SBATCH --time=4:00:00
 #SBATCH --nodes=1
 #SBATCH --ntasks=1
 #SBATCH --cpus-per-task=1
 #SBATCH --gres=gpu:1
-#SBATCH --mem=32000
+#SBATCH --mem=24000
 #SBATCH --mail-type=FAIL
 #SBATCH --mail-user=robin.schwemmle@hydrology.uni-freiburg.de
 #SBATCH --job-name=svat18O
@@ -40,4 +40,4 @@ python svat_oxygen18.py -b jax -d gpu -td "${TMPDIR}"
 # Move output from local SSD to global workspace
 echo "Move output to /home/fr/fr_fr/fr_rs1092/roger/examples/catchment_scale/eberbaechle/svat_oxygen18/output"
 mkdir -p /home/fr/fr_fr/fr_rs1092/roger/examples/catchment_scale/eberbaechle/svat_oxygen18/output
-mv "${TMPDIR}"/SVAT18O_*.nc /home/fr/fr_fr/fr_rs1092/roger/examples/catchment_scale/eberbaechle/svat_oxygen18/output
+mv "${TMPDIR}"/SVAT18O.*.nc /home/fr/fr_fr/fr_rs1092/roger/examples/catchment_scale/eberbaechle/svat_oxygen18/output