diff --git a/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE b/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE
index 01af77de39e..f6060eedba1 100755
--- a/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE
+++ b/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE
@@ -15,6 +15,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlfinal" -c "base aeroanl aeroan
 # Generate COM variables from templates
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMOUT_CHEM_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \
+    COMOUT_CONF:COM_CONF_TMPL \
     COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL
 
 ###############################################################
diff --git a/parm/archive/gdas.yaml.j2 b/parm/archive/gdas.yaml.j2
index 1cba9f8a658..3ae20cb096f 100644
--- a/parm/archive/gdas.yaml.j2
+++ b/parm/archive/gdas.yaml.j2
@@ -30,6 +30,15 @@ gdas:
         - "logs/{{ cycle_YMDH }}/{{ RUN }}_ocnanalecen.log"
                 {% endif %}
             {% endif %}
+            {% if DO_AERO_ANL %}
+        - "logs/{{ cycle_YMDH }}/gdas_aeroanlgenb.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlinit.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlvar.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlfinal.log"
+            {% endif %}
+            {% if DO_JEDISNOWDA %}
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_snowanl.log"
+            {% endif %}
 
         # Analysis GRIB2 (sub-sampled) data
         - "{{ COMIN_ATMOS_GRIB_0p25 | relpath(ROTDIR) }}/{{ head }}pgrb2.0p25.anl"
@@ -70,13 +79,24 @@ gdas:
             {% endif %}
             {% if DO_AERO_ANL %}
         - "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/{{ head }}aerostat.tgz"
+        - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}aerovar.yaml"
+                {% for itile in range(1,7) %}
+        - "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/aeroinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.fv_tracer.res.tile{{ itile }}.nc"
+                {% endfor %}
             {% endif %}
             {% if DO_PREP_OBS_AERO %}
         - "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}aeroobs"
         - "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}aerorawobs"
             {% endif %}
+
+        # Snow analysis data
             {% if DO_JEDISNOWDA %}
+                {% for itile in range(1,7) %}
+        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/snowinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc"
+        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc"
+                {% endfor %}
         - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snowstat.tgz"
+        - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}snowanlvar.yaml"
             {% endif %}
 
         # Ozone verification
diff --git a/parm/archive/gdas_restarta.yaml.j2 b/parm/archive/gdas_restarta.yaml.j2
index 46eea018c61..252aa748959 100644
--- a/parm/archive/gdas_restarta.yaml.j2
+++ b/parm/archive/gdas_restarta.yaml.j2
@@ -42,20 +42,6 @@ gdas_restarta:
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}rad_varbc_params.tar"
         {% endif %}
 
-        # Snow surface data
-        {% if DO_JEDISNOWDA %}
-        {% for itile in range(1,7) %}
-        # Snow analysis is 3dvar
-        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/snowinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc"
-        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc"
-        {% endfor %}
-        {% endif %}
-
-        # Snow configuration yaml
-        {% if DO_JEDISNOWDA %}
-        - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}snowanlvar.yaml"
-        {% endif %}
-
         # Input BUFR files
         - "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}nsstbufr"
         - "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}prepbufr"
diff --git a/parm/gdas/aero_finalize_variational.yaml.j2 b/parm/gdas/aero_finalize_variational.yaml.j2
index 67deb413017..8a185257085 100644
--- a/parm/gdas/aero_finalize_variational.yaml.j2
+++ b/parm/gdas/aero_finalize_variational.yaml.j2
@@ -12,7 +12,7 @@ mkdir:
 - "{{ COMOUT_ATMOS_RESTART }}"
 copy:
 ## copy variational YAML to ROTDIR
-- ["{{ DATA }}/aeroanlvar.yaml", "{{ COMOUT_CHEM_ANALYSIS }}/{{ APREFIX }}aerovar.yaml"]
+- ["{{ DATA }}/aeroanlvar.yaml", "{{ COMOUT_CONF }}/{{ APREFIX }}aerovar.yaml"]
 ## copy increments
 {% for tile in range(1,ntiles+1) %}
 - ["{{ DATA }}/anl/aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile{{ tile }}.nc", "{{ COMOUT_CHEM_ANALYSIS }}/aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile{{ tile }}.nc"]