diff --git a/sorc/test/retrieve_data.sh b/sorc/test/retrieve_data.sh
index b45b028c..68ad5026 100755
--- a/sorc/test/retrieve_data.sh
+++ b/sorc/test/retrieve_data.sh
@@ -23,7 +23,7 @@ export PATH=${HOME}/.local/bin:${PATH}
 
 # set envs
 DATA_ROOT=${project_source_dir}/../fix
-INPUTDATA_ROOT=${DATA_ROOT}/UFS_WM
+INPUTDATA_ROOT=${DATA_ROOT}
 
 [[ ! -d ${INPUTDATA_ROOT} ]] && mkdir -p ${INPUTDATA_ROOT}
 RTPWD=${DATA_ROOT}/test_base
@@ -38,11 +38,11 @@ aws s3 sync --no-sign-request ${AWS_URL}/test_base/datm_cdeps_lnd_gswp3_intel .
 cd ${project_source_dir}
 
 # DATM data
-DES_DIR=${INPUTDATA_ROOT}/DATM_GSWP3_input_data
+DES_DIR=${INPUTDATA_ROOT}/DATM_input_data/gswp3
 [[ ! -d ${DES_DIR} ]] && mkdir -p ${DES_DIR}
 echo ${DES_DIR}
 cd $DES_DIR
-aws s3 sync --no-sign-request ${SRC_DIR}/DATM_GSWP3_input_data .
+aws s3 sync --no-sign-request ${SRC_DIR}/DATM_input_data/gswp3 .
 cd ${project_source_dir}
 
 # fixed data
@@ -53,17 +53,17 @@ cd $DES_DIR
 aws s3 sync --no-sign-request ${AWS_URL}/FV3_fix_tiled/C96 .
 
 # input data
-DES_DIR=${INPUTDATA_ROOT}/FV3_input_data/INPUT
+DES_DIR=${INPUTDATA_ROOT}/FV3_fix_tiled/C96
 [[ ! -d ${DES_DIR} ]] && mkdir -p ${DES_DIR}
 echo ${DES_DIR}
 cd $DES_DIR
-aws s3 cp --no-sign-request ${SRC_DIR}/FV3_input_data/INPUT/C96_grid.tile1.nc .
-aws s3 cp --no-sign-request ${SRC_DIR}/FV3_input_data/INPUT/C96_grid.tile2.nc .
-aws s3 cp --no-sign-request ${SRC_DIR}/FV3_input_data/INPUT/C96_grid.tile3.nc .
-aws s3 cp --no-sign-request ${SRC_DIR}/FV3_input_data/INPUT/C96_grid.tile4.nc .
-aws s3 cp --no-sign-request ${SRC_DIR}/FV3_input_data/INPUT/C96_grid.tile5.nc .
-aws s3 cp --no-sign-request ${SRC_DIR}/FV3_input_data/INPUT/C96_grid.tile6.nc .
-aws s3 cp --no-sign-request ${SRC_DIR}/FV3_input_data/INPUT/grid_spec.nc .
+aws s3 cp --no-sign-request ${SRC_DIR}/FV3_fix_tiled/C96/C96_grid.tile1.nc .
+aws s3 cp --no-sign-request ${SRC_DIR}/FV3_fix_tiled/C96/C96_grid.tile2.nc .
+aws s3 cp --no-sign-request ${SRC_DIR}/FV3_fix_tiled/C96/C96_grid.tile3.nc .
+aws s3 cp --no-sign-request ${SRC_DIR}/FV3_fix_tiled/C96/C96_grid.tile4.nc .
+aws s3 cp --no-sign-request ${SRC_DIR}/FV3_fix_tiled/C96/C96_grid.tile5.nc .
+aws s3 cp --no-sign-request ${SRC_DIR}/FV3_fix_tiled/C96/C96_grid.tile6.nc .
+aws s3 cp --no-sign-request ${SRC_DIR}/FV3_fix_tiled/C96/grid_spec.nc .
 cd ${project_source_dir}
 
 # NOAHMP ICs
diff --git a/sorc/test/run_ufs_datm_lnd.sh b/sorc/test/run_ufs_datm_lnd.sh
index 7c13afcd..52b35466 100755
--- a/sorc/test/run_ufs_datm_lnd.sh
+++ b/sorc/test/run_ufs_datm_lnd.sh
@@ -14,7 +14,15 @@ MACHINE_ID=${MACHINE_ID:-hera}
 TEST_NAME=datm_cdeps_lnd_gswp3
 PATHRT=${project_source_dir}/ufs_model.fd/tests
 FIXdir=${project_source_dir}/../fix
-INPUTDATA_ROOT=${FIXdir}/UFS_WM
+if [[ "${MACHINE_ID}" == "hera" ]]; then
+  INPUTDATA_ROOT="/scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501"
+elif [[ "${MACHINE_ID}" == "orion" ]] || [[ "${MACHINE_ID}" == "hercules" ]]; then
+  INPUTDATA_ROOT="/work/noaa/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501"
+else
+  echo "WARNING: input data path is not specified for this machine."
+  INPUTDATA_ROOT=${FIXdir}
+fi
+
 RT_COMPILER=${RT_COMPILER:-intel}
 ATOL="1e-7"
 source ${PATHRT}/detect_machine.sh