diff --git a/templates/real-from-d2-ana/prepare_lbc_remote.sh b/templates/real-from-d2-ana/prepare_lbc_remote.sh
index c714d61f56c6d7567343f7fcd5e76cc0211ff429..273ef177c9a480847c5a28f36a9eed403616dab0 100644
--- a/templates/real-from-d2-ana/prepare_lbc_remote.sh
+++ b/templates/real-from-d2-ana/prepare_lbc_remote.sh
@@ -22,6 +22,7 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then
 
   # Define date directory, create it and go there
   COMMON_DATE_FOLDER=${WORKDIR}/${STARTDATE}/inidata
+  COMMON_GRID_FOLDER=${WORKDIR}/inidata
 
   AN_MEMBER=$(printf "%03d" %SIMULATION.BOUNDARY_CONDITIONS.MEMBER%)
   BOUNDARY_CONDITIONS_PARENT_FOLDER=%SIMULATION.BOUNDARY_CONDITIONS.PARENT_FOLDER%
@@ -60,11 +61,11 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then
 
     # Convert ICON-EU-EPS to latbc
     ${WORKDIR}/%python_environment.folder_name%/bin/python3 ${WORKDIR}/proj/templates/real-from-d2-ana/icon-remap-helper.py \
-        --src-grid ${COMMON_DATE_FOLDER}/${PARENT_GRID_FILE} \
-        --dst-grid ${COMMON_DATE_FOLDER}/${BOUNDARY_GRID_FILE} \
+        --src-grid ${COMMON_GRID_FOLDER}/${PARENT_GRID_FILE} \
+        --dst-grid ${COMMON_GRID_FOLDER}/${BOUNDARY_GRID_FILE} \
         --source   work/iefff${EU_FC_TIME}0000.m${AN_MEMBER} \
         --dest ${COMMON_DATE_FOLDER}/latbc_${D2_FC_TIME}00.m${AN_MEMBER} \
-        --output-format grib
+        --output-format grb
   done
 
   # Fetch tar.gz file of ICON-EU-EPS outputs necessary for the lateral boundary conditions