diff --git a/.cicd/scripts/create_baseline.sh b/.cicd/scripts/create_baseline.sh
index 7563f34a9c..2ceed2f1fe 100755
--- a/.cicd/scripts/create_baseline.sh
+++ b/.cicd/scripts/create_baseline.sh
@@ -64,6 +64,7 @@ function create_baseline() {
 		    echo "Creating baselines on ${machine}"
 		    export dprefix=/lfs5/NAGAPE/${ACCNR}/${USER}
 		    sed 's|/lfs4/HFIP/${ACCNR}/${USER}|/lfs4/HFIP/hfv3gfs/${USER}|g' -i rt.sh
+		    sed 's|/lfs5/HFIP/${ACCNR}/${USER}|/lfs5/NAGAPE/${ACCNR}/${USER}|g' -i rt.sh
 		    local workflow="-r"
 		    ./rt.sh -a "${ACCNR}" -c "${workflow}" "${opt}" "${suite}" | tee "${WORKSPACE}/tests/logs/RT-run-${machine}.log"
 		    status=${PIPESTATUS[0]}
diff --git a/.cicd/scripts/regression_test.sh b/.cicd/scripts/regression_test.sh
index c56ae35ab0..4ed79eec40 100755
--- a/.cicd/scripts/regression_test.sh
+++ b/.cicd/scripts/regression_test.sh
@@ -64,6 +64,7 @@ function regression_test() {
 		    echo "Running regression tests on ${machine}"
 		    export dprefix=/lfs5/NAGAPE/${ACCNR}/${USER}
 		    sed 's|/lfs4/HFIP/${ACCNR}/${USER}|/lfs4/HFIP/hfv3gfs/${USER}|g' -i rt.sh
+		    sed 's|/lfs5/HFIP/${ACCNR}/${USER}|/lfs5/NAGAPE/${ACCNR}/${USER}|g' -i rt.sh
 		    local workflow="-r"
 		    ./rt.sh -a "${ACCNR}" "${workflow}" "${opt}" "${suite}" | tee "${WORKSPACE}/tests/logs/RT-run-${machine}.log"
 		    status=${PIPESTATUS[0]}