diff --git a/dev/scripts/exglobal_atmos_chgres_gen_control.sh b/dev/scripts/exglobal_atmos_chgres_gen_control.sh
index 41eff5181d..814da83c24 100755
--- a/dev/scripts/exglobal_atmos_chgres_gen_control.sh
+++ b/dev/scripts/exglobal_atmos_chgres_gen_control.sh
@@ -77,7 +77,7 @@ cat << EOF > ./fort.41
 /
 EOF
 
-${APRUN_CHGRES} "${HOMEglobal}/sorc/ufs_utils.fd/exec/chgres_cube"
+${APRUN_CHGRES} "${EXECglobal}/chgres_cube"
 export err=$?
 if [[ ${err} -ne 0 ]]; then
     err_exit "chgres_cube failed to create cold start ICs, ABORT!"
diff --git a/modulefiles/gw_upp.wcoss2.lua b/modulefiles/gw_upp.wcoss2.lua
index 3b85f48164..7518274f74 100644
--- a/modulefiles/gw_upp.wcoss2.lua
+++ b/modulefiles/gw_upp.wcoss2.lua
@@ -3,7 +3,7 @@ Load environment to run the UPP on WCOSS2
 ]])
 
 local homeglobal=os.getenv("HOMEglobal") or ""
-prepend_path("MODULEPATH", pathJoin(homeglobal,"/sorc/ufs_model.fd/UFSATM/upp/modulefiles"))
+prepend_path("MODULEPATH", pathJoin(homeglobal,"/modulefiles/upp"))
 -- Load UPP modules
 load("wcoss2_intel")
 
diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
index d2572143ee..9de9e6843b 100755
--- a/sorc/link_workflow.sh
+++ b/sorc/link_workflow.sh
@@ -163,6 +163,7 @@ fi
 #--copy/link NoahMp table form ccpp-physics repository
 cd "${HOMEglobal}/parm/ufs" || exit 1
 ${LINK_OR_COPY} "${HOMEglobal}/sorc/ufs_model.fd/tests/parm/noahmptable.tbl" .
+${LINK_OR_COPY} "${HOMEglobal}/sorc/ufs_model.fd/tests/parm/fd_ufs.yaml" .
 
 cd "${HOMEglobal}/parm/post" || exit 1
 ${LINK_OR_COPY} "${HOMEglobal}/sorc/upp.fd/parm/params_grib2_tbl_new" .
@@ -215,6 +216,18 @@ for file in "${ufs_templates[@]}"; do
     ${LINK_OR_COPY} "${HOMEglobal}/sorc/ufs_model.fd/tests/parm/${file}" .
 done
 
+# Link the CCPP suite XML files from ufs-weather-model
+if [[ -d "${HOMEglobal}/sorc/ufs_model.fd/UFSATM/ccpp/suites" ]]; then
+    for suite_file in "${HOMEglobal}/sorc/ufs_model.fd/UFSATM/ccpp/suites"/suite_*.xml; do
+        [[ -f "${suite_file}" ]] || continue
+        local_name=$(basename "${suite_file}")
+        if [[ -s "${local_name}" ]]; then
+            rm -f "${local_name}"
+        fi
+        ${LINK_OR_COPY} "${suite_file}" .
+    done
+fi
+
 # Link the script from ufs-weather-model that parses the templates
 cd "${HOMEglobal}/ush" || exit 1
 if [[ -s "atparse.bash" ]]; then
@@ -222,6 +235,15 @@ if [[ -s "atparse.bash" ]]; then
 fi
 ${LINK_OR_COPY} "${HOMEglobal}/sorc/ufs_model.fd/tests/atparse.bash" .
 
+# Link UPP modulefiles for module loading
+cd "${HOMEglobal}/modulefiles" || exit 1
+if [[ -d "${HOMEglobal}/sorc/ufs_model.fd/UFSATM/upp/modulefiles" ]]; then
+    if [[ -d "upp" ]]; then
+        rm -rf "upp"
+    fi
+    ${LINK_OR_COPY} "${HOMEglobal}/sorc/ufs_model.fd/UFSATM/upp/modulefiles" upp
+fi
+
 # add ufs_utils parm dir
 if [[ -d "${HOMEglobal}/sorc/ufs_utils.fd" ]]; then
     cd "${HOMEglobal}/parm" || exit 1
@@ -413,7 +435,7 @@ if [[ -s "upp.x" ]]; then
 fi
 ${LINK_OR_COPY} "${HOMEglobal}/sorc/upp.fd/exec/upp.x" .
 
-for ufs_utilsexe in emcsfc_ice_blend emcsfc_snow2mdl global_cycle fregrid regridStates.x; do
+for ufs_utilsexe in chgres_cube emcsfc_ice_blend emcsfc_snow2mdl global_cycle fregrid regridStates.x; do
     if [[ -s "${ufs_utilsexe}" ]]; then
         rm -f "${ufs_utilsexe}"
     fi
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
index dcce592714..2b6f321770 100755
--- a/ush/forecast_predet.sh
+++ b/ush/forecast_predet.sh
@@ -245,7 +245,7 @@ FV3_predet() {
     # <0 means older adiabatic pre-conditioning
     na_init=${na_init:-1}
 
-    local suite_file="${HOMEglobal}/sorc/ufs_model.fd/UFSATM/ccpp/suites/suite_${CCPP_SUITE}.xml"
+    local suite_file="${HOMEglobal}/parm/ufs/suite_${CCPP_SUITE}.xml"
     if [[ ! -f "${suite_file}" ]]; then
         echo "FATAL ERROR: CCPP Suite file ${suite_file} does not exist, ABORT!"
         exit 2
diff --git a/ush/parsing_ufs_configure.sh b/ush/parsing_ufs_configure.sh
index 26b75a7de8..c8bb064306 100755
--- a/ush/parsing_ufs_configure.sh
+++ b/ush/parsing_ufs_configure.sh
@@ -128,7 +128,7 @@ UFS_configure() {
     echo "Rendered ufs.configure:"
     cat ufs.configure
 
-    cpreq "${HOMEglobal}/sorc/ufs_model.fd/tests/parm/fd_ufs.yaml" fd_ufs.yaml
+    cpreq "${HOMEglobal}/parm/ufs/fd_ufs.yaml" fd_ufs.yaml
 
     echo "SUB ${FUNCNAME[0]}: ufs.configure ends"