diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk
index 6d929b474c9ddf5173613e6dc1a9012f0248aec2..166dbcd9d2701f3f9a845f5220dae693beeb8cfb 100644
--- a/src/Rules.LXcray.mk
+++ b/src/Rules.LXcray.mk
@@ -55,7 +55,7 @@ ifeq "$(OPTLEVEL)" "DEBUG"
 OPT       = $(OPT_BASE) $(OPT_PERF0) $(OPT_CHECK)
 OPT0      = $(OPT_BASE) $(OPT_PERF0) $(OPT_CHECK)
 OPT_NOCB  = $(OPT_BASE) $(OPT_PERF0)
-CFLAGS   += -g -gdwarf-4
+CFLAGS   += "-g -gdwarf-4"
 endif
 #
 ifeq "$(OPTLEVEL)" "OPENACC"
@@ -249,9 +249,9 @@ MNH_COMPRESS=yes
 MNH_GRIBAPI=no
 #
 NETCDF_SUPPFLAGS='-emf'
-ECCODES_FFLAGS= -hcpu=x86-64 -emf 
+ECCODES_FFLAGS="-hcpu=x86-64 -emf"
 # -hsystem_alloc
-ECCODES_CFLAGS= -hcpu=x86-64 -gdwarf-4 
+ECCODES_CFLAGS="-hcpu=x86-64 -gdwarf-4"
 EC_CONF= -DCMAKE_BUILD_TYPE="RELEASE" -DIEEE_LE=1 
 CDF_CONF= CPP=cpp 
 HDF_CONF= CPP=cpp 
diff --git a/src/configure b/src/configure
index 6dd586c6d1be741b695ed17d9a30387f917476d8..8d7bfaba33eb0c4b739c2b0fea173596a15affe5 100755
--- a/src/configure
+++ b/src/configure
@@ -66,10 +66,10 @@ module purge
 #module load craype-x86-trento
 module load craype-x86-genoa
 module load craype-network-ofi
-module load PrgEnv-cray/8.3.3
-module load cce/15.0.1
-module load craype/2.7.19
-module load cray-mpich/8.1.24
+module load PrgEnv-cray/8.4.0
+module load cce/16.0.0
+module load craype/2.7.21
+module load cray-mpich/8.1.26
 module load libfabric/1.15.2.0
 #module load craype-accel-amd-gfx90a
 module load rocm/5.3.0
diff --git a/src/job_make_examples_HPE_adastra_genoa b/src/job_make_examples_HPE_adastra_genoa
index 2792f2b50c070f32483fa497932efaa005ec0611..0dee7e946b34a30bb6f4e3874b4ea285cf1e5472 100755
--- a/src/job_make_examples_HPE_adastra_genoa
+++ b/src/job_make_examples_HPE_adastra_genoa
@@ -1,7 +1,8 @@
 #!/bin/bash
 #SBATCH -J Examples
-#SBATCH -N 1            # nodes number
-#SBATCH -n 4            # CPUs number (on all nodes) 
+#SBATCH --nodes=1
+#SBATCH --ntasks-per-node=4 --cpus-per-task=1
+#SBATCH --threads-per-core=1 # --hint=nomultithread
 #SBATCH -C GENOA
 ##SBATCH --exclusive           
 #SBATCH -o Examples.eo%j   #