diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16e761dde09686ec05f44647bacd99600fc41a2a..e19c3efcab5c80a82c473c8a56c22efd12253d8a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,14 +2,31 @@ stages:
   - build
   - test
   - compare
+  # - container
 
 default:
+  image: 
+    name: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
+    pull_policy: always
+
   tags:
     - podman
 
+setup:
+  stage: build
+  artifacts:
+    paths:
+      - tests/testdata/
+    expire_in: 30 min
+    when: on_success
+  script:
+    - mkdir tests/testdata/
+    - wget -r -nH --cut-dirs=2 --no-parent --reject="index.html*" -P tests/testdata/ "https://webdata.wolke.img.univie.ac.at/flexpart/"
+
 alma8-build:
   image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
   stage: build
+  when: manual
 
   script:
     - export FC=gfortran
@@ -22,10 +39,9 @@ alma8-build:
     paths:
       - ./src/FLEXPART
       - ./src/FLEXPART_ETA
-    expire_in: never
+    expire_in: 30 mins
 
 rocky9-build:
-  image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
   stage: build
 
   script:
@@ -39,15 +55,13 @@ rocky9-build:
     paths:
       - ./src/FLEXPART
       - ./src/FLEXPART_ETA
-    expire_in: never
+    expire_in: 30 mins
 
 options-test:
-  # image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
-  image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
   stage: test
   needs:
-    - alma8-build
     - rocky9-build
+    - setup
 
   script:
     - ulimit -s unlimited
@@ -59,15 +73,12 @@ options-test:
       - ./tests/output_bkw
       - ./tests/output_settling_eta
       - ./tests/output_bkw_eta
-    expire_in: 5 mins
+    expire_in: 10 mins
 
 nests-test:
-  # image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
-  image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
   stage: test
   when: manual
   needs:
-    - alma8-build
     - rocky9-build
 
   script:
@@ -76,14 +87,14 @@ nests-test:
   artifacts:
     when: on_success
     paths:
+      - ./tests/output_nests
+    expire_in: 10 mins
 
 openmp-simulation:
-  # image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
-  image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
   stage: test
   needs:
-    - alma8-build
     - rocky9-build
+    - setup
 
   script:
     - ulimit -s unlimited
@@ -96,15 +107,12 @@ openmp-simulation:
       - ./tests/output_omp32
       - ./tests/output_omp1_eta
       - ./tests/output_omp32_eta
-    expire_in: 5 mins
+    expire_in: 10 mins
 
 etex-simulation:
-  # image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
-  image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
   stage: test
   when: manual
   needs:
-    - alma8-build
     - rocky9-build
 
   script:
@@ -179,4 +187,8 @@ documentation:
     - if: '$CI_COMMIT_REF_NAME == "master"'
   script:
     - cd ./documentation && mkdocs build -c --verbose
-    - sshpass -p "$WOLKE_PASSWORD" rsync -autv --delete -e "ssh -o StrictHostKeyChecking=no" /tmp/cr-site/* "$WOLKE_USER@wolke.img.univie.ac.at:/var/www/flexpart/docs"
\ No newline at end of file
+    - sshpass -p "$WOLKE_PASSWORD" rsync -autv --delete -e "ssh -o StrictHostKeyChecking=no" /tmp/cr-site/* "$WOLKE_USER@wolke.img.univie.ac.at:/var/www/flexpart/docs"
+
+# base:
+#   stage: container
+#   image: 
\ No newline at end of file
diff --git a/Dockerfile_flexpart b/Dockerfile_flexpart
index 5a9b61c3e2335068001b1ad046b2ef0193c90a7e..b21156010cdb6a06faa2557fcb59f0c27afcfa87 100644
--- a/Dockerfile_flexpart
+++ b/Dockerfile_flexpart
@@ -15,7 +15,11 @@ ARG COMMIT=0
 ENV COMMIT=$COMMIT
 COPY ./src /src
 COPY ./tests/default_options /options
-COPY ./tests/default_winds /inputs
+
+# since the new data set is larger, we download the data for the container
+RUN wget -P /inputs "https://webdata.wolke.img.univie.ac.at/flexpart/*"
+# COPY ./tests/default_winds /inputs
+
 COPY ./entrypoint.sh /entrypoint.sh
 WORKDIR /src
 #
diff --git a/src/netcdf_output_mod.f90 b/src/netcdf_output_mod.f90
index 5d8655d6cf8506079384f10027b1d73f8eab3b17..585df93fba86ffe0991f18cce93bfcb26f314352 100644
--- a/src/netcdf_output_mod.f90
+++ b/src/netcdf_output_mod.f90
@@ -2357,10 +2357,14 @@ subroutine partoutput_netcdf(itime,field,np,imass,ncid)
         call nf90_err(nf90_put_var(ncid,tempIDend,oro(0:nx-1,0:ny-1), (/ 1,1 /),(/ nx,ny /)))
         topo_written=.true.
       endif
-    else !HM or TR
+    else if (partopt(np)%name.eq.'HM') then !HM
       call nf90_err(nf90_inq_varid(ncid=ncid,name=trim(partopt(np)%short_name),varid=tempIDend))
       call nf90_err(nf90_put_var(ncid,tempIDend,hmix(0:nx-1,0:ny-1,1,memind(1)), &
         (/ tpointer_part,1,1 /),(/ 1,nx,ny /)))
+    else !TR
+      call nf90_err(nf90_inq_varid(ncid=ncid,name=trim(partopt(np)%short_name),varid=tempIDend))
+      call nf90_err(nf90_put_var(ncid,tempIDend,tropopause(0:nx-1,0:ny-1,1,memind(1)), &
+        (/ tpointer_part,1,1 /),(/ 1,nx,ny /)))      
     endif
 
   else if (partopt(np)%name.eq.'MA') then
diff --git a/tests/pathnames b/tests/pathnames
index 5bf3496bddbfbb7e1c953701243f44ab6e7cc13d..d078a55ba7f8b8c6fbf9968e92ec492f20ccfd88 100644
--- a/tests/pathnames
+++ b/tests/pathnames
@@ -1,4 +1,4 @@
 ./current/
 ./output/
-./default_winds/
+./testdata/
 ./default_winds/AVAILABLE