diff --git a/templates/real-from-d2-ana/icon-remap-helper.py b/templates/real-from-d2-ana/icon-remap-helper.py
index 50e9df9725e10a3a24db16207497ff6773fc7667..c08ebfed0470ccc854675fb27c781a3ec3e15230 100644
--- a/templates/real-from-d2-ana/icon-remap-helper.py
+++ b/templates/real-from-d2-ana/icon-remap-helper.py
@@ -184,11 +184,9 @@ def remap_one_file(in_grid, out_grid, one_file, dst_fodler, rename=None, src_vgr
     filename, ext = os.path.splitext(rename)
     if args.output_format == "grb":
         ext = ".grb"
+        out_filetype = 2
     elif args.output_format == "nc":
         ext = ".nc"
-    if ext in [".grib", ".grb", ".grib2", ".grb2"]:
-        out_filetype = 2
-    else:
         out_filetype = 4
     rename = filename + ext
 
diff --git a/templates/real-from-d2-ana/prepare_lbc_remote.sh b/templates/real-from-d2-ana/prepare_lbc_remote.sh
index 1be8be901654c3a830388b1625ecfb39760d8135..31e473dbd355f6ac0768c20904bb130a26a9fb7b 100644
--- a/templates/real-from-d2-ana/prepare_lbc_remote.sh
+++ b/templates/real-from-d2-ana/prepare_lbc_remote.sh
@@ -99,7 +99,7 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then
 
 
   # Fetch tar.gz file of ICON-EU-EPS outputs necessary for the lateral boundary conditions
-  LBC_SOURCE=$(find ${MEMBER_DIR} -name "latbc_*00.${MEMBER,}.grib" | sort -n )
+  LBC_SOURCE=$(find ${MEMBER_DIR} -name "latbc_*00.${MEMBER^}.grib" | sort -n )
 
   if [ -z "${LBC_SOURCE}" ]; then
     echo "Failed to make boundary conditions file for date ${STARTDATE}!"