diff --git a/docs/source/hpc.rst b/docs/source/hpc.rst
index f1720893479..55e3e603bc7 100644
--- a/docs/source/hpc.rst
+++ b/docs/source/hpc.rst
@@ -144,7 +144,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
      - 
      - 
      - 
-     - 
+     - X
      - X
    * - Gaea C6 
      - 1   
@@ -158,7 +158,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
      - 
      - 
      - X
-     - 
+     - X
      - X
    * - AWS (PW)
      - 3   
diff --git a/parm/config/gfs/config.resources.GAEAC6 b/parm/config/gfs/config.resources.GAEAC6
index 97fed78f8a1..349a2e2be60 100644
--- a/parm/config/gfs/config.resources.GAEAC6
+++ b/parm/config/gfs/config.resources.GAEAC6
@@ -33,6 +33,20 @@ case ${step} in
     esac
   export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
   ;;
+
+  "anal")
+    if [[ "${CASE}" == "C768" || "${CASE}" == "C1152" ]]; then
+        export threads_per_task=8
+        # Make ntasks a multiple of 16
+        if [[ "${RUN}" == "gdas" ]]; then
+            export ntasks=784
+        elif [[ "${RUN}" == "gfs" ]]; then
+            export ntasks=832
+        fi
+        export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
+    fi
+    ;;
   *)
+
   ;;
 esac
diff --git a/sorc/verif-global.fd b/sorc/verif-global.fd
index b2ee80cac79..ecb31f4575d 160000
--- a/sorc/verif-global.fd
+++ b/sorc/verif-global.fd
@@ -1 +1 @@
-Subproject commit b2ee80cac7921a3016fa5a857cc58acfccc4baea
+Subproject commit ecb31f4575d86e9ce50495682adb550992ccfc6a
diff --git a/versions/run.gaeac6.ver b/versions/run.gaeac6.ver
index fc52d698b97..f9ac46de709 100644
--- a/versions/run.gaeac6.ver
+++ b/versions/run.gaeac6.ver
@@ -9,8 +9,4 @@ export hsi_ver=9.3
 
 source "${HOMEgfs:-}/versions/spack.ver"
 
-# Gaea uses a newer version of Fit2Obs
-export fit2obs_ver=1.1.5
-# Gaea uses a newer version of the ensemble tracker as well
-export ens_tracker_ver=v1.2.0
 export spack_mod_path="/ncrc/proj/epic/spack-stack/c6/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.wcoss2.ver b/versions/run.wcoss2.ver
index 612358616c8..5efa181505f 100644
--- a/versions/run.wcoss2.ver
+++ b/versions/run.wcoss2.ver
@@ -48,7 +48,7 @@ export metplus_ver=3.1.1
 export obsproc_run_ver=1.2.0
 export prepobs_run_ver=1.1.0
 
-export ens_tracker_ver=feature-GFSv17_com_reorg
-export fit2obs_ver=1.1.4
+export ens_tracker_ver=v1.2.0
+export fit2obs_ver=1.1.5
 export mos_ver=5.4.3
 export mos_shared_ver=2.7.2
diff --git a/versions/spack.ver b/versions/spack.ver
index 1f553134f00..43236d39122 100644
--- a/versions/spack.ver
+++ b/versions/spack.ver
@@ -43,5 +43,5 @@ export py_xarray_ver=2023.7.0
 export obsproc_run_ver=1.2.0
 export prepobs_run_ver=1.1.0
 
-export ens_tracker_ver=feature-GFSv17_com_reorg
-export fit2obs_ver=1.1.4
+export ens_tracker_ver=v1.2.0
+export fit2obs_ver=1.1.5
diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml
index f7dceaedd4d..8ad9965c7ca 100644
--- a/workflow/hosts/hera.yaml
+++ b/workflow/hosts/hera.yaml
@@ -27,5 +27,3 @@ COMINecmwf: /scratch1/NCEPDEV/global/glopara/data/external_gempak/ecmwf
 COMINnam: /scratch1/NCEPDEV/global/glopara/data/external_gempak/nam
 COMINukmet: /scratch1/NCEPDEV/global/glopara/data/external_gempak/ukmet
 AERO_INPUTS_DIR: /scratch1/NCEPDEV/global/glopara/data/gocart_emissions
-# TODO Reenable when RDHPCS#2025022654000078 is resolved
-DO_METP: 'NO'
diff --git a/workflow/hosts/hercules.yaml b/workflow/hosts/hercules.yaml
index e283e0e5157..f4d64579116 100644
--- a/workflow/hosts/hercules.yaml
+++ b/workflow/hosts/hercules.yaml
@@ -22,8 +22,6 @@ ARCHCOM_TO: 'globus_hpss'
 ATARDIR: '/NCEPDEV/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}'
 MAKE_NSSTBUFR: 'NO'
 MAKE_ACFTBUFR: 'NO'
-DO_TRACKER: 'NO'
-DO_GENESIS: 'NO'
 DO_AWIPS: 'NO'
 SUPPORTED_RESOLUTIONS: ['C1152', 'C768', 'C384', 'C192', 'C96', 'C48']
 COMINecmwf: '/work2/noaa/global/role-global/data/external_gempak/ecmwf'
diff --git a/workflow/hosts/orion.yaml b/workflow/hosts/orion.yaml
index 23e2de9dbfa..226b215cb1a 100644
--- a/workflow/hosts/orion.yaml
+++ b/workflow/hosts/orion.yaml
@@ -22,8 +22,6 @@ ARCHCOM_TO: 'globus_hpss'
 ATARDIR: '/NCEPDEV/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}'
 MAKE_NSSTBUFR: 'NO'
 MAKE_ACFTBUFR: 'NO'
-DO_TRACKER: 'NO'
-DO_GENESIS: 'NO'
 DO_AWIPS: 'NO'
 SUPPORTED_RESOLUTIONS: ['C1152', 'C768', 'C384', 'C192', 'C96', 'C48']
 COMINecmwf: '/work2/noaa/global/role-global/data/external_gempak/ecmwf'