diff --git a/Templates/installscript.template.bologna b/Templates/installscript.template.bologna
index 405abf4693b00521144dcbfbe43f43b4f64b596b..b9ec97d28f24ae410c8b638ea9d9a6fa241cef6f 100644
--- a/Templates/installscript.template.bologna
+++ b/Templates/installscript.template.bologna
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # ON ECS or HPC servers:
-# start with ecaccess-job-submit -queueName <QUEUENAME> <NAME_OF_THIS_FILE>  on gateway server
-# start with srun <NAME_OF_THIS_FILE> directly on machine
+# start with ecaccss-job-submit -queueName <QUEUENAME> <NAME_OF_THIS_FILE>  on gateway server
+# start with sbatch <NAME_OF_THIS_FILE> directly on machine
 
 #SBATCH --chdir=/scratch/$username
 #SBATCH --qos=el
@@ -10,23 +10,16 @@
 #SBATCH --output=flex_compile.%j.out
 #SBATCH --error=flex_compile.%j.out
 #SBATCH --mail-type=FAIL
-
-## CRAY specific batch requests
-##PBS -N flex_ecmwf
-##PBS -q ns
-##PBS -S /usr/bin/ksh
-##PBS -o $$SCRATCH/flex_extract.$${Jobname}.$${Job_ID}.out
+#SBATCH --mail-user=$username
 # job output is in .ecaccess_DO_NOT_REMOVE
-##PBS -j oe
-##PBS -V
-##PBS -l EC_threads_per_task=1
-##PBS -l EC_memory_per_task=3200MB
 
 set -x
 export VERSION=$version_number
 case $${EC_CLUSTER} in
   *ecs*)
-#  module switch prgenv/gnu
+  module purge
+  module load prgenv/gnu
+  module load gcc/8.4.1
   module load ecmwf-toolbox
   module load python3
   module load ecaccess
@@ -34,7 +27,8 @@ case $${EC_CLUSTER} in
   export MAKEFILE=$makefile
   ;;
   *hpc*)
-#  module switch PrgEnv-cray PrgEnv-intel
+  module purge
+  module load prgenv/gnu gcc/8.4.1
   module load python3
   module load ecmwf-toolbox
   module load ecaccess
diff --git a/Templates/jobscript.template.bologna b/Templates/jobscript.template.bologna
index 7635befaf24ad2ec65d6b82f638acc3a9643f50d..07d00355a4a51be63c4a30c666e7bdd73f899e9c 100644
--- a/Templates/jobscript.template.bologna
+++ b/Templates/jobscript.template.bologna
@@ -2,7 +2,7 @@
 
 # ON ECS or HPC:
 # start with ecaccess-job-submit -queueName <QUEUE_NAME> <NAME_OF_THIS_FILE>  on gateway server
-# start with srun <NAME_OF_THIS_FILE> directly on machine
+# start with sbatch <NAME_OF_THIS_FILE> directly on machine
 
 #SBATCH --chdir=/scratch/$username
 #SBATCH --qos=el
@@ -10,30 +10,24 @@
 #SBATCH --output=flex_extract.%j.out
 #SBATCH --error=flex_extract.%j.out
 #SBATCH --mail-type=FAIL
+#SBATCH --mail-user=$username
 #SBATCH --time=24:00:00
-
-## CRAY specific batch requests
-##PBS -N flex_extract
-##PBS -q np
-##PBS -S /usr/bin/ksh
-## -o $$$${SCRATCH}/flex_ecmwf.$$$${PBS_JOBID}.out
 ## job output is in .ecaccess_DO_NOT_REMOVE
-##PBS -j oe
-##PBS -V
-##PBS -l EC_threads_per_task=24
-##PBS -l EC_memory_per_task=32000MB
 
 set -x
 export VERSION=$version_number
 case $$$${EC_CLUSTER} in
   *ecs*)
+  module purge
+  module load prgenv/gnu gcc/8.4.1
   module load python3
   module load ecmwf-toolbox
   module load ecaccess
   export PATH=$$$${PATH}:$fp_root_path
   ;;
   *hpc*)
-#  module switch PrgEnv-cray PrgEnv-intel
+  module purge
+  module load prgenv/gnu gcc/8.4.1
   module load python3
   module load ecmwf-toolbox
   module load ecaccess