diff --git a/templates/real-from-d2-ana/prepare_date_remote.sh b/templates/real-from-d2-ana/prepare_date_remote.sh
index a8faf1ad4d138ee2ab509ec0528e1afefff1e894..ffb5a7740d392e4458a2562d0972424cfe471f84 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 )
@@ -71,8 +71,8 @@ if [ "${IC_DATA_IS_LOCAL}" != "True" ]; then
   awk '{print $1}' an_inc_file.txt | xargs -I[] ln -sf [] .
   awk '{print $1}' fg_file.txt | xargs -I[] ln -sf [] .
 
-  grib_set -s stepRange=0,dataTime=0,dataDate=${STARTDATE:0:8} "%simulation.lbc_hhl_filepath%" ${COMMON_DATE_FOLDER}/HHL.grib 
-  grib_set -s stepRange=0,dataTime=0,dataDate=${STARTDATE:0:8} "%simulation.lbc_wz_filepath%" ${COMMON_DATE_FOLDER}/WZ.grib 
+  grib_set -s stepRange=0,dataTime=$((${STARTDATE:8:10}*100)),dataDate=${STARTDATE:0:8} "%simulation.lbc_hhl_filepath%" ${COMMON_DATE_FOLDER}/HHL.grib 
+  grib_set -s stepRange=0,dataTime=$((${STARTDATE:8:10}*100)),dataDate=${STARTDATE:0:8} "%simulation.lbc_wz_filepath%" ${COMMON_DATE_FOLDER}/WZ.grib 
 
   if [ "%simulation.lbc_wz_attach%" = "True" ]; then
     grib_copy "%simulation.lbc_wz_filepath%" ${COMMON_DATE_FOLDER}/WZ.grib 
diff --git a/templates/real-from-d2-ana/prepare_lbc_remote.sh b/templates/real-from-d2-ana/prepare_lbc_remote.sh
index e052dd96de7ed3ab695fa2d7ec6a5c0f813dc70e..51b241fd88cb67dd75941bd04cc1556aa508338c 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