diff --git a/dev/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX b/dev/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX
index 11e35d01590..978a3b95bcd 100755
--- a/dev/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX
+++ b/dev/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX
@@ -5,6 +5,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlgenb" -c "base aeroanl aeroanl
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE b/dev/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE
index e2e2f065967..e4e18806af1 100755
--- a/dev/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE
+++ b/dev/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE
@@ -7,6 +7,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlfinal" -c "base aeroanl aeroan
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE b/dev/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE
index fca06c3b8cb..26f70e97345 100755
--- a/dev/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE
+++ b/dev/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE
@@ -6,6 +6,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlinit" -c "base aeroanl aeroanl
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # shellcheck disable=SC2153
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
 gPDY=${GDATE:0:8}
diff --git a/dev/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL b/dev/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL
index 4c3aafca453..f1b91cd7d06 100755
--- a/dev/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL
+++ b/dev/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL
@@ -7,6 +7,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlvar" -c "base aeroanl aeroanlv
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_ANALYSIS_STATS b/dev/jobs/JGLOBAL_ANALYSIS_STATS
index 21d624d4f8e..842d8168538 100755
--- a/dev/jobs/JGLOBAL_ANALYSIS_STATS
+++ b/dev/jobs/JGLOBAL_ANALYSIS_STATS
@@ -5,6 +5,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "anlstat" -c "base anlstat"
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_ARCHIVE_TARS b/dev/jobs/JGLOBAL_ARCHIVE_TARS
index 4b059b930d2..a6e4c937c1d 100755
--- a/dev/jobs/JGLOBAL_ARCHIVE_TARS
+++ b/dev/jobs/JGLOBAL_ARCHIVE_TARS
@@ -9,6 +9,10 @@ fi
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
     COMIN_ATMOS_ANLMON:COM_ATMOS_ANLMON_TMPL \
diff --git a/dev/jobs/JGLOBAL_ARCHIVE_VRFY b/dev/jobs/JGLOBAL_ARCHIVE_VRFY
index 2e6e9a42d37..bfa9bc666ac 100755
--- a/dev/jobs/JGLOBAL_ARCHIVE_VRFY
+++ b/dev/jobs/JGLOBAL_ARCHIVE_VRFY
@@ -5,6 +5,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "arch_vrfy" -c "base arch_vrfy"
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
     COMIN_ATMOS_GENESIS:COM_ATMOS_GENESIS_TMPL \
diff --git a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE
index 6e39de57c88..f8fc2da9476 100755
--- a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE
+++ b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE
@@ -7,6 +7,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmensanlfinal" -c "base atmensanl at
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 GDUMP="gdas"
 GDUMP_ENS="enkf${GDUMP}"
 
diff --git a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_FV3_INCREMENT b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_FV3_INCREMENT
index e0fac0e3292..ee8a7e609b0 100755
--- a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_FV3_INCREMENT
+++ b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_FV3_INCREMENT
@@ -7,6 +7,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmensanlfv3inc" -c "base atmensanl a
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE
index 35e2b21611c..9037fcc77df 100755
--- a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE
+++ b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE
@@ -6,6 +6,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmensanlinit" -c "base atmensanl atm
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # shellcheck disable=SC2153
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
 gPDY=${GDATE:0:8}
diff --git a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF
index b6bc77a4000..9c2f1c307e3 100755
--- a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF
+++ b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF
@@ -7,6 +7,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmensanlletkf" -c "base atmensanl at
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS
index 1b71ad578a3..121350fd97c 100755
--- a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS
+++ b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS
@@ -7,6 +7,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmensanlobs" -c "base atmensanl atme
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL
index ac2291ffe7d..e4a8db68869 100755
--- a/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL
+++ b/dev/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL
@@ -7,6 +7,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmensanlsol" -c "base atmensanl atme
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC b/dev/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
index 33ca4018636..4e25339053f 100755
--- a/dev/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
+++ b/dev/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
@@ -2,6 +2,10 @@
 
 source "${HOMEgfs}/ush/jjob_header.sh" -e "analcalc" -c "base anal analcalc"
 
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 ##############################################
 # Set variables used in the script
 ##############################################
diff --git a/dev/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI b/dev/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI
index 1af6a422b3d..7ab82373917 100755
--- a/dev/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI
+++ b/dev/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI
@@ -8,6 +8,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "analcalc_fv3jedi" -c "base analcalc_f
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
 gPDY=${GDATE:0:8}
diff --git a/dev/jobs/JGLOBAL_ATMOS_UPP b/dev/jobs/JGLOBAL_ATMOS_UPP
index 8452e69ec25..d2cef094b98 100755
--- a/dev/jobs/JGLOBAL_ATMOS_UPP
+++ b/dev/jobs/JGLOBAL_ATMOS_UPP
@@ -5,6 +5,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "upp" -c "base upp"
 ##############################################
 # Set variables used in the exglobal script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE b/dev/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE
index cdb8726127b..9de36d01e78 100755
--- a/dev/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE
+++ b/dev/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE
@@ -7,6 +7,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlfinal" -c "base atmanl atmanlfi
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT b/dev/jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT
index 16c10a29067..3b9ac06448f 100755
--- a/dev/jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT
+++ b/dev/jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT
@@ -7,6 +7,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlfv3inc" -c "base atmanl atmanlf
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE b/dev/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE
index 8419405f040..8e596dc7828 100755
--- a/dev/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE
+++ b/dev/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE
@@ -6,6 +6,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlinit" -c "base atmanl atmanlini
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # shellcheck disable=SC2153
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
 gPDY=${GDATE:0:8}
diff --git a/dev/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL b/dev/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL
index 5be049694e3..41557c8bfe4 100755
--- a/dev/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL
+++ b/dev/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL
@@ -7,6 +7,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlvar" -c "base atmanl atmanlvar"
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_ENKF_ARCHIVE_TARS b/dev/jobs/JGLOBAL_ENKF_ARCHIVE_TARS
index bad4e6a9633..88e4be1ec3f 100755
--- a/dev/jobs/JGLOBAL_ENKF_ARCHIVE_TARS
+++ b/dev/jobs/JGLOBAL_ENKF_ARCHIVE_TARS
@@ -5,6 +5,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_tars" -c "base arch_tars earc_ta
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \
     COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \
diff --git a/dev/jobs/JGLOBAL_ENKF_ARCHIVE_VRFY b/dev/jobs/JGLOBAL_ENKF_ARCHIVE_VRFY
index 77c3d1973fc..7b8e7670a2e 100755
--- a/dev/jobs/JGLOBAL_ENKF_ARCHIVE_VRFY
+++ b/dev/jobs/JGLOBAL_ENKF_ARCHIVE_VRFY
@@ -5,6 +5,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_vrfy" -c "base earc_vrfy"
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \
     COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \
diff --git a/dev/jobs/JGLOBAL_ENKF_ECEN_FV3JEDI b/dev/jobs/JGLOBAL_ENKF_ECEN_FV3JEDI
index 12fe96146db..1d34f75ffc6 100755
--- a/dev/jobs/JGLOBAL_ENKF_ECEN_FV3JEDI
+++ b/dev/jobs/JGLOBAL_ENKF_ECEN_FV3JEDI
@@ -8,6 +8,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ecen_fv3jedi" -c "base ecen_fv3jedi"
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
 gPDY=${GDATE:0:8}
diff --git a/dev/jobs/JGLOBAL_ENS_GLOBUS_ARCH b/dev/jobs/JGLOBAL_ENS_GLOBUS_ARCH
index 6a6924383dd..e087ccb8ca3 100755
--- a/dev/jobs/JGLOBAL_ENS_GLOBUS_ARCH
+++ b/dev/jobs/JGLOBAL_ENS_GLOBUS_ARCH
@@ -5,6 +5,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "globus_earc" -c "base globus earc_gro
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_CONF:COM_CONF_TMPL
 
diff --git a/dev/jobs/JGLOBAL_FETCH b/dev/jobs/JGLOBAL_FETCH
index 3648bd269da..88fa1febbe7 100755
--- a/dev/jobs/JGLOBAL_FETCH
+++ b/dev/jobs/JGLOBAL_FETCH
@@ -2,6 +2,10 @@
 
 source "${HOMEgfs}/ush/jjob_header.sh" -e "fetch" -c "base fetch"
 
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # Execute fetching
 # Do not export shell opts to the bash scripts in the htar/hsi wrappers
 export -n SHELLOPTS
diff --git a/dev/jobs/JGLOBAL_FORECAST b/dev/jobs/JGLOBAL_FORECAST
index 816803d6ee2..eadd600ad50 100755
--- a/dev/jobs/JGLOBAL_FORECAST
+++ b/dev/jobs/JGLOBAL_FORECAST
@@ -10,6 +10,10 @@ else
     source "${HOMEgfs}/ush/jjob_header.sh" -e "fcst" -c "base fcst"
 fi
 
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # Create the directory to hold restarts and output from the model in stmp
 export DATArestart="${DATAjob}/restart"
 if [[ ! -d "${DATArestart}" ]]; then mkdir -p "${DATArestart}"; fi
diff --git a/dev/jobs/JGLOBAL_GLOBUS_ARCH b/dev/jobs/JGLOBAL_GLOBUS_ARCH
index 61bb7bdb8cc..46457311c47 100755
--- a/dev/jobs/JGLOBAL_GLOBUS_ARCH
+++ b/dev/jobs/JGLOBAL_GLOBUS_ARCH
@@ -5,6 +5,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "globus_arch" -c "base globus"
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_CONF:COM_CONF_TMPL
 
diff --git a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT
index 28491144b2c..647dae1c874 100755
--- a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT
+++ b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT
@@ -8,6 +8,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlchkpt" -c "base marineanl ma
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_ECEN b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_ECEN
index e85cd6666c8..317a7dba442 100755
--- a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_ECEN
+++ b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_ECEN
@@ -9,6 +9,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlecen" -c "base marineanlecen
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # Ignore possible spelling error (nothing is misspelled)
 # shellcheck disable=SC2153
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
diff --git a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE
index c5ce8515a00..a82741ae1c7 100755
--- a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE
+++ b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE
@@ -8,6 +8,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlfinal" -c "base marineanl ma
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE
index de8beb20afc..d0b87904252 100755
--- a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE
+++ b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE
@@ -8,6 +8,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlinit" -c "base marineanl mar
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # Ignore possible spelling error (nothing is misspelled)
 # shellcheck disable=SC2153
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
diff --git a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF
index 2b6552b78b6..e2acc4886f8 100755
--- a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF
+++ b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF
@@ -11,6 +11,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlletkf" -c "base marineanllet
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # Ignore possible spelling error (nothing is misspelled)
 # shellcheck disable=SC2153
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
diff --git a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL
index 6cb9030f851..3a04a3fe9a2 100755
--- a/dev/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL
+++ b/dev/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL
@@ -9,6 +9,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlvar" -c "base marineanl mari
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_MARINE_BMAT b/dev/jobs/JGLOBAL_MARINE_BMAT
index e4cb3ef9bb3..aad8b5075b6 100755
--- a/dev/jobs/JGLOBAL_MARINE_BMAT
+++ b/dev/jobs/JGLOBAL_MARINE_BMAT
@@ -17,6 +17,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "marinebmat" -c "base marinebmat"
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # shellcheck disable=SC2153
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
 gPDY=${GDATE:0:8}
diff --git a/dev/jobs/JGLOBAL_MARINE_BMAT_INITIALIZE b/dev/jobs/JGLOBAL_MARINE_BMAT_INITIALIZE
index ed6e74599dc..f152a5cf9e6 100755
--- a/dev/jobs/JGLOBAL_MARINE_BMAT_INITIALIZE
+++ b/dev/jobs/JGLOBAL_MARINE_BMAT_INITIALIZE
@@ -16,6 +16,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "marinebmatinit" -c "base marinebmat m
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # shellcheck disable=SC2153
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
 gPDY=${GDATE:0:8}
diff --git a/dev/jobs/JGLOBAL_OCEANICE_PRODUCTS b/dev/jobs/JGLOBAL_OCEANICE_PRODUCTS
index 2d7718017ca..d588a82d5b0 100755
--- a/dev/jobs/JGLOBAL_OCEANICE_PRODUCTS
+++ b/dev/jobs/JGLOBAL_OCEANICE_PRODUCTS
@@ -2,6 +2,10 @@
 
 source "${HOMEgfs}/ush/jjob_header.sh" -e "oceanice_products" -c "base oceanice_products"
 
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 ##############################################
 # Begin JOB SPECIFIC work
 ##############################################
diff --git a/dev/jobs/JGLOBAL_OFFLINE_ATMOS_ANALYSIS b/dev/jobs/JGLOBAL_OFFLINE_ATMOS_ANALYSIS
index cb3b956ca47..dcb38bcde49 100755
--- a/dev/jobs/JGLOBAL_OFFLINE_ATMOS_ANALYSIS
+++ b/dev/jobs/JGLOBAL_OFFLINE_ATMOS_ANALYSIS
@@ -6,6 +6,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "offlineanl" -c "base offlineanl"
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 ##############################################
 # Begin JOB SPECIFIC work
diff --git a/dev/jobs/JGLOBAL_PREP_EMISSIONS b/dev/jobs/JGLOBAL_PREP_EMISSIONS
index 0d843a68ce7..9f2593ff8a5 100755
--- a/dev/jobs/JGLOBAL_PREP_EMISSIONS
+++ b/dev/jobs/JGLOBAL_PREP_EMISSIONS
@@ -5,6 +5,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "prep_emissions" -c "base prep_emissio
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # TODO: Set local variables used in this script e.g. GDATE may be needed for previous cycle
 
 ##############################################
diff --git a/dev/jobs/JGLOBAL_PREP_OCEAN_OBS b/dev/jobs/JGLOBAL_PREP_OCEAN_OBS
index fd51214b4cc..13e8eec0d7e 100755
--- a/dev/jobs/JGLOBAL_PREP_OCEAN_OBS
+++ b/dev/jobs/JGLOBAL_PREP_OCEAN_OBS
@@ -4,6 +4,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "prepoceanobs" -c "base marineanl prep
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
 
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMOUT_OBS:COM_OBS_TMPL
 
diff --git a/dev/jobs/JGLOBAL_SNOWENS_ANALYSIS b/dev/jobs/JGLOBAL_SNOWENS_ANALYSIS
index fef9a4aa92c..7bae7a5e0e6 100755
--- a/dev/jobs/JGLOBAL_SNOWENS_ANALYSIS
+++ b/dev/jobs/JGLOBAL_SNOWENS_ANALYSIS
@@ -5,6 +5,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "esnowanl" -c "base esnowanl"
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # Ignore possible spelling error (nothing is misspelled)
 # shellcheck disable=SC2153
 GDUMP="gdas"
diff --git a/dev/jobs/JGLOBAL_SNOW_ANALYSIS b/dev/jobs/JGLOBAL_SNOW_ANALYSIS
index 5bd19608a16..c86ef44f843 100755
--- a/dev/jobs/JGLOBAL_SNOW_ANALYSIS
+++ b/dev/jobs/JGLOBAL_SNOW_ANALYSIS
@@ -5,6 +5,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "snowanl" -c "base snowanl"
 ##############################################
 # Set variables used in the script
 ##############################################
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # Ignore possible spelling error (nothing is misspelled)
 # shellcheck disable=SC2153
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
diff --git a/dev/jobs/JGLOBAL_STAGE_IC b/dev/jobs/JGLOBAL_STAGE_IC
index 6a2f9571166..5691347b3e1 100755
--- a/dev/jobs/JGLOBAL_STAGE_IC
+++ b/dev/jobs/JGLOBAL_STAGE_IC
@@ -2,6 +2,10 @@
 
 source "${HOMEgfs}/ush/jjob_header.sh" -e "stage_ic" -c "base stage_ic"
 
+# Setup Python path for pygfs
+PYTHONPATH="${HOMEgfs}/ush/python${PYTHONPATH:+:${PYTHONPATH}}"
+export PYTHONPATH
+
 # Execute staging
 "${SCRgfs}/exglobal_stage_ic.py"
 err=$?
diff --git a/dev/ush/load_modules.sh b/dev/ush/load_modules.sh
index 673122d95d0..4d5093f4226 100755
--- a/dev/ush/load_modules.sh
+++ b/dev/ush/load_modules.sh
@@ -216,15 +216,6 @@ case "${MODULE_TYPE}" in
 
 esac
 
-# Set up the PYTHONPATH to include wxflow from HOMEgfs
-if [[ -d "${HOMEgfs}/sorc/wxflow/src" ]]; then
-    PYTHONPATH="${HOMEgfs}/sorc/wxflow/src${PYTHONPATH:+:${PYTHONPATH}}"
-fi
-
-# Add HOMEgfs/ush/python to PYTHONPATH
-PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/ush/python"
-export PYTHONPATH
-
 # Restore stack soft limit:
 ulimit -S -s "${ulimit_s}"
 unset ulimit_s
diff --git a/sorc/gdas.cd b/sorc/gdas.cd
index f92b2dc84b6..ea8adbe01ca 160000
--- a/sorc/gdas.cd
+++ b/sorc/gdas.cd
@@ -1 +1 @@
-Subproject commit f92b2dc84b6f21f17f9f10058cc808b70b6b11b9
+Subproject commit ea8adbe01cabad8238da2851cf88252ca8cd2418
diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
index 8fe4b013891..417e57a9e09 100755
--- a/sorc/link_workflow.sh
+++ b/sorc/link_workflow.sh
@@ -96,6 +96,15 @@ for package in "${packages[@]}"; do
     ${LINK_OR_COPY} "${HOMEgfs}/sorc/gdas.cd/sorc/${package}/src/${package}" .
 done
 
+# Link wxflow to ush/python
+cd "${HOMEgfs}/ush/python" || exit 1
+if [[ -d "${HOMEgfs}/sorc/wxflow/src/wxflow" ]]; then
+    if [[ -s "wxflow" ]]; then
+        rm -f "wxflow"
+    fi
+    ${LINK} "${HOMEgfs}/sorc/wxflow/src/wxflow" .
+fi
+
 # Link fix directories
 if [[ -n "${FIX_DIR}" ]]; then
     mkdir -p "${HOMEgfs}/fix" || exit 1
diff --git a/sorc/wxflow b/sorc/wxflow
index de88f849241..e952a8a2c5b 160000
--- a/sorc/wxflow
+++ b/sorc/wxflow
@@ -1 +1 @@
-Subproject commit de88f849241a7e5d7563d99d6543544f7faf785d
+Subproject commit e952a8a2c5b46960ab32ad0d9cb40cd080557f0f