diff --git a/fsw_params.h b/fsw_params.h
--- a/fsw_params.h
+++ b/fsw_params.h
@@ -179,23 +179,22 @@ typedef struct ring_node
 #define TASKID_PRC2 19
 
 #define TASK_PRIORITY_SPIQ 5
-#define TASK_PRIORITY_WTDG 20
-#define TASK_PRIORITY_HOUS 30
-#define TASK_PRIORITY_CWF1 35 // CWF1 and CWF2 are never running together
-#define TASK_PRIORITY_CWF2 35 //
-#define TASK_PRIORITY_SWBD 37 // SWBD has a lower priority than WFRM, this is to extract the snapshot before sending it
+#define TASK_PRIORITY_WTDG 10
+#define TASK_PRIORITY_HOUS 20
+#define TASK_PRIORITY_AVF0 25
+#define TASK_PRIORITY_AVF1 30
+#define TASK_PRIORITY_AVF2 33
+#define TASK_PRIORITY_CWF1 35   // CWF1 and CWF2 are never running together
+#define TASK_PRIORITY_CWF2 35   //
+#define TASK_PRIORITY_SWBD 37   // SWBD has a lower priority than WFRM, this is to extract the snapshot before sending it
 #define TASK_PRIORITY_WFRM 40
-#define TASK_PRIORITY_AVF0 41
-#define TASK_PRIORITY_AVF1 42
-#define TASK_PRIORITY_SEND 45
-#define TASK_PRIORITY_RECV 45
+#define TASK_PRIORITY_CWF3 40   // there is a printf in this function, be careful with its priority wrt CWF1
 #define TASK_PRIORITY_ACTN 50
-// The following tasks use the SEND mesage queue
+#define TASK_PRIORITY_PRC2 90
 #define TASK_PRIORITY_PRC0 100
-#define TASK_PRIORITY_PRC1 100
-#define TASK_PRIORITY_PRC2 100
-#define TASK_PRIORITY_AVF2 105
-#define TASK_PRIORITY_CWF3 120 // there is a printf in this function, be careful with its priority wrt CWF1
+#define TASK_PRIORITY_PRC1 105
+#define TASK_PRIORITY_RECV 120
+#define TASK_PRIORITY_SEND 130
 #define TASK_PRIORITY_STAT 200
 #define TASK_PRIORITY_DUMB 200
 
diff --git a/fsw_params_processing.h b/fsw_params_processing.h
--- a/fsw_params_processing.h
+++ b/fsw_params_processing.h
@@ -20,7 +20,6 @@
 #define NB_RING_NODES_ASM_F1            3   // AT LEAST 3
 // F2
 #define NB_RING_NODES_SM_F2             5   // AT LEAST 3
-#define NB_RING_NODES_ASM_BURST_SBM_F2  3   // AT LEAST 3
 #define NB_RING_NODES_ASM_NORM_F2       3   // AT LEAST 3
 #define NB_RING_NODES_ASM_F2            3   // AT LEAST 3
 //