diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh
index f37402c48..c7b850005 100755
--- a/scripts/exregional_make_grid.sh
+++ b/scripts/exregional_make_grid.sh
@@ -513,7 +513,7 @@ fi
 #
 # Set the name and path to the executable and make sure that it exists.
 #
-exec_fn="shave.x"
+exec_fn="shave"
 exec_fp="$EXECDIR/${exec_fn}"
 if [ ! -f "${exec_fp}" ]; then
   print_err_msg_exit "\
diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
index 6759edc64..3cd3dfdf7 100755
--- a/scripts/exregional_make_ics.sh
+++ b/scripts/exregional_make_ics.sh
@@ -493,7 +493,7 @@ hh="${EXTRN_MDL_CDATE:8:2}"
 #
 #-----------------------------------------------------------------------
 #
-exec_fn="chgres_cube.exe"
+exec_fn="chgres_cube"
 exec_fp="$EXECDIR/${exec_fn}"
 if [ ! -f "${exec_fp}" ]; then
   print_err_msg_exit "\
diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
index 84f317d74..6f074ae5d 100755
--- a/scripts/exregional_make_lbcs.sh
+++ b/scripts/exregional_make_lbcs.sh
@@ -344,7 +344,7 @@ esac
 #
 #-----------------------------------------------------------------------
 #
-exec_fn="chgres_cube.exe"
+exec_fn="chgres_cube"
 exec_fp="$EXECDIR/${exec_fn}"
 if [ ! -f "${exec_fp}" ]; then
   print_err_msg_exit "\
diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh
index 1d1f5586e..61639c3b3 100755
--- a/scripts/exregional_make_orog.sh
+++ b/scripts/exregional_make_orog.sh
@@ -181,7 +181,7 @@ mkdir_vrfy -p "${shave_dir}"
 # Set the name and path to the executable that generates the raw orography
 # file and make sure that it exists.
 #
-exec_fn="orog.x"
+exec_fn="orog"
 exec_fp="$EXECDIR/${exec_fn}"
 if [ ! -f "${exec_fp}" ]; then
   print_err_msg_exit "\
@@ -531,7 +531,7 @@ Filtering of orography complete."
 #
 # Set the name and path to the executable and make sure that it exists.
 #
-exec_fn="shave.x"
+exec_fn="shave"
 exec_fp="$EXECDIR/${exec_fn}"
 if [ ! -f "${exec_fp}" ]; then
   print_err_msg_exit "\
diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh
index 0244cd7cd..489a2b536 100755
--- a/ush/generate_FV3LAM_wflow.sh
+++ b/ush/generate_FV3LAM_wflow.sh
@@ -589,12 +589,28 @@ fi
 #-----------------------------------------------------------------------
 #
 if [ "${USE_CCPP}" = "TRUE" ]; then
-  exec_fn="fv3.exe"
+  exec_fn="NEMS.exe"
 else
-  exec_fn="fv3_32bit.exe"
+    print_err_msg_exit "\
+Running this workflow without CCPP is not supported at this time.
+Please set USE_CCPP=TRUE in your config.sh file.
+"
+fi
+
+exec_fp="${SR_WX_APP_TOP_DIR}/bin/${exec_fn}"
+#Check for the old build location for fv3 executable
+if [ ! -f "${exec_fp}" ]; then
+  exec_fp_alt="${UFS_WTHR_MDL_DIR}/build/${exec_fn}"
+  if [ ! -f "${exec_fp_alt}" ]; then
+    print_err_msg_exit "\
+The executable (exec_fp) for running the forecast model does not exist:
+  exec_fp = \"${exec_fp}\"
+Please ensure that you've built this executable."
+  else
+    exec_fp="${exec_fp_alt}"
+  fi
 fi
 
-exec_fp="${UFS_WTHR_MDL_DIR}/tests/${exec_fn}"
 if [ ! -f "${exec_fp}" ]; then
   print_err_msg_exit "\
 The executable (exec_fp) for running the forecast model does not exist:
diff --git a/ush/setup.sh b/ush/setup.sh
index bf9f38572..8d5add1c8 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -715,7 +715,7 @@ SORCDIR="$HOMErrfs/sorc"
 SRC_DIR="${SR_WX_APP_TOP_DIR}/src"
 PARMDIR="$HOMErrfs/parm"
 MODULES_DIR="$HOMErrfs/modulefiles"
-EXECDIR="${SR_WX_APP_TOP_DIR}/exec"
+EXECDIR="${SR_WX_APP_TOP_DIR}/bin"
 FIXrrfs="$HOMErrfs/fix"
 TEMPLATE_DIR="$USHDIR/templates"