diff --git a/model/aero/aero_final_analysis.yaml.j2 b/model/aero/aero_final_analysis.yaml.j2
new file mode 100644
index 00000000..a2a5dbe5
--- /dev/null
+++ b/model/aero/aero_final_analysis.yaml.j2
@@ -0,0 +1,18 @@
+geometry:
+  fms initialization:
+    namelist filename: "{{aero_fv3jedi_files_path}}/fmsmpp.nml"
+    field table filename: "{{aero_fv3jedi_files_path}}/field_table"
+  akbk: "{{aero_fv3jedi_files_path}}/akbk.nc4"
+  layout:
+  - {{aero_layout_x}}
+  - {{aero_layout_y}}
+  npx: {{aero_npx_anl}}
+  npy: {{aero_npy_anl}}
+  npz: {{aero_npz_anl}}
+  field metadata override: "{{aero_fv3jedi_files_path}}/fv3jedi_fieldmetadata_restart.yaml"
+datapath: {{ aero_analysis_path }}
+prefix: aeroanl
+filetype: fms restart
+filename_core: '{{ aero_cycle_time_fv3 }}.fv_core.res.nc'
+filename_trcr: '{{ aero_cycle_time_fv3 }}.fv_tracer.res.nc'
+filename_cplr: '{{ aero_cycle_time_fv3 }}.coupler.res'
diff --git a/model/aero/aero_final_increment_cubed_sphere.yaml.j2 b/model/aero/aero_final_increment_cubed_sphere.yaml.j2
index e34a7fcf..d489b2b7 100644
--- a/model/aero/aero_final_increment_cubed_sphere.yaml.j2
+++ b/model/aero/aero_final_increment_cubed_sphere.yaml.j2
@@ -6,9 +6,9 @@ geometry:
   layout:
   - {{aero_layout_x}}
   - {{aero_layout_y}}
-  npx: {{aero_npx_anl}}
-  npy: {{aero_npy_anl}}
-  npz: {{aero_npz_anl}}
+  npx: {{aero_npx_ges}}
+  npy: {{aero_npy_ges}}
+  npz: {{aero_npz_ges}}
   field metadata override: "{{aero_fv3jedi_files_path}}/fv3jedi_fieldmetadata_restart.yaml"
 output:
   state component: