diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 25ab893..70428b6 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -28,16 +28,6 @@ jobs:
             parflow_dir: "parflow",
             model_opts: "eCLM ParFlowGPU"
           }
-        - {
-            name: "ICON standalone",
-            use_oasis: "False",
-            model_opts: "ICON"
-          }
-#        - {
-#            name: "CLM3.5-PDAF",
-#            use_oasis: "False",
-#            model_opts: "CLM3.5 PDAF"
-#          }
         - {
             name: "eCLM-PDAF",
             use_oasis: "False",
@@ -68,7 +58,7 @@ jobs:
       VER_HYPRE: 2.33.0
       VER_ECCODES: 2.40.0
       VER_OASIS: tsmp-patches-v0.1
-      VER_ICON_UPSTREAM: release-2026.04-public
+      CHECKSUM_OASIS: 9b1d8d24efbff1ce7d2b2e4fd75249ea3a9c647c57e4c0a652dc7de695c5ec49
       MAKE_JOBS: 4
 
     steps:
@@ -328,9 +318,7 @@ jobs:
             echo "VER_ParFlow=${VER_ParFlow}" >> $GITHUB_OUTPUT
           fi
 
-          if [[ "${{ matrix.config.name }}" == "ICON standalone" ]]; then
-            echo "${{ env.VER_ICON_UPSTREAM }} => VER_ICON_UPSTREAM"
-          elif [[ "${{ matrix.config.name }}" == *"ICON"* ]]; then
+          if [[ "${{ matrix.config.name }}" == *"ICON"* ]]; then
             VER_ICON=$(cat model_versions | grep -w "icon" | cut -d' ' -f1)
             echo "${VER_ICON} => VER_ICON"
             echo "VER_ICON=${VER_ICON}" >> $GITHUB_OUTPUT
@@ -357,7 +345,11 @@ jobs:
         name: Update OASIS3-MCT submodule ${{ steps.model-versions.outputs.VER_OASIS }}
         working-directory: ${{ env.TSMP2_ROOT }}
         run: |
-          pwd && git clone -b $VER_OASIS https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct.git
+          pwd
+          wget --quiet https://datapub.fz-juelich.de/slts/sw_hpscterrys/oasis3-mct-${VER_OASIS}.tar.gz
+          echo "${CHECKSUM_OASIS}  oasis3-mct-tsmp-patches-v0.1.tar.gz" | sha256sum -c
+          tar xf oasis3-mct-${VER_OASIS}.tar.gz
+          mv oasis3-mct-${VER_OASIS} oasis3-mct
 
       - if: matrix.config.use_oasis == 'True' && steps.cache-oasis-restore.outputs.cache-hit != 'true'
         name: Cache OASIS3-MCT ${{ env.VER_OASIS }}
@@ -411,30 +403,6 @@ jobs:
         run: |
           pwd && git submodule update --init --force .
 
-      #
-      # ICON Standalone
-      #
-      - if: matrix.config.name == 'ICON standalone'
-        name: Restore cached ICON standalone ${{ env.VER_ICON_UPSTREAM }}
-        uses: actions/cache/restore@v4
-        id: cache-icon-standalone-restore
-        with:
-          path: ${{ env.TSMP2_ROOT }}/models/icon-model
-          key: ${{ matrix.config.name }}_icon-${{ env.VER_ICON_UPSTREAM }}
-
-      - if: matrix.config.name == 'ICON standalone' && steps.cache-icon-standalone-restore.outputs.cache-hit != 'true'
-        name: Update ICON standalone ${{ env.VER_ICON_UPSTREAM }}
-        working-directory: ${{ env.TSMP2_ROOT }}/models
-        run: |
-          pwd && git clone -b ${{ env.VER_ICON_UPSTREAM }} --recursive https://gitlab.dkrz.de/icon/icon-model.git
-
-      - if: matrix.config.name == 'ICON standalone' && steps.cache-icon-standalone-restore.outputs.cache-hit != 'true'
-        name: Cache ICON standalone ${{ env.VER_ICON_UPSTREAM }}
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ env.TSMP2_ROOT }}/models/icon-model
-          key: ${{ matrix.config.name }}_icon-${{ env.VER_ICON_UPSTREAM }}
-
       #
       # Pre-build checks
       #
@@ -446,10 +414,6 @@ jobs:
             echo "Entering 'oasis3-mct'"
             echo "$(git -C oasis3-mct describe --tags --always)"
           fi
-          if [[ "${{ matrix.config.name }}" == "ICON standalone" ]]; then
-            echo "Entering 'models/icon-model'"
-            echo "$(git -C models/icon-model describe --tags --always)"
-          fi
 
       - name: Check TSMP2 dependencies
         working-directory: ${{ env.DEPENDENCIES_ROOT }}
@@ -469,9 +433,6 @@ jobs:
           if [[ "${{ matrix.config.use_oasis }}" == "True" ]]; then
             MODEL_OPTS="${MODEL_OPTS} --OASIS_SRC ${TSMP2_ROOT}/oasis3-mct"
           fi
-          if [[ "${{ matrix.config.name }}" == "ICON standalone" ]]; then
-            MODEL_OPTS="${MODEL_OPTS} --ICON_SRC ${TSMP2_ROOT}/models/icon-model"
-          fi
           BUILD_TSMP2_CMD="./build_tsmp2.sh ${MODEL_OPTS} --no_update --parallel ${MAKE_JOBS}"
           echo $BUILD_TSMP2_CMD && echo ""
           eval $BUILD_TSMP2_CMD
diff --git a/.gitmodules b/.gitmodules
index 2725566..8804fde 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,7 +17,7 @@
 [submodule "models/eCLM"]
 	path = models/eCLM
 	url = https://github.com/HPSCTerrSys/eCLM.git
-	branch = master-parallel-build
+	branch = rc-0.1
 [submodule "models/oasis3-mct"]
         path = models/oasis3-mct
         url = https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct
diff --git a/env/jsc.2023.intel.psmpi b/env/jsc.2023.intel.psmpi
deleted file mode 100644
index 3b9ac71..0000000
--- a/env/jsc.2023.intel.psmpi
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-# Load modules
-module --force purge
-module use $OTHERSTAGES
-module load Stages/2023
-module load Intel/2022.1.0
-module load ParaStationMPI/5.7.0-1
-#
-module load Hypre/2.27.0-cpu
-module load Silo/4.11
-module load Tcl/8.6.12 
-#
-module load ecCodes/2.27.0 
-module load HDF5/1.12.2-serial 
-module load netCDF/4.9.0
-module load netCDF-Fortran/4.6.0
-module load PnetCDF/1.12.3
-module load cURL/7.83.0
-module load Szip/.2.1.1 
-module load Python/3.10.4
-module load NCO/5.1.3  
-module load CMake/3.23.1
-module load git/2.36.0-nodocs  
-
-module load pkgconf/.1.8.0
-
-module li
-
-# Set default compilers
-export CC=mpicc
-export FC=mpif90
-export CXX=mpicxx
-export MPI_HOME=$EBROOTPSMPI
diff --git a/env/jsc.2024.intel.psmpi b/env/jsc.2024.intel.psmpi
deleted file mode 100644
index 2908f65..0000000
--- a/env/jsc.2024.intel.psmpi
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-# Load modules
-module --force purge
-module use $OTHERSTAGES
-module load Stages/2024
-module load Intel/2023.2.1
-module load ParaStationMPI/5.9.2-1
-#module load IntelMPI/2021.10.0
-
-#
-module load Hypre/2.31.0-cpu
-module load Silo/4.11.1
-module load Tcl/8.6.13
-#
-module load ecCodes/2.31.0
-module load HDF5/1.14.2
-module load netCDF/4.9.2
-module load netCDF-Fortran/4.6.1
-module load PnetCDF/1.12.3
-module load cURL/8.0.1
-module load Szip/.2.1.1
-module load Python/3.11.3
-module load NCO/5.1.8
-module load CMake/3.26.3
-module load git/2.41.0-nodocs
-
-# Set default compilers
-export CC=mpicc
-export FC=mpif90
-export CXX=mpicxx
-export MPI_HOME=$EBROOTPSMPI
-
-# Display compiler settings
-module li
-echo "====================================== COMPILER SETTINGS ======================================"
-echo " Machine: ${SYSTEMNAME} on Stages/$STAGE"
-echo " MPI lib: $(mpichversion | head -n 1 | tr -d =)"
-echo "       C: $($CC --version | head -n 1)"
-echo "     C++: $($CXX --version | head -n 1)"
-echo " Fortran: $($FC --version | head -n 1)"
-echo "==============================================================================================="
-echo ""
-
diff --git a/models/eCLM b/models/eCLM
index 8d9ca1e..9c8f1ae 160000
--- a/models/eCLM
+++ b/models/eCLM
@@ -1 +1 @@
-Subproject commit 8d9ca1ea7a3418335527568417a889ef3f259634
+Subproject commit 9c8f1ae22afc9e47ffee46f24da4fb367736c77f