diff --git a/key_files/ma_aeu.yml b/key_files/ma_aeu.yml
index b272f033..3f277cc7 100644
--- a/key_files/ma_aeu.yml
+++ b/key_files/ma_aeu.yml
@@ -3,7 +3,7 @@ name: AEU #AtlanticEquatorialUndercurent
 units: Sv
 dimensions: 1
 model: NEMO
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_U*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_U*.nc
 modelgrid       : eORCA025
 model_vars: uo
 model_convert:
diff --git a/key_files/ma_ammonium.yml b/key_files/ma_ammonium.yml
index 04bae9a4..a86a9843 100644
--- a/key_files/ma_ammonium.yml
+++ b/key_files/ma_ammonium.yml
@@ -4,7 +4,7 @@ units           : mmol N/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : N4_n
 model_convert   : NoChange
diff --git a/key_files/ma_amoc_26n.yml b/key_files/ma_amoc_26n.yml
index 40a011cc..cb0a0aca 100644
--- a/key_files/ma_amoc_26n.yml
+++ b/key_files/ma_amoc_26n.yml
@@ -4,7 +4,7 @@ name: AMOC_26N
 units: Sv
 dimensions: 1
 model: NEMO
-modelFiles      : $BASEDIR_MODEL/$JOBID/**_1m_*grid_V*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_V*.nc
 modelgrid       : eORCA025
 model_vars: vo
 model_convert:
diff --git a/key_files/ma_dic.yml b/key_files/ma_dic.yml
index ddb8e1dc..e8140b8f 100644
--- a/key_files/ma_dic.yml
+++ b/key_files/ma_dic.yml
@@ -4,7 +4,7 @@ units           : mmol C/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/**_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : O3_c
 model_convert   : NoChange
diff --git a/key_files/ma_drake.yml b/key_files/ma_drake.yml
index 6299c09d..d4b79187 100644
--- a/key_files/ma_drake.yml
+++ b/key_files/ma_drake.yml
@@ -3,7 +3,7 @@ name: DrakePassageTransport
 units: Sv
 dimensions: 1
 model: NEMO
-modelFiles      : $BASEDIR_MODEL/$JOBID/**_1m_*grid_U*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_U*.nc
 modelgrid       : eORCA025
 model_vars: uo
 model_convert:
diff --git a/key_files/ma_gpp.yml b/key_files/ma_gpp.yml
index 60daa286..56058c30 100644
--- a/key_files/ma_gpp.yml
+++ b/key_files/ma_gpp.yml
@@ -4,7 +4,7 @@ units           : ""
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*diag_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : Ptot_GPP_result
 model_convert   : NoChange
diff --git a/key_files/ma_iron.yml b/key_files/ma_iron.yml
index e9ab964b..b8e73fb6 100644
--- a/key_files/ma_iron.yml
+++ b/key_files/ma_iron.yml
@@ -4,7 +4,7 @@ units           : umol Fe/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : N7_f
 model_convert   : NoChange
diff --git a/key_files/ma_mld.yml b/key_files/ma_mld.yml
index 23732889..bdaadbc9 100644
--- a/key_files/ma_mld.yml
+++ b/key_files/ma_mld.yml
@@ -4,7 +4,7 @@ units           : m
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_convert   : choose_best_var  
 model_vars      : somxzint1 mldr10_1
diff --git a/key_files/ma_mld_sigma.yml b/key_files/ma_mld_sigma.yml
index eba56b17..e22254d3 100644
--- a/key_files/ma_mld_sigma.yml
+++ b/key_files/ma_mld_sigma.yml
@@ -4,7 +4,7 @@ units           : m
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : mldr10_1
 layers          : layerless
diff --git a/key_files/ma_nitrate.yml b/key_files/ma_nitrate.yml
index 90924791..869900a6 100644
--- a/key_files/ma_nitrate.yml
+++ b/key_files/ma_nitrate.yml
@@ -4,7 +4,7 @@ units           : mmol N/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : N3_n
 model_convert   : NoChange
diff --git a/key_files/ma_northerntotaliceextent.yml b/key_files/ma_northerntotaliceextent.yml
index a1745651..6ecb3db6 100644
--- a/key_files/ma_northerntotaliceextent.yml
+++ b/key_files/ma_northerntotaliceextent.yml
@@ -3,7 +3,7 @@ name            : NorthernTotalIceExtent
 units           : 1E6 km^2
 dimensions      : 1
 model           : CICE
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc   
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_T*.nc
 model_vars      : soicecov
 model_convert:
     path: bgcval2/functions/ice.py
diff --git a/key_files/ma_npp.yml b/key_files/ma_npp.yml
index eafa4541..5f94bcb0 100644
--- a/key_files/ma_npp.yml
+++ b/key_files/ma_npp.yml
@@ -4,7 +4,7 @@ units           : ""
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*diag_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : Ptot_NPP_result
 model_convert   : NoChange
diff --git a/key_files/ma_o2.yml b/key_files/ma_o2.yml
index 4830b9c8..832d2801 100644
--- a/key_files/ma_o2.yml
+++ b/key_files/ma_o2.yml
@@ -4,7 +4,7 @@ units           : mmol O_2/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : O2_o
 model_convert   : NoChange
diff --git a/key_files/ma_p1c.yml b/key_files/ma_p1c.yml
index e4d1e04e..826f89de 100644
--- a/key_files/ma_p1c.yml
+++ b/key_files/ma_p1c.yml
@@ -4,7 +4,7 @@ units           : mg C/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : P1_c
 model_convert   : NoChange
diff --git a/key_files/ma_ph.yml b/key_files/ma_ph.yml
index a929ec32..9b55f665 100644
--- a/key_files/ma_ph.yml
+++ b/key_files/ma_ph.yml
@@ -4,7 +4,7 @@ units           : None
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : O3_pH
 model_convert   : NoChange
diff --git a/key_files/ma_phosphate.yml b/key_files/ma_phosphate.yml
index 0158515b..3cd26121 100644
--- a/key_files/ma_phosphate.yml
+++ b/key_files/ma_phosphate.yml
@@ -4,7 +4,7 @@ units           : mmol P/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : N1_p
 model_convert   : NoChange
diff --git a/key_files/ma_silicate.yml b/key_files/ma_silicate.yml
index c651fc53..4e364ff7 100644
--- a/key_files/ma_silicate.yml
+++ b/key_files/ma_silicate.yml
@@ -4,7 +4,7 @@ units           : mmol Si/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : N5_s
 model_convert   : NoChange
diff --git a/key_files/ma_southerntotaliceextent.yml b/key_files/ma_southerntotaliceextent.yml
index f965a1c7..eee63f1a 100644
--- a/key_files/ma_southerntotaliceextent.yml
+++ b/key_files/ma_southerntotaliceextent.yml
@@ -3,7 +3,7 @@ name            : SouthernTotalIceExtent
 units           : 1E6 km^2
 dimensions      : 1
 model           : CICE
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_T*.nc
 model_vars      : soicecov
 model_convert:
     path: bgcval2/functions/ice.py
diff --git a/key_files/ma_sss.yml b/key_files/ma_sss.yml
index 8887d416..e049a85a 100644
--- a/key_files/ma_sss.yml
+++ b/key_files/ma_sss.yml
@@ -4,7 +4,7 @@ units           : PSU
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : so_abs so
   # dataFile        : /data/sthenno1/scratch/ledm/Observations/WOA/annual/woa13_decav_s00_01v2_AMM.nc
diff --git a/key_files/ma_sst.yml b/key_files/ma_sst.yml
index 639870b7..278bf75f 100644
--- a/key_files/ma_sst.yml
+++ b/key_files/ma_sst.yml
@@ -4,7 +4,7 @@ units           : degrees C
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : thetao thetao_con votemper
 model_convert   : choose_best_var
diff --git a/key_files/ma_ta.yml b/key_files/ma_ta.yml
index 9f8c7811..09f0945a 100644
--- a/key_files/ma_ta.yml
+++ b/key_files/ma_ta.yml
@@ -4,7 +4,7 @@ units           : umol/kg
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : O3_TA
 model_convert   : NoChange
diff --git a/key_files/ma_totalairseafluxco2.yml b/key_files/ma_totalairseafluxco2.yml
index cdb59bc5..249a7d46 100644
--- a/key_files/ma_totalairseafluxco2.yml
+++ b/key_files/ma_totalairseafluxco2.yml
@@ -4,7 +4,7 @@ units           : Pg C/yr
 model           : NEMO-ERSEM
 modelgrid       : eORCA025
 dimensions      : 1
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*diag_T*.nc
 model_vars      : O3_fair
 model_convert   :
     path: bgcval2/functions/AirSeaFluxCO2.py
diff --git a/key_files/ma_totalchlorophyll.yml b/key_files/ma_totalchlorophyll.yml
index 8079db9b..b2e00e80 100644
--- a/key_files/ma_totalchlorophyll.yml
+++ b/key_files/ma_totalchlorophyll.yml
@@ -4,7 +4,7 @@ units           : ""
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*diag_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : Ptot_Chl_result
 model_convert   : NoChange
diff --git a/key_files/ma_totaliceextent.yml b/key_files/ma_totaliceextent.yml
index c2562d05..a8fbbeff 100644
--- a/key_files/ma_totaliceextent.yml
+++ b/key_files/ma_totaliceextent.yml
@@ -4,7 +4,7 @@ name            : TotalIceExtent
 units           : 1E6 km^2
 dimensions      : 1
 model           : NEMO-ERSEM
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc   
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_T*.nc
 model_vars      : soicecov
 model_convert:
     path: bgcval2/functions/ice.py
diff --git a/key_files/ma_totalintgpp.yml b/key_files/ma_totalintgpp.yml
index 108f2ae9..e96d18ad 100644
--- a/key_files/ma_totalintgpp.yml
+++ b/key_files/ma_totalintgpp.yml
@@ -2,7 +2,7 @@
 name            : TotalIntGPP
 units           : Gt/yr
 dimensions      : 1
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*diag_T*.nc
 model_vars      : Ptot_NPP_result
 model_convert   :
     path: bgcval2/functions/TotalIntPP.py
diff --git a/key_files/ma_totalintnpp.yml b/key_files/ma_totalintnpp.yml
index d931cbed..0cd3ce7b 100644
--- a/key_files/ma_totalintnpp.yml
+++ b/key_files/ma_totalintnpp.yml
@@ -2,7 +2,7 @@
 name            : TotalIntNPP
 units           : Gt/yr
 dimensions      : 1
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*diag_T*.nc
 model_vars      : Ptot_NPP_result
 model_convert   :
     path: bgcval2/functions/TotalIntPP.py
diff --git a/key_files/ma_totalphytoc.yml b/key_files/ma_totalphytoc.yml
index 4ab925d1..8d29f1b7 100644
--- a/key_files/ma_totalphytoc.yml
+++ b/key_files/ma_totalphytoc.yml
@@ -4,7 +4,7 @@ units           : mg C/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*diag_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : Ptot_c_result
 model_convert   : NoChange
diff --git a/key_files/ma_totalzooc.yml b/key_files/ma_totalzooc.yml
index 32f61327..1391278b 100644
--- a/key_files/ma_totalzooc.yml
+++ b/key_files/ma_totalzooc.yml
@@ -4,7 +4,7 @@ units           : mg C/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*diag_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : Ztot_c_result
 model_convert   : NoChange
diff --git a/key_files/ma_zos.yml b/key_files/ma_zos.yml
index a8fc799e..3e6d3440 100644
--- a/key_files/ma_zos.yml
+++ b/key_files/ma_zos.yml
@@ -4,7 +4,7 @@ units           : m
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*/*/*_1m_*grid_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : zos
 layers          : layerless