diff --git a/.gitmodules b/.gitmodules
index 6744bbaa47..769f63a796 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,7 +5,7 @@
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
-  branch = dev/ufs-weather-model
+  branch = production/GFS.v17
 [submodule "stochastic_physics"]
   path = stochastic_physics
   url = https://github.com/NOAA-PSL/stochastic_physics
diff --git a/UFSATM b/UFSATM
index f6ddb2e205..b9d0fcfb54 160000
--- a/UFSATM
+++ b/UFSATM
@@ -1 +1 @@
-Subproject commit f6ddb2e2056d148b875180068d821e34f1047024
+Subproject commit b9d0fcfb54ed7201561576463f901f39bfd09f9d
diff --git a/WW3 b/WW3
index b6db1fc588..3b0b16feb6 160000
--- a/WW3
+++ b/WW3
@@ -1 +1 @@
-Subproject commit b6db1fc588ad7055247128174245615b2c20c242
+Subproject commit 3b0b16feb66598b699fc08877189b481b1805a53
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index fecdd4f76f..9f5e9b84a2 100644
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -630,7 +630,7 @@ export_mpas ()
     export OUTPUT_GRID="'mpas'"
     export OUTPUT_FILE="'netcdf'"
     export ZSTANDARD_LEVEL=0
-
+    export ZSTANDARD_LEVEL_RST=0
     export DOMAINS_STACK_SIZE=3000000
 }
 
@@ -912,7 +912,9 @@ export FILENAME_BASE="'atm' 'sfc'"
 export OUTPUT_GRID="'cubed_sphere_grid'"
 export OUTPUT_FILE="'netcdf'"
 export ZSTANDARD_LEVEL=0
+export ZSTANDARD_LEVEL_RST=0
 export IDEFLATE=0
+export IDEFLATE_RST=0
 export QUANTIZE_NSD=0
 export ICHUNK2D=0
 export JCHUNK2D=0
@@ -1654,6 +1656,7 @@ export_mom6() {
   export MOM6_USE_LI2016=True
   export MOM6_TOPOEDITS=''
   export MOM6_HFREEZE=20.0
+  export MOM6_WRITE_GEOM=2
   # since CPL_SLOW is set to DT_THERM, this should be always be false
   export MOM6_THERMO_SPAN=False
   export MOM6_USE_WAVES=True
@@ -2119,7 +2122,9 @@ export_hafs_regional ()
   export OUTPUT_GRID="'regional_latlon'"
   export OUTPUT_FILE="'netcdf'"
   export ZSTANDARD_LEVEL=0
+  export ZSTANDARD_LEVEL_RST=0
   export IDEFLATE=0
+  export IDEFLATE_RST=0
   export QUANTIZE_NSD=0
   export CEN_LON=-62.0
   export CEN_LAT=25.0
diff --git a/tests/parm/MOM_input_025.IN b/tests/parm/MOM_input_025.IN
index 07dc99f72e..79c43f2d0b 100644
--- a/tests/parm/MOM_input_025.IN
+++ b/tests/parm/MOM_input_025.IN
@@ -104,7 +104,7 @@ DEFAULT_ANSWER_DATE = 20250818  ! default = 99991231
                                 ! This sets the default value for the various _ANSWER_DATE parameters.
 WAVE_INTERFACE_ANSWER_DATE = 20230101
 
-WRITE_GEOM = 2                  ! default = 1
+WRITE_GEOM = @[MOM6_WRITE_GEOM] ! default = 1
                                 ! If =0, never write the geometry and vertical grid files. If =1, write the
                                 ! geometry and vertical grid files only for a new simulation. If =2, always
                                 ! write the geometry and vertical grid files. Other values are invalid.
diff --git a/tests/parm/MOM_input_050.IN b/tests/parm/MOM_input_050.IN
index dc1ff5c535..23434678d9 100644
--- a/tests/parm/MOM_input_050.IN
+++ b/tests/parm/MOM_input_050.IN
@@ -103,7 +103,7 @@ BAD_VAL_SST_MIN = -3.0          !   [deg C] default = -2.1
 DEFAULT_ANSWER_DATE = 20250818  ! default = 99991231
                                 ! This sets the default value for the various _ANSWER_DATE parameters.
 WAVE_INTERFACE_ANSWER_DATE = 20230101
-WRITE_GEOM = 2                  ! default = 1
+WRITE_GEOM = @[MOM6_WRITE_GEOM] ! default = 1
                                 ! If =0, never write the geometry and vertical grid files. If =1, write the
                                 ! geometry and vertical grid files only for a new simulation. If =2, always
                                 ! write the geometry and vertical grid files. Other values are invalid.
diff --git a/tests/parm/MOM_input_100.IN b/tests/parm/MOM_input_100.IN
index 2cb7885e41..117769e7af 100644
--- a/tests/parm/MOM_input_100.IN
+++ b/tests/parm/MOM_input_100.IN
@@ -75,7 +75,7 @@ BAD_VAL_SST_MIN = -3.0          !   [deg C] default = -2.1
 DEFAULT_ANSWER_DATE = 20250818  ! default = 99991231
                                 ! This sets the default value for the various _ANSWER_DATE parameters.
 WAVE_INTERFACE_ANSWER_DATE = 20230101
-WRITE_GEOM = 2                  ! default = 1
+WRITE_GEOM = @[MOM6_WRITE_GEOM] ! default = 1
                                 ! If =0, never write the geometry and vertical grid files. If =1, write the
                                 ! geometry and vertical grid files only for a new simulation. If =2, always
                                 ! write the geometry and vertical grid files. Other values are invalid.
diff --git a/tests/parm/model_configure.IN b/tests/parm/model_configure.IN
index b23abadb59..3998094e6a 100644
--- a/tests/parm/model_configure.IN
+++ b/tests/parm/model_configure.IN
@@ -27,7 +27,9 @@ filename_base:           @[FILENAME_BASE]
 output_grid:             @[OUTPUT_GRID]
 output_file:             @[OUTPUT_FILE]
 zstandard_level:         @[ZSTANDARD_LEVEL]
+zstandard_level_rst:     @[ZSTANDARD_LEVEL_RST]
 ideflate:                @[IDEFLATE]
+ideflate_rst:            @[IDEFLATE_RST]
 quantize_mode:           'quantize_bitround'
 quantize_nsd:            @[QUANTIZE_NSD]
 ichunk2d:                @[ICHUNK2D]
diff --git a/tests/parm/model_configure_atmaq.IN b/tests/parm/model_configure_atmaq.IN
index 480d01dbdd..f1d0925105 100644
--- a/tests/parm/model_configure_atmaq.IN
+++ b/tests/parm/model_configure_atmaq.IN
@@ -9,7 +9,9 @@ dt_atmos:                @[DT_ATMOS]
 restart_interval:        @[RESTART_INTERVAL]
 write_dopost:            @[WRITE_DOPOST]
 zstandard_level:         @[ZSTANDARD_LEVEL]
+zstandard_level_rst:     @[ZSTANDARD_LEVEL_RST]
 ideflate:                @[IDEFLATE]
+ideflate_rst:            @[IDEFLATE_RST]
 quantize_mode:           'quantize_bitround'
 quantize_nsd:            @[QUANTIZE_NSD]
 quilting:                @[QUILTING]
diff --git a/tests/parm/model_configure_fire.IN b/tests/parm/model_configure_fire.IN
index cc5c2e969c..7df3ce60fe 100644
--- a/tests/parm/model_configure_fire.IN
+++ b/tests/parm/model_configure_fire.IN
@@ -16,7 +16,9 @@ restart_interval:        @[RESTART_INTERVAL]
 output_1st_tstep_rst:    .false.
 write_dopost:            @[WRITE_DOPOST]
 zstandard_level:         @[ZSTANDARD_LEVEL]
+zstandard_level_rst:     @[ZSTANDARD_LEVEL_RST]
 ideflate:                @[IDEFLATE]
+ideflate_rst:            @[IDEFLATE_RST]
 nbits:                   0
 ichunk2d:                -1
 jchunk2d:                -1
diff --git a/tests/parm/model_configure_gnv1.IN b/tests/parm/model_configure_gnv1.IN
index 3a40c5bdfd..f4d5090e73 100644
--- a/tests/parm/model_configure_gnv1.IN
+++ b/tests/parm/model_configure_gnv1.IN
@@ -25,7 +25,9 @@ filename_base:           @[FILENAME_BASE]
 output_grid:             @[OUTPUT_GRID]
 output_file:             @[OUTPUT_FILE]
 zstandard_level:         @[ZSTANDARD_LEVEL]
+zstandard_level_rst:     @[ZSTANDARD_LEVEL_RST]
 ideflate:                @[IDEFLATE]
+ideflate_rst:            @[IDEFLATE_RST]
 quantize_mode:           'quantize_bitround'
 quantize_nsd:            @[QUANTIZE_NSD]
 ichunk2d:                @[ICHUNK2D]
diff --git a/tests/parm/model_configure_hafs.IN b/tests/parm/model_configure_hafs.IN
index 2152f59d7d..e2ce41f921 100644
--- a/tests/parm/model_configure_hafs.IN
+++ b/tests/parm/model_configure_hafs.IN
@@ -23,7 +23,9 @@ ichunk3d:                -1
 jchunk3d:                -1
 kchunk3d:                -1
 zstandard_level:         @[ZSTANDARD_LEVEL]
+zstandard_level_rst:     @[ZSTANDARD_LEVEL_RST]
 ideflate:                @[IDEFLATE]
+ideflate_rst:            @[IDEFLATE_RST]
 quantize_mode:           'quantize_bitround'
 quantize_nsd:            @[QUANTIZE_NSD]
 
diff --git a/tests/parm/model_configure_regional.IN b/tests/parm/model_configure_regional.IN
index d6a335b582..c4161451bb 100644
--- a/tests/parm/model_configure_regional.IN
+++ b/tests/parm/model_configure_regional.IN
@@ -23,7 +23,9 @@ output_file:             @[OUTPUT_FILE]
 write_nemsioflip:        .false.
 write_fsyncflag:         .false.
 zstandard_level:         @[ZSTANDARD_LEVEL]
+zstandard_level_rst:     @[ZSTANDARD_LEVEL_RST]
 ideflate:                @[IDEFLATE]
+ideflate_rst:            @[IDEFLATE_RST]
 nbits:                   0
 ichunk2d:                -1
 jchunk2d:                -1
diff --git a/tests/parm/model_configure_regional_rrfs_a.IN b/tests/parm/model_configure_regional_rrfs_a.IN
index ab88282e15..9405833daa 100644
--- a/tests/parm/model_configure_regional_rrfs_a.IN
+++ b/tests/parm/model_configure_regional_rrfs_a.IN
@@ -10,7 +10,9 @@ cpl:                     .false.
 restart_interval:        @[RESTART_INTERVAL]
 quilting:                @[QUILTING]
 zstandard_level:         @[ZSTANDARD_LEVEL]
+zstandard_level_rst:     @[ZSTANDARD_LEVEL_RST]
 ideflate:                @[IDEFLATE]
+ideflate_rst:            @[IDEFLATE_RST]
 use_saved_routehandles:  @[USE_FV3_ROUTEHANDLES]
 
 #
diff --git a/tests/parm/model_configure_regional_stoch.IN b/tests/parm/model_configure_regional_stoch.IN
index 8b73aa26df..1f0f272a25 100644
--- a/tests/parm/model_configure_regional_stoch.IN
+++ b/tests/parm/model_configure_regional_stoch.IN
@@ -20,7 +20,9 @@ num_files:               2
 filename_base:           'dyn' 'phy'
 output_file:             @[OUTPUT_FILE]
 zstandard_level:         @[ZSTANDARD_LEVEL]
+zstandard_level_rst:     @[ZSTANDARD_LEVEL_RST]
 ideflate:                @[IDEFLATE]
+ideflate_rst:            @[IDEFLATE_RST]
 
 output_grid:             'lambert_conformal'
 cen_lon:  -97.5
diff --git a/tests/parm/model_configure_rrfs_conus13km.IN b/tests/parm/model_configure_rrfs_conus13km.IN
index 94bd5a0efa..0c9ae12b13 100644
--- a/tests/parm/model_configure_rrfs_conus13km.IN
+++ b/tests/parm/model_configure_rrfs_conus13km.IN
@@ -21,7 +21,9 @@ num_files:               @[NUM_FILES]
 filename_base:           @[FILENAME_BASE]
 output_file:             @[OUTPUT_FILE]
 zstandard_level:         @[ZSTANDARD_LEVEL]
+zstandard_level_rst:     @[ZSTANDARD_LEVEL_RST]
 ideflate:                @[IDEFLATE]
+ideflate_rst:            @[IDEFLATE_RST]
 quantize_mode:           'quantize_bitround'
 quantize_nsd:            @[QUANTIZE_NSD]
 ichunk3d:                @[ICHUNK3D]
diff --git a/tests/tests/control_debug_p8 b/tests/tests/control_debug_p8
index 509539823e..0935ee4724 100644
--- a/tests/tests/control_debug_p8
+++ b/tests/tests/control_debug_p8
@@ -97,4 +97,4 @@ export SATMEDMF=.true.
 export K_SPLIT=2
 export N_SPLIT=4
 export ZSTANDARD_LEVEL=5
-
+export ZSTANDARD_LEVEL_RST=5
diff --git a/tests/tests/control_p8 b/tests/tests/control_p8
index 4196c73994..2245849b3e 100644
--- a/tests/tests/control_p8
+++ b/tests/tests/control_p8
@@ -138,3 +138,4 @@ export SATMEDMF=.true.
 export K_SPLIT=2
 export N_SPLIT=4
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
diff --git a/tests/tests/control_p8.v2.sfc b/tests/tests/control_p8.v2.sfc
index c8dc98a845..2ae5eb78ad 100644
--- a/tests/tests/control_p8.v2.sfc
+++ b/tests/tests/control_p8.v2.sfc
@@ -150,3 +150,4 @@ export DOGP_LWSCAT=.true.
 
 export SATMEDMF=.true.
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
diff --git a/tests/tests/control_p8_atmlnd b/tests/tests/control_p8_atmlnd
index f74d008927..cbe774c4a6 100644
--- a/tests/tests/control_p8_atmlnd
+++ b/tests/tests/control_p8_atmlnd
@@ -132,6 +132,7 @@ export initial_albedo=0.2
 export WRITE_DOPOST=.false.
 export OUTPUT_GRID=cubed_sphere_grid
 export ZSTANDARD_LEVEL=0
+export ZSTANDARD_LEVEL_RST=0
 export OUTPUT_FH="1 -1"
 if [[ "$ATMRES" = "$LNDRES" ]]; then
   export lnd_input_dir="INPUT/"
diff --git a/tests/tests/control_p8_rrtmgp b/tests/tests/control_p8_rrtmgp
index 38f172d6be..d5a8a210fc 100644
--- a/tests/tests/control_p8_rrtmgp
+++ b/tests/tests/control_p8_rrtmgp
@@ -140,4 +140,5 @@ export N_SPLIT=4
 
 if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then
   ZSTANDARD_LEVEL=5
+  export ZSTANDARD_LEVEL_RST=5
 fi
diff --git a/tests/tests/control_p8_rrtmgp_rad32 b/tests/tests/control_p8_rrtmgp_rad32
index 975c696ab9..c935a6dc73 100644
--- a/tests/tests/control_p8_rrtmgp_rad32
+++ b/tests/tests/control_p8_rrtmgp_rad32
@@ -141,4 +141,5 @@ export N_SPLIT=4
 
 if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then
   ZSTANDARD_LEVEL=5
+  export ZSTANDARD_LEVEL_RST=5
 fi
diff --git a/tests/tests/control_restart_p8 b/tests/tests/control_restart_p8
index d2b260b24c..b12f1a27b4 100644
--- a/tests/tests/control_restart_p8
+++ b/tests/tests/control_restart_p8
@@ -138,4 +138,4 @@ export N_SPLIT=4
 
 export SATMEDMF=.true.
 export ZSTANDARD_LEVEL=5
-
+export ZSTANDARD_LEVEL_RST=5
diff --git a/tests/tests/control_restart_p8_atmlnd b/tests/tests/control_restart_p8_atmlnd
index a86b160740..d5ac842e3a 100644
--- a/tests/tests/control_restart_p8_atmlnd
+++ b/tests/tests/control_restart_p8_atmlnd
@@ -76,3 +76,4 @@ else
   export lnd_fixed_dir="INPUT/${LNDRES}/"
 fi
 export ZSTANDARD_LEVEL=0
+export ZSTANDARD_LEVEL_RST=0
diff --git a/tests/tests/control_wam b/tests/tests/control_wam
index c57d8e7234..67e152e9e0 100644
--- a/tests/tests/control_wam
+++ b/tests/tests/control_wam
@@ -106,7 +106,7 @@ export DIAG_TABLE=diag_table_wam
 
 export INPUT_NML=wam_v17.nml.IN
 export ZSTANDARD_LEVEL=5
-
+export ZSTANDARD_LEVEL_RST=5
 
 if [[ $MACHINE_ID = hera ]]; then
   export WLCLK=45
diff --git a/tests/tests/control_wam_debug b/tests/tests/control_wam_debug
index 8600ee97d1..98260d191c 100644
--- a/tests/tests/control_wam_debug
+++ b/tests/tests/control_wam_debug
@@ -108,3 +108,4 @@ export DIAG_TABLE=diag_table_wam
 export INPUT_NML=wam_v17.nml.IN
 
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
diff --git a/tests/tests/control_wrtGauss_netcdf_parallel b/tests/tests/control_wrtGauss_netcdf_parallel
index 3d831cbb2a..8a166d85d2 100644
--- a/tests/tests/control_wrtGauss_netcdf_parallel
+++ b/tests/tests/control_wrtGauss_netcdf_parallel
@@ -35,6 +35,7 @@ export IAER=5111
 export IOVR=3
 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export QUANTIZE_NSD=14
 
 export K_SPLIT=2
diff --git a/tests/tests/control_wrtGauss_netcdf_parallel_debug b/tests/tests/control_wrtGauss_netcdf_parallel_debug
index 272ad9457a..e8fdf93790 100644
--- a/tests/tests/control_wrtGauss_netcdf_parallel_debug
+++ b/tests/tests/control_wrtGauss_netcdf_parallel_debug
@@ -31,6 +31,7 @@ export IAER=5111
 export IOVR=3
 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export QUANTIZE_NSD=14
 export OUTPUT_FH="0 1"
 
diff --git a/tests/tests/conus13km_2threads b/tests/tests/conus13km_2threads
index a7994538ae..31be8a23a6 100644
--- a/tests/tests/conus13km_2threads
+++ b/tests/tests/conus13km_2threads
@@ -26,6 +26,7 @@ export USE_MERRA2=.true.
 export ESMF_THREADING=false
 export THRD=$atm_omp_num_threads
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 
 if [[ ${MACHINE_ID} = ursa ]]; then
    export EXCLUSIVE_NODES=.true.
diff --git a/tests/tests/conus13km_control b/tests/tests/conus13km_control
index e1fb8971bc..5d4e81af1d 100644
--- a/tests/tests/conus13km_control
+++ b/tests/tests/conus13km_control
@@ -31,6 +31,7 @@ export QUILTING_RESTART=.false.
 export USE_MERRA2=.true.
 
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 
 if [[ $MACHINE_ID = ursa ]]; then
   export EXCLUSIVE_NODES=.true.
diff --git a/tests/tests/conus13km_decomp b/tests/tests/conus13km_decomp
index 068dc8e311..d52020d4ff 100644
--- a/tests/tests/conus13km_decomp
+++ b/tests/tests/conus13km_decomp
@@ -25,6 +25,7 @@ export JNPES=10
 export QUILTING_RESTART=.false.
 export USE_MERRA2=.true.
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 
 if [[ ${MACHINE_ID} = ursa ]]; then
    export EXCLUSIVE_NODES=.true.
diff --git a/tests/tests/conus13km_restart b/tests/tests/conus13km_restart
index c5076b763b..adce5b3f44 100644
--- a/tests/tests/conus13km_restart
+++ b/tests/tests/conus13km_restart
@@ -21,6 +21,7 @@ export RRFS_RESTART=YES
 export QUILTING_RESTART=.false.
 export USE_MERRA2=.true.
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 
 if [[ ${MACHINE_ID} = ursa ]]; then
    export EXCLUSIVE_NODES=.true.
diff --git a/tests/tests/cpld_control_gefs b/tests/tests/cpld_control_gefs
index 9f8ce0be84..0a35daaecb 100644
--- a/tests/tests/cpld_control_gefs
+++ b/tests/tests/cpld_control_gefs
@@ -100,6 +100,7 @@ export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export ATMTILESIZE=`expr $NPX - 1`
 export IDEFLATE=1
+export IDEFLATE_RST=1
 export QUANTIZE_NSD=0
 export ICHUNK3D=${IMO}
 export JCHUNK3D=${JMO}
diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
index 06c6fba798..4eba0cbd95 100644
--- a/tests/tests/cpld_control_p8
+++ b/tests/tests/cpld_control_p8
@@ -93,7 +93,7 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = derecho ]] || [[ $MACHINE_ID = gaeac6 ]]; then
   TPN=96
 fi
-
+export WLCLK=50
 export K_SPLIT=4
 export N_SPLIT=5
 
diff --git a/tests/tests/dependency_unmet b/tests/tests/dependency_unmet
index 8410666e90..5ae729fbad 100644
--- a/tests/tests/dependency_unmet
+++ b/tests/tests/dependency_unmet
@@ -82,3 +82,4 @@ export CCPP_SUITE=FV3_GFS_v17_p8
 export INPUT_NML=global_control.nml.IN
 
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
diff --git a/tests/tests/fail_to_run b/tests/tests/fail_to_run
index d37f0099b4..b34e8f4358 100644
--- a/tests/tests/fail_to_run
+++ b/tests/tests/fail_to_run
@@ -85,3 +85,4 @@ export CCPP_SUITE=FV3_GFS_v17_p8
 export INPUT_NML=global_control.nml.IN
 
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
diff --git a/tests/tests/gnv1_nested b/tests/tests/gnv1_nested
index 5536538205..fc8e83e03a 100644
--- a/tests/tests/gnv1_nested
+++ b/tests/tests/gnv1_nested
@@ -84,6 +84,7 @@ export FILENAME_BASE="'atm' 'sfc'"
 export OUTPUT_GRID=gaussian_grid
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export ICHUNK2D=-1
 export JCHUNK2D=-1
 export ICHUNK3D=-1
diff --git a/tests/tests/hafs_global_1nest_atm b/tests/tests/hafs_global_1nest_atm
index 531d133961..bf7c597c21 100644
--- a/tests/tests/hafs_global_1nest_atm
+++ b/tests/tests/hafs_global_1nest_atm
@@ -63,6 +63,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=90
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_global_multiple_4nests_atm b/tests/tests/hafs_global_multiple_4nests_atm
index f441406465..5596b44367 100644
--- a/tests/tests/hafs_global_multiple_4nests_atm
+++ b/tests/tests/hafs_global_multiple_4nests_atm
@@ -97,6 +97,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=90
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_global_storm_following_1nest_atm b/tests/tests/hafs_global_storm_following_1nest_atm
index 8589463259..3d3a0faa76 100644
--- a/tests/tests/hafs_global_storm_following_1nest_atm
+++ b/tests/tests/hafs_global_storm_following_1nest_atm
@@ -23,6 +23,7 @@ export atm_omp_num_threads=2
 
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_regional_1nest_atm b/tests/tests/hafs_regional_1nest_atm
index bdf6317a1d..e7b066d18e 100644
--- a/tests/tests/hafs_regional_1nest_atm
+++ b/tests/tests/hafs_regional_1nest_atm
@@ -37,6 +37,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=90
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_regional_atm b/tests/tests/hafs_regional_atm
index d8f42c75c8..1869c107fe 100644
--- a/tests/tests/hafs_regional_atm
+++ b/tests/tests/hafs_regional_atm
@@ -21,6 +21,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
diff --git a/tests/tests/hafs_regional_atm_gfdlmpv3 b/tests/tests/hafs_regional_atm_gfdlmpv3
index 976ce80a3c..3e81d4e67c 100644
--- a/tests/tests/hafs_regional_atm_gfdlmpv3
+++ b/tests/tests/hafs_regional_atm_gfdlmpv3
@@ -21,6 +21,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=180
 export IDEFLATE=1
+export IDEFLATE_RST=1
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
diff --git a/tests/tests/hafs_regional_atm_ocn b/tests/tests/hafs_regional_atm_ocn
index e88d03c7f7..017e0611b3 100644
--- a/tests/tests/hafs_regional_atm_ocn
+++ b/tests/tests/hafs_regional_atm_ocn
@@ -24,6 +24,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
diff --git a/tests/tests/hafs_regional_atm_ocn_wav b/tests/tests/hafs_regional_atm_ocn_wav
index 0e8940b9cf..e97c20a925 100644
--- a/tests/tests/hafs_regional_atm_ocn_wav
+++ b/tests/tests/hafs_regional_atm_ocn_wav
@@ -26,6 +26,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
diff --git a/tests/tests/hafs_regional_atm_thompson_gfdlsf b/tests/tests/hafs_regional_atm_thompson_gfdlsf
index 1f023d4f82..7d490033f3 100644
--- a/tests/tests/hafs_regional_atm_thompson_gfdlsf
+++ b/tests/tests/hafs_regional_atm_thompson_gfdlsf
@@ -21,6 +21,7 @@ export atm_omp_num_threads=2
 export DT_ATMOS=180
 export DT_INNER=${DT_ATMOS}
 export ZSTANDARD_LEVEL=0
+export ZSTANDARD_LEVEL_RST=0
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
diff --git a/tests/tests/hafs_regional_atm_wav b/tests/tests/hafs_regional_atm_wav
index 6dba540364..60e8a1fe51 100644
--- a/tests/tests/hafs_regional_atm_wav
+++ b/tests/tests/hafs_regional_atm_wav
@@ -24,6 +24,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
diff --git a/tests/tests/hafs_regional_docn b/tests/tests/hafs_regional_docn
index b1fdc6e64d..c155ec6c76 100644
--- a/tests/tests/hafs_regional_docn
+++ b/tests/tests/hafs_regional_docn
@@ -24,6 +24,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
diff --git a/tests/tests/hafs_regional_docn_oisst b/tests/tests/hafs_regional_docn_oisst
index 4d35ecd97c..0281aa6c16 100644
--- a/tests/tests/hafs_regional_docn_oisst
+++ b/tests/tests/hafs_regional_docn_oisst
@@ -24,6 +24,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
diff --git a/tests/tests/hafs_regional_specified_moving_1nest_atm b/tests/tests/hafs_regional_specified_moving_1nest_atm
index 9b960665e1..4f5af1379d 100644
--- a/tests/tests/hafs_regional_specified_moving_1nest_atm
+++ b/tests/tests/hafs_regional_specified_moving_1nest_atm
@@ -24,6 +24,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm b/tests/tests/hafs_regional_storm_following_1nest_atm
index 5f29cda1b5..cd13c09230 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm
@@ -37,6 +37,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn
index 9c54ea6496..1ae96903d9 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn
@@ -24,6 +24,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug
index ffbd0afacd..efc91c4e21 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug
@@ -22,6 +22,7 @@ export FHMAX=1
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='1 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
index e5b64b686c..f9938be5da 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
@@ -26,6 +26,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline
index 9a927c9ca4..32751650a1 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline
@@ -26,6 +26,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6
index bb52bcc438..cdc95a7548 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6
@@ -26,6 +26,7 @@ export FHMAX=3
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/hafs_regional_telescopic_2nests_atm b/tests/tests/hafs_regional_telescopic_2nests_atm
index fd76933bad..77e59b1b1e 100644
--- a/tests/tests/hafs_regional_telescopic_2nests_atm
+++ b/tests/tests/hafs_regional_telescopic_2nests_atm
@@ -24,6 +24,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=90
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
diff --git a/tests/tests/regional_debug b/tests/tests/regional_debug
index f50282f5bb..0a9e3eda4f 100644
--- a/tests/tests/regional_debug
+++ b/tests/tests/regional_debug
@@ -37,6 +37,7 @@ export WRITE_GROUP=1
 export WRTTASK_PER_GROUP=10
 export NTILES=1
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 
 if [[ $MACHINE_ID = gaeac5 && $RT_COMPILER = intelllvm ]]; then
   export WLCLK=50
diff --git a/tests/tests/regional_netcdf_parallel b/tests/tests/regional_netcdf_parallel
index 5dff9aa1c5..75b7bcce3e 100644
--- a/tests/tests/regional_netcdf_parallel
+++ b/tests/tests/regional_netcdf_parallel
@@ -29,6 +29,7 @@ export DIAG_TABLE=diag_table_lam
 export FIELD_TABLE=field_table_regional
 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export ZSTANDARD_LEVEL=5
+export ZSTANDARD_LEVEL_RST=5
 
 export WLCLK=15
 export FHMAX=6
diff --git a/tests/tests/rrfs_v1beta b/tests/tests/rrfs_v1beta
index 394cddce20..c32dc41ae9 100644
--- a/tests/tests/rrfs_v1beta
+++ b/tests/tests/rrfs_v1beta
@@ -57,4 +57,4 @@ export_rrfs_v1
 export RESTART_INTERVAL="6 -1"
 export OUTPUT_FH='0 09 12'
 export ZSTANDARD_LEVEL=5
-
+export ZSTANDARD_LEVEL_RST=5