diff --git a/conf/cbe.config b/conf/cbe.config
index 18f72dc..89da3db 100755
--- a/conf/cbe.config
+++ b/conf/cbe.config
@@ -8,8 +8,10 @@ params {
 process {
   executor = 'slurm'
   queue = { task.memory <= 170.GB ? 'c' : 'm' }
-  clusterOptions = { task.time <= 1.h ? '--qos rapid' : task.time <= 8.h ? '--qos short': task.time <= 48.h ? '--qos medium' : '--qos long' }
   module = 'anaconda3/2019.10'
+  
+  // --signal option will be handled by nextflow after 21.10.0 release (see https://github.com/nextflow-io/nextflow/issues/2163)
+  clusterOptions = { '--signal B:USR2 ' << ( (queue == 'c' & task.time <= 1.h) ? '--qos rapid' : ( task.time <= 8.h ? '--qos short': ( task.time <= 48.h ? '--qos medium' : '--qos long' ) ) ) }
 }
 
 singularity {
@@ -20,6 +22,6 @@ singularity {
 params {
   params.max_time = 14.d
   params.max_cpus = 36
-  params.max_memory = 4.TB
+  params.max_memory = 1800.GB
   igenomes_base = '/resources/references/igenomes'
 }