diff --git a/templates/real-from-d2-ana/prepare_date_remote.sh b/templates/real-from-d2-ana/prepare_date_remote.sh
index a8faf1ad4d138ee2ab509ec0528e1afefff1e894..0f0370247d78e9ae4a892aa09948e9595b9587d1 100644
--- a/templates/real-from-d2-ana/prepare_date_remote.sh
+++ b/templates/real-from-d2-ana/prepare_date_remote.sh
@@ -27,7 +27,7 @@ if [ "${IC_DATA_IS_LOCAL}" != "True" ]; then
 
   # Exploit the number from the member name
   INITIAL_CONDITIONS_PARENT_FOLDER=%SIMULATION.INITIAL_CONDITIONS.PARENT_FOLDER%
-  INITIAL_CONDITIONS_PATH=${INITIAL_CONDITIONS_PARENT_FOLDER}/${STARTDATE:0:8}00
+  INITIAL_CONDITIONS_PATH=${INITIAL_CONDITIONS_PARENT_FOLDER}/${STARTDATE:0:10}
 
   AN_SOURCE=$(find ${INITIAL_CONDITIONS_PATH} -name "an_R19B07.*00_an.*" | sort -n )
   AN_INC_SOURCE=$(find ${INITIAL_CONDITIONS_PATH} -name "an_R19B07.*00_inc.*" | sort -n )
diff --git a/templates/real-from-d2-ana/prepare_lbc_remote.sh b/templates/real-from-d2-ana/prepare_lbc_remote.sh
index e052dd96de7ed3ab695fa2d7ec6a5c0f813dc70e..175e437ace478bf51198e1a1086c4f2779ab9d35 100644
--- a/templates/real-from-d2-ana/prepare_lbc_remote.sh
+++ b/templates/real-from-d2-ana/prepare_lbc_remote.sh
@@ -38,7 +38,7 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then
 
   # Leave out the character part
   BOUNDARY_CONDITIONS_PARENT_FOLDER=%SIMULATION.BOUNDARY_CONDITIONS.PARENT_FOLDER%
-  BOUNDARY_CONDITIONS_PATH=${BOUNDARY_CONDITIONS_PARENT_FOLDER}/${STARTDATE:0:8}00
+  BOUNDARY_CONDITIONS_PATH=${BOUNDARY_CONDITIONS_PARENT_FOLDER}/${STARTDATE:0:10}
 
 
   # Fetch tar.gz file of ICON-EU-EPS outputs necessary for the lateral boundary conditions
@@ -53,7 +53,7 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then
   fi
 
   # make a working directory for converting boundary conditions
-  mkdir -p work/${MEMBER} || exit
+  mkdir -p work/${STARTDATE}/${MEMBER} || exit
 
   tar -zxvf ${FC_TAR_SOURCE} -C work
 
@@ -80,20 +80,20 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then
     ${WORKDIR}/%python_environment.folder_name%/bin/python3 ${WORKDIR}/proj/templates/real-from-d2-ana/icon-remap-helper.py \
         --src-grid ${COMMON_GRID_FOLDER}/${PARENT_GRID_FILE} \
         --dst-grid ${COMMON_GRID_FOLDER}/${BOUNDARY_GRID_FILE} \
-        --source   work/iefff${EU_FC_TIME}0000.${MEMBER,} \
-        --dest work/${MEMBER} \
+        --source   work/${STARTDATE}/iefff${EU_FC_TIME}0000.${MEMBER,} \
+        --dest work/${STARTDATE}/${MEMBER} \
         --output-format grb
 
     # compensate missing vertical wind field
     if [ $((tt2 % 3)) -ne 0 ]; then
-      grib_copy work/${MEMBER}/iefff${EU_FC_TIME}0000.grb work/${MEMBER}/iefff${EU_FC_TIME}0000.grb_t -w shortName!=wz
-      mv work/${MEMBER}/iefff${EU_FC_TIME}0000.grb_t work/${MEMBER}/iefff${EU_FC_TIME}0000.grb
-      grib_set -s stepRange=$((tt2 * 60)),dataTime=0,dataDate=${STARTDATE:0:8} ${COMMON_DATE_FOLDER}/WZ.grib  work/${MEMBER}/WZ.grib
-      cat work/${MEMBER}/WZ.grib >> work/${MEMBER}/iefff${EU_FC_TIME}0000.grb
+      grib_copy work/${STARTDATE}/${MEMBER}/iefff${EU_FC_TIME}0000.grb work/${STARTDATE}/${MEMBER}/iefff${EU_FC_TIME}0000.grb_t -w shortName!=wz
+      mv wor/${STARTDATE}k/${MEMBER}/iefff${EU_FC_TIME}0000.grb_t work/${STARTDATE}/${MEMBER}/iefff${EU_FC_TIME}0000.grb
+      grib_set -s stepRange=$((tt2 * 60)),dataTime=0,dataDate=${STARTDATE:0:8} ${COMMON_DATE_FOLDER}/WZ.grib  work/${STARTDATE}/${MEMBER}/WZ.grib
+      cat work/${STARTDATE}/${MEMBER}/WZ.grib >> work/${STARTDATE}/${MEMBER}/iefff${EU_FC_TIME}0000.grb
     fi
 
     # rename to the comfortable style for ICON
-    mv work/${MEMBER}/iefff${EU_FC_TIME}0000.grb ${MEMBER_DIR}/latbc_${D2_FC_TIME}.${MEMBER^}.grib
+    mv work/${STARTDATE}/${MEMBER}/iefff${EU_FC_TIME}0000.grb ${MEMBER_DIR}/latbc_${D2_FC_TIME}.${MEMBER^}.grib
 
   done
 
@@ -102,8 +102,8 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then
   cat ${COMMON_DATE_FOLDER}/HHL.grib >> ${MEMBER_DIR}/latbc_00000.${MEMBER^}.grib
 
   # clean up the working directory
-  rm -r work/${MEMBER}
-  rm -r work/iefff*.${MEMBER,}
+  rm -r work/${STARTDATE}/${MEMBER}
+  rm -r work/${STARTDATE}/iefff*.${MEMBER,}
 
 
   # Fetch tar.gz file of ICON-EU-EPS outputs necessary for the lateral boundary conditions