diff --git a/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_block.py b/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_block.py
index bf0fd024b..bc6f365d1 100644
--- a/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_block.py
+++ b/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_block.py
@@ -70,11 +70,11 @@ def ensemble_block(template_dict: Mapping) -> Mapping:
                     # 'sea_surface_temperature': 'ts_found',
                     # 'mole_fraction_of_carbon_dioxide_in_air': 'co2',
                 }
-            }
-        },
-        'pattern': '%mem%',
-        'nmembers': template_dict['ensemble_num_members'],
-        'zero padding': 3
+            },
+            'pattern': '%mem%',
+            'nmembers': template_dict['ensemble_num_members'],
+            'zero padding': 3
+        }
     }
 
     return ensemble_block
diff --git a/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_cube_mean_output.py b/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_latlon_prior_mean_output.py
similarity index 75%
rename from src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_cube_mean_output.py
rename to src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_latlon_prior_mean_output.py
index 3b9f9ca40..38c1005be 100644
--- a/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_cube_mean_output.py
+++ b/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_latlon_prior_mean_output.py
@@ -12,16 +12,17 @@
 # --------------------------------------------------------------------------------------------------
 
 
-def ensemble_cube_mean_output(template_dict: Mapping) -> Mapping:
+def ensemble_latlon_prior_mean_output(template_dict: Mapping) -> Mapping:
 
-    ensemble_cube_mean_output = {
-        'filetype': 'cube sphere history',
-        'provider': 'geos',
+    ensemble_latlon_prior_mean_output = {
+        'filetype': 'auxgrid',
+        'gridtype': 'latlon',
         'datapath': template_dict['cycle_dir'],
-        'filename': 'geos.ensemblemean.%yyyy%mm%dd_%hh%MM%ssz.nc4',
+        'filename': 'geos.prior.mean.',
         'field io names': field_io_names_ensemble
     }
 
-    return ensemble_cube_mean_output
+    return ensemble_latlon_prior_mean_output
+
 
 # --------------------------------------------------------------------------------------------------
diff --git a/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_cube_variance_output.py b/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_latlon_prior_variance_output.py
similarity index 75%
rename from src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_cube_variance_output.py
rename to src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_latlon_prior_variance_output.py
index 26234e6db..75f1f77d8 100644
--- a/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_cube_variance_output.py
+++ b/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_latlon_prior_variance_output.py
@@ -12,16 +12,17 @@
 # --------------------------------------------------------------------------------------------------
 
 
-def ensemble_cube_mean_output(template_dict: Mapping) -> Mapping:
+def ensemble_latlon_prior_variance_output(template_dict: Mapping) -> Mapping:
 
-    ensemble_cube_mean_output = {
-        'filetype': 'cube sphere history',
-        'provider': 'geos',
+    ensemble_latlon_prior_variance_output = {
+        'filetype': 'auxgrid',
+        'gridtype': 'latlon',
         'datapath': template_dict['cycle_dir'],
-        'filename': 'geos.ensemblevariance.%yyyy%mm%dd_%hh%MM%ssz.nc4',
+        'filename': 'geos.prior.variance.',
         'field io names': field_io_names_ensemble
     }
 
-    return ensemble_cube_mean_output
+    return ensemble_latlon_prior_variance_output
+
 
 # --------------------------------------------------------------------------------------------------
diff --git a/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_mean_increment_output.py b/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_mean_increment_output.py
index dd5ada5e1..0c69152ce 100644
--- a/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_mean_increment_output.py
+++ b/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/ensemble_mean_increment_output.py
@@ -7,6 +7,7 @@
 # --------------------------------------------------------------------------------------------------
 
 from collections.abc import Mapping
+from swell.configuration.jedi.interfaces.geos_atmosphere.model.shared import field_io_names_ensemble
 
 # --------------------------------------------------------------------------------------------------
 
@@ -19,17 +20,7 @@ def ensemble_mean_increment_output(template_dict: Mapping) -> Mapping:
         'filetype': 'auxgrid',
         'gridtype': 'latlon',
         'filename': f'{cycle_dir}/geos.mean-inc.',
-        'field io names': {
-            'eastward_wind': 'ua',
-            'northward_wind': 'va',
-            'air_temperature': 't',
-            'air_pressure_at_surface': 'ps',
-            'air_pressure_levels': 'pe',
-            'water_vapor_mixing_ratio_wrt_moist_air': 'q',
-            'cloud_liquid_ice': 'qi',
-            'cloud_liquid_water': 'ql',
-            'mole_fraction_of_ozone_in_air': 'o3ppmv',
-        }
+        'field io names': field_io_names_ensemble
     }
 
     return ensemble_mean_increment_output
diff --git a/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/shared.py b/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/shared.py
index 8be1deb56..4c32cf09c 100644
--- a/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/shared.py
+++ b/src/swell/configuration/jedi/interfaces/geos_atmosphere/model/shared.py
@@ -96,6 +96,7 @@
     'eastward_wind': 'ua',
     'northward_wind': 'va',
     'air_temperature': 't',
+    'air_pressure_at_surface': 'ps',
     'air_pressure_levels': 'pe',
     'water_vapor_mixing_ratio_wrt_moist_air': 'q',
     'cloud_liquid_ice': 'qi',
diff --git a/src/swell/configuration/jedi/oops/ensmeanvariance.py b/src/swell/configuration/jedi/oops/ensmeanvariance.py
index b2bea57bf..5e12051a4 100644
--- a/src/swell/configuration/jedi/oops/ensmeanvariance.py
+++ b/src/swell/configuration/jedi/oops/ensmeanvariance.py
@@ -18,8 +18,8 @@ def render_oops(self):
         oops = {
             'geometry': self.interface_model('geometry'),
             'ensemble': self.interface_model('ensemble_block'),
-            'variance output': self.interface_model('ensemble_cube_variance_output'),
-            'mean output': self.interface_model('ensemble_cube_mean_output')
+            'variance output': self.interface_model('ensemble_latlon_prior_variance_output'),
+            'mean output': self.interface_model('ensemble_latlon_prior_mean_output')
         }
 
         return oops