diff --git a/cases/icon-test/config.yaml b/cases/icon-test/config.yaml
index bb0af4fb..15904a4e 100644
--- a/cases/icon-test/config.yaml
+++ b/cases/icon-test/config.yaml
@@ -8,9 +8,11 @@ restart_step: 6
 startdate: 2018-01-01T00:00:00Z
 hstart: 0
 hstop: 12
+
 eccodes_dir: ./input/eccodes_definitions
 iconremap_bin: iconremap
 iconsub_bin: iconsub
+lateral_boundary_grid_order: lateral_boundary
 
 meteo:
     dir: ./input/meteo
diff --git a/cases/icon-test/icontools_remap_00_lbc_runjob.cfg b/cases/icon-test/icontools_remap_00_lbc_runjob.cfg
index 0195977b..6e3227f6 100755
--- a/cases/icon-test/icontools_remap_00_lbc_runjob.cfg
+++ b/cases/icon-test/icontools_remap_00_lbc_runjob.cfg
@@ -127,7 +127,7 @@ for datafilename in {datafile_list} ; do
  in_grid_filename  = '{cfg.meteo_dir}/{cfg.meteo_prefix}{cfg.inidate_yyyymmddhh}{cfg.meteo_suffix}'
  in_filename       = '{cfg.meteo_dir}/${{datafile}}'
  in_type           = 1
- out_grid_filename = '{cfg.lateral_boundary_grid_scratch}'
+ out_grid_filename = '{cfg.input_files_scratch_lateral_boundary_grid}'
  out_filename      = '{cfg.icon_input_icbc}/${{outdatafile}}_lbc.nc'
  out_type          = 2
  out_filetype      = 4
diff --git a/cases/icon-test/icontools_remap_lbc_rest_runjob.cfg b/cases/icon-test/icontools_remap_lbc_rest_runjob.cfg
index 536f1fd2..d854998c 100755
--- a/cases/icon-test/icontools_remap_lbc_rest_runjob.cfg
+++ b/cases/icon-test/icontools_remap_lbc_rest_runjob.cfg
@@ -100,7 +100,7 @@ for datafilename in {datafile_list_rest} ; do
  in_grid_filename  = '{cfg.meteo_dir}/{cfg.meteo_prefix}{cfg.inidate_yyyymmddhh}{cfg.meteo_suffix}'
  in_filename       = '{cfg.meteo_dir}/${{datafile}}'
  in_type           = 1
- out_grid_filename = '{cfg.lateral_boundary_grid_scratch}'
+ out_grid_filename = '{cfg.input_files_scratch_lateral_boundary_grid}'
  out_filename      = '{cfg.icon_input_icbc}/${{outdatafile}}_lbc.nc'
  out_type          = 2
  out_filetype      = 4
diff --git a/jobs/prepare_data.py b/jobs/prepare_data.py
index db210b67..e42325ea 100644
--- a/jobs/prepare_data.py
+++ b/jobs/prepare_data.py
@@ -50,16 +50,6 @@ def set_cfg_variables(cfg, starttime, hstart, hstop):
                                                 'input'))
         setattr(cfg, 'icon_input_icbc',
                 os.path.join(cfg.chain_root, 'icon', 'input', 'icbc'))
-        setattr(cfg, 'icon_input_oae',
-                os.path.join(cfg.chain_root, 'icon', 'input', 'OEM'))
-        setattr(cfg, 'icon_input_grid',
-                os.path.join(cfg.chain_root, 'icon', 'input', 'grid'))
-        setattr(cfg, 'icon_input_mapping',
-                os.path.join(cfg.chain_root, 'icon', 'input', 'mapping'))
-        setattr(cfg, 'icon_input_rad',
-                os.path.join(cfg.chain_root, 'icon', 'input', 'rad'))
-        setattr(cfg, 'icon_input_xml',
-                os.path.join(cfg.chain_root, 'icon', 'input', 'XML'))
         setattr(cfg, 'icon_work', os.path.join(cfg.chain_root, 'icon', 'run'))
         setattr(cfg, 'icon_output',
                 os.path.join(cfg.chain_root, 'icon', 'output'))
@@ -321,7 +311,7 @@ def main(starttime, hstart, hstop, cfg, model_cfg):
 
         else:  # non-global ICON-ART
             #-----------------------------------------------------
-            # Get datafile lists for LBC (each at 00 UTC and others)
+            # Create LBC datafile lists (each at 00 UTC and others)
             #-----------------------------------------------------
             datafile_list = []
             datafile_list_rest = []