diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/LoTSS-observation-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/LoTSS-observation-scheduling-unit-observation-strategy.json
index 2342b8e760cb50f4533da66c7bcd63e70dad360f..8533887ee128142dd59557ed1c9aacdfc5f62db1 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/LoTSS-observation-scheduling-unit-observation-strategy.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/LoTSS-observation-scheduling-unit-observation-strategy.json
@@ -17,7 +17,7 @@
       "description":"Preprocessing Pipeline for Target Observation target1, SAP000",
       "specifications_doc":{
         "flag":{
-          "rfi_strategy":"auto",
+          "rfi_strategy":"HBAdefault",
           "outerchannels":true,
           "autocorrelations":true
         },
@@ -44,7 +44,7 @@
       "description":"Preprocessing Pipeline for Target Observation target2, SAP001",
       "specifications_doc":{
         "flag":{
-          "rfi_strategy":"auto",
+          "rfi_strategy":"HBAdefault",
           "outerchannels":true,
           "autocorrelations":true
         },
@@ -681,7 +681,7 @@
       "description":"Preprocessing Pipeline for Calibrator Observation 1",
       "specifications_doc":{
         "flag":{
-          "rfi_strategy":"auto",
+          "rfi_strategy":"HBAdefault",
           "outerchannels":true,
           "autocorrelations":true
         },
@@ -708,7 +708,7 @@
       "description":"Preprocessing Pipeline for Calibrator Observation 2",
       "specifications_doc":{
         "flag":{
-          "rfi_strategy":"auto",
+          "rfi_strategy":"HBAdefault",
           "outerchannels":true,
           "autocorrelations":true
         },
@@ -831,14 +831,14 @@
 
       ],
       "input":{
-        "role":"input",
+        "role":"any",
         "datatype":"visibilities"
       },
       "output":{
         "role":"correlator",
         "datatype":"visibilities"
       },
-      "consumer":"Pipeline 1",
+      "consumer":"Calibrator Pipeline 1",
       "producer":"Calibrator Observation 1",
       "dataformat":"MeasurementSet",
       "selection_doc":{
@@ -851,14 +851,14 @@
 
       ],
       "input":{
-        "role":"input",
+        "role":"any",
         "datatype":"visibilities"
       },
       "output":{
         "role":"correlator",
         "datatype":"visibilities"
       },
-      "consumer":"Pipeline 2",
+      "consumer":"Calibrator Pipeline 2",
       "producer":"Calibrator Observation 2",
       "dataformat":"MeasurementSet",
       "selection_doc":{
@@ -871,7 +871,7 @@
 
       ],
       "input":{
-        "role":"input",
+        "role":"any",
         "datatype":"visibilities"
       },
       "output":{
@@ -893,7 +893,7 @@
 
       ],
       "input":{
-        "role":"input",
+        "role":"any",
         "datatype":"visibilities"
       },
       "output":{
@@ -915,15 +915,15 @@
 
       ],
       "input":{
-        "role":"input",
+        "role":"any",
         "datatype":"visibilities"
       },
       "output":{
-        "role":"correlator",
+        "role":"any",
         "datatype":"visibilities"
       },
       "consumer":"Ingest",
-      "producer":"Pipeline 1",
+      "producer":"Calibrator Pipeline 1",
       "dataformat":"MeasurementSet",
       "selection_doc":{
 
@@ -935,15 +935,15 @@
 
       ],
       "input":{
-        "role":"input",
+        "role":"any",
         "datatype":"visibilities"
       },
       "output":{
-        "role":"correlator",
+        "role":"any",
         "datatype":"visibilities"
       },
       "consumer":"Ingest",
-      "producer":"Pipeline 2",
+      "producer":"Calibrator Pipeline 2",
       "dataformat":"MeasurementSet",
       "selection_doc":{
 
@@ -955,11 +955,11 @@
 
       ],
       "input":{
-        "role":"input",
+        "role":"any",
         "datatype":"visibilities"
       },
       "output":{
-        "role":"correlator",
+        "role":"any",
         "datatype":"visibilities"
       },
       "consumer":"Ingest",
@@ -975,11 +975,11 @@
 
       ],
       "input":{
-        "role":"input",
+        "role":"any",
         "datatype":"visibilities"
       },
       "output":{
-        "role":"correlator",
+        "role":"any",
         "datatype":"visibilities"
       },
       "consumer":"Ingest",
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json
index bd7eea6fc5ab98a051c05833e09c7baec4604a42..0c5ba135fd763e1fa4f82633b7df6688e05ebbe9 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json
@@ -103,7 +103,7 @@
         "datatype": "visibilities"
       },
       "output": {
-        "role": "correlator",
+        "role": "any",
         "datatype": "visibilities"
       },
       "dataformat": "MeasurementSet",