diff --git a/Templates/installscript.template.reading b/Templates/installscript.template.reading
index ac699b8d60bfb238c8678aa1dd61f94d22f5eb44..422a7f304a25eeaf4da3653100142c7c300f0d4e 100644
--- a/Templates/installscript.template.reading
+++ b/Templates/installscript.template.reading
@@ -4,19 +4,20 @@
 # start with ecaccess-job-submit -queueName ecgb NAME_OF_THIS_FILE  on gateway server
 # start with sbatch NAME_OF_THIS_FILE directly on machine
 
-#SBATCH --workdir=/scratch/ms/$usergroup/$username
+#SBATCH --workdir=$${SCRATCH}
 #SBATCH --qos=normal
 #SBATCH --job-name=flex_ecmwf
 #SBATCH --output=flex_ecmwf.%j.out
 #SBATCH --error=flex_ecmwf.%j.out
 #SBATCH --mail-type=FAIL
+#SBATCH --mail-user=$username
 #SBATCH --time=12:00:00
 
 ## CRAY specific batch requests
 ##PBS -N flex_ecmwf
 ##PBS -q ns
 ##PBS -S /usr/bin/ksh
-##PBS -o /scratch/ms/$usergroup/$username/flex_ecmwf.$${Jobname}.$${Job_ID}.out
+##PBS -o $${SCRATCH}/flex_ecmwf.$${Jobname}.$${Job_ID}.out
 # job output is in .ecaccess_DO_NOT_REMOVE
 ##PBS -j oe
 ##PBS -V
diff --git a/Templates/jobscript.template.reading b/Templates/jobscript.template.reading
index 7cd4873ed9ccd2edaa963499226cdda663f342a8..aba3bbba5dfb83d17eb278adca5a213756aef94b 100644
--- a/Templates/jobscript.template.reading
+++ b/Templates/jobscript.template.reading
@@ -4,7 +4,7 @@
 # start with ecaccess-job-submit -queueName ecgb NAME_OF_THIS_FILE  on gateway server
 # start with sbatch NAME_OF_THIS_FILE directly on machine
 
-#SBATCH --workdir=/scratch/ms/$usergroup/$username
+#SBATCH --workdir=$$$$SCRATCH
 #SBATCH --qos=normal
 #SBATCH --job-name=flex_ecmwf
 #SBATCH --output=flex_ecmwf.%j.out
@@ -16,7 +16,7 @@
 ##PBS -N flex_ecmwf
 ##PBS -q np
 ##PBS -S /usr/bin/ksh
-## -o /scratch/ms/$usergroup/$username/flex_ecmwf.$$$${PBS_JOBID}.out
+## -o $$$${SCRATCH}/flex_ecmwf.$$$${PBS_JOBID}.out
 ## job output is in .ecaccess_DO_NOT_REMOVE
 ##PBS -j oe
 ##PBS -V