diff --git a/conf/real-from-d2-ana/simulation.yml b/conf/real-from-d2-ana/simulation.yml
index 6a4e61f1ce54495e49123b5312505fe3821a2bc2..5de3e4841b702b2cf99202afb1faa247f85cd86b 100644
--- a/conf/real-from-d2-ana/simulation.yml
+++ b/conf/real-from-d2-ana/simulation.yml
@@ -10,6 +10,8 @@ simulation:
     # Path to the namelists
     master: "%HPCROOTDIR%/proj/namelists/common/icon_master.namelist"
     atmosphere: "%HPCROOTDIR%/proj/namelists/real-from-d2-ana/icon_atmosphere.namelist"
+    ana_map: "%HPCROOTDIR%/proj/namelists/real-from-d2-ana/map_file.ana"
+    lbc_map: "%HPCROOTDIR%/proj/namelists/real-from-d2-ana/map_file.lbc"
 
   # List of output file names that will be copied (Wildcards * allowed)
   output_file_names: "idfrf*.nc"
diff --git a/namelists/real-from-d2-ana/icon_atmosphere.namelist b/namelists/real-from-d2-ana/icon_atmosphere.namelist
index ef9abb7332c80d82c98ddf2f052661490038ae89..894efcd8ab359389421c8b284368f4c969f204e8 100644
--- a/namelists/real-from-d2-ana/icon_atmosphere.namelist
+++ b/namelists/real-from-d2-ana/icon_atmosphere.namelist
@@ -270,7 +270,6 @@
 &output_nml
  filetype                    = 4
  output_time_unit            = 1      ! 1: seconds
- file_interval               = 'PT3600S'
  output_interval             = 'PT3600S'
  output_start                = '#OUTPUT_START#'
  output_end                  = '#OUTPUT_END#'
@@ -297,7 +296,6 @@
 &output_nml
  filetype                    = 4
  output_time_unit            = 1      ! 1: seconds
- file_interval               = 'PT3600S'
  output_interval             = 'PT3600S'
  output_start                = '#OUTPUT_START#'
  output_end                  = '#OUTPUT_END#'
@@ -323,7 +321,6 @@
 &output_nml
  filetype                    = 4
  output_time_unit            = 1      ! 1: seconds
- file_interval               = 'PT3600S'
  output_interval             = 'PT3600S'
  output_start                = '#OUTPUT_START#'
  output_end                  = '#OUTPUT_END#'
diff --git a/namelists/real-from-d2-ana/map_file.ana b/namelists/real-from-d2-ana/map_file.ana
new file mode 100644
index 0000000000000000000000000000000000000000..f668ad4e949ff3a6a337940539332e968306dbf3
--- /dev/null
+++ b/namelists/real-from-d2-ana/map_file.ana
@@ -0,0 +1,46 @@
+# internal name     GRIB2 shortName
+theta_v             THETA_V
+theta             THETA
+rho                 DEN
+vn                  VN
+u                   U
+v                   V
+w                   W
+tke                 TKE
+temp                T
+pres                P
+qv                  QV
+qc                  QC
+qi                  QI
+qr                  QR
+qs                  QS
+qg                  QG
+rh                  RH
+t_g                 T_G
+qv_s                QV_S
+fr_seaice           FR_ICE
+t_ice               T_ICE
+h_ice               H_ICE
+t_snow              T_SNOW
+freshsnow           FRESHSNW
+snowfrac_lc         SNOWC
+w_snow              W_SNOW
+rho_snow            RHO_SNOW
+h_snow              H_SNOW
+w_i                 W_I
+w_so                W_SO
+w_so_ice            W_SO_ICE
+t_so                T_SO
+smi                 SMI
+gz0                 Z0
+pres_sfc            PS
+z_ifc               z_ifc
+t_mnw_lk            T_MNW_LK
+t_wml_lk            T_WML_LK
+h_ml_lk             H_ML_LK
+t_bot_lk            T_BOT_LK
+c_t_lk              C_T_LK
+t_b1_lk             T_B1_LK
+h_b1_lk             H_B1_LK
+relhum              RH
+hhl                 FI
diff --git a/namelists/real-from-d2-ana/map_file.latbc b/namelists/real-from-d2-ana/map_file.latbc
new file mode 100644
index 0000000000000000000000000000000000000000..4ee10bd92db33251232048ada22621a44b14896b
--- /dev/null
+++ b/namelists/real-from-d2-ana/map_file.latbc
@@ -0,0 +1,22 @@
+# Dictionary for mapping between internal names and GRIB2 shortNames
+# needed by GRIB2 read procedures.
+#
+# internal name     GRIB2 shortName
+u                   U
+v                   V
+w                   W
+temp                T
+pres                P
+qv                  QV
+qc                  QC
+qi                  QI
+qr                  QR
+qs                  QS
+pres_sfc            LNPS
+z_ifc               HHL
+vn                  VN
+GEOSP               GEOP_SFC
+GEOP_ML             GEOP_ML
+theta_v             THETA_V
+rho                 DEN
+
diff --git a/templates/real-from-d2-ana/prepare_experiment.sh b/templates/real-from-d2-ana/prepare_experiment.sh
index c24e2cb33cd31302ef8211745939ab8d0f206197..76ee38e402e15accde14820f31f59079e5688ba8 100644
--- a/templates/real-from-d2-ana/prepare_experiment.sh
+++ b/templates/real-from-d2-ana/prepare_experiment.sh
@@ -45,5 +45,8 @@ ln -sf "${ICON_DATA_PATH}/dmin_wetgrowth_graupelhail_cosmo5.nc" "dmin_wetgrowth_
 ln -sf "${ICON_DATA_PATH}/ECHAM6_CldOptProps.nc" .
 ln -sf "${ICON_BASE_PATH}/run/ana_varnames_map_file.txt" .
 
+cp "%simulation.namelist_paths.ana_map%" .
+cp "%simulation.namelist_paths.lbc_map%" .
+
 # Change permissions to read only.
 chmod 440 ./*
\ No newline at end of file