diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 252095f47f011828adf0e03912b978f20367d9b3..32357f9ca061b6490771d551ae0f3125fba3db4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -401,6 +401,7 @@ unit_test_TMSS_Frontend:
     - npx kill-port 3000
     - npm run cleanTemplateSchemas
   interruptible: true
+  allow_failure: true
   needs:
     - build_SCU
   artifacts:
diff --git a/LCS/PyCommon/json_utils.py b/LCS/PyCommon/json_utils.py
index 0c8c4810ed4991a73df4139eaa668d725111570f..9fbf5ce218dc5b2d543aaca43378367cb6083181 100644
--- a/LCS/PyCommon/json_utils.py
+++ b/LCS/PyCommon/json_utils.py
@@ -477,4 +477,11 @@ def validate_json_object_with_schema(json_object, schema, add_defaults: bool=Fal
     return json_object
 
 
-
+def without_schema_property(json_doc: dict) -> dict:
+    '''returns a copy of the json_doc without the $schema property if present'''
+    json_doc_copy = deepcopy(json_doc)
+    try:
+        del json_doc_copy['$schema']
+    except KeyError:
+        pass
+    return json_doc_copy
diff --git a/SAS/DataManagement/Cleanup/CleanupService/test/t_cleanup_tmss_integration_test.py b/SAS/DataManagement/Cleanup/CleanupService/test/t_cleanup_tmss_integration_test.py
index 946f170111bd8a29a261610ce2d0e2e7c3cf43a5..8aa29128eba8970b8a00866b683bcb9b4b123de0 100755
--- a/SAS/DataManagement/Cleanup/CleanupService/test/t_cleanup_tmss_integration_test.py
+++ b/SAS/DataManagement/Cleanup/CleanupService/test/t_cleanup_tmss_integration_test.py
@@ -59,11 +59,13 @@ class TestCleanupTMSSIntegration(unittest.TestCase):
                 scheduling_set.project.auto_pin = True # all tasks should pin their output data by default
                 scheduling_set.project.save()
 
-                strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="Short Test Observation - Pipeline - Ingest")
+                strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="IM LBA Survey - 3 Beams")
                 scheduling_unit_spec = add_defaults_to_json_object_for_schema(strategy_template.template, strategy_template.scheduling_unit_template.schema)
-                scheduling_unit_spec['tasks']['Observation']['specifications_doc']['station_configuration']['SAPs'][0]['subbands'] = [0,1] #limit nr of subbands for readability
-                scheduling_unit_spec['tasks']['Observation']['specifications_doc']['QA']['plots']['enabled'] = False
-                scheduling_unit_spec['tasks']['Observation']['specifications_doc']['QA']['file_conversion']['enabled'] = False
+                # slim down the number of SAP-subbands/QA for debugging reabality
+                for sap_nr, SAP in enumerate(scheduling_unit_spec['tasks']['Combined Observation']['specifications_doc']['station_configuration']['SAPs']):
+                    SAP['subbands'] = [sap_nr]
+                scheduling_unit_spec['tasks']['Combined Observation']['specifications_doc']['QA']['plots']['enabled'] = False
+                scheduling_unit_spec['tasks']['Combined Observation']['specifications_doc']['QA']['file_conversion']['enabled'] = False
 
                 scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(**SchedulingUnitDraft_test_data(template=strategy_template.scheduling_unit_template,
                                                                                                                   scheduling_set=scheduling_set))
diff --git a/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py b/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py
index a5693bc8039159ffa1eb59fe07e5ee63010a7266..044972bc1e07ae2ad6f9e32fba489e98bb5ab1c5 100755
--- a/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py
+++ b/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py
@@ -86,7 +86,7 @@ class BaseDynamicSchedulingTestCase(unittest.TestCase):
         cls.scheduler = Scheduler()
 
         # ensure that the "age" of a scheduling unit does not play a role. We don't want time dependencies in tests because they behave differently on each system.
-        weight_factor, created = models.SchedulingConstraintsWeightFactor.objects.get_or_create(scheduling_constraints_template=models.SchedulingConstraintsTemplate.objects.get(name="constraints", version=1), constraint_name="age")
+        weight_factor, created = models.SchedulingConstraintsWeightFactor.objects.get_or_create(scheduling_constraints_template=models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints", version=1), constraint_name="age")
         weight_factor.weight = 0
         weight_factor.save()
 
@@ -102,12 +102,12 @@ class BaseDynamicSchedulingTestCase(unittest.TestCase):
                                                   interrupts_telescope=False,
                                                   priority_queue=None,
                                                   unit_priority: float=1.0) -> models.SchedulingUnitDraft:
-        constraints_template = models.SchedulingConstraintsTemplate.objects.get(name="constraints")
+        constraints_template = models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints")
         constraints = add_defaults_to_json_object_for_schema(constraints or {}, constraints_template.schema)
 
         # we're testing at scheduling unit level here.
         # so, use a simple template with just one observation.
-        strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="Simple Observation")
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="Simple Observation")
         scheduling_unit_spec = add_defaults_to_json_object_for_schema(strategy_template.template,
                                                                       strategy_template.scheduling_unit_template.schema)
         scheduling_unit_spec['tasks']['Observation']['specifications_doc']['duration'] = obs_duration
@@ -908,7 +908,7 @@ class TestDynamicScheduling(BaseDynamicSchedulingTestCase):
         And within the same queue and project rank, units should be scheduled in unit ranking order
         """
         # use fixed weights for deterministic test behaviour
-        constraints_template = models.SchedulingConstraintsTemplate.objects.get(name="constraints", version=1)
+        constraints_template = models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints", version=1)
         wf_scheduling_unit_rank, created = models.SchedulingConstraintsWeightFactor.objects.get_or_create(scheduling_constraints_template=constraints_template, constraint_name="scheduling_unit_rank")
         wf_scheduling_unit_rank.weight = 0.5
         wf_scheduling_unit_rank.save()
@@ -986,7 +986,7 @@ class TestDynamicScheduling(BaseDynamicSchedulingTestCase):
         """
         Check if the event handling in the dynamic scheduler picks up events from weightfacotr updates, and reschedules the units.
         """
-        constraints_template = models.SchedulingConstraintsTemplate.objects.get(name="constraints", version=1)
+        constraints_template = models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints", version=1)
 
         # start with weight su_prio=0 and project_prio=0.9
         wf_scheduling_unit_rank, created = models.SchedulingConstraintsWeightFactor.objects.get_or_create(scheduling_constraints_template=constraints_template, constraint_name="scheduling_unit_rank")
@@ -1189,9 +1189,9 @@ class TestReservedStationsTimeWindows(BaseDynamicSchedulingTestCase):
     def setUpClass(cls) -> None:
         super().setUpClass()
 
-        # create a three re-usable variants scheduling_unit_blueprint, based on the "HBA single beam imaging" strategy
+        # create a three re-usable variants scheduling_unit_blueprint, based on the "IM HBA - 1 Beam" strategy
         # one with the default stations groups, the other with just CS001, the last with two core stations
-        strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="HBA single beam imaging")
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA - 1 Beam")
 
         scheduling_unit_draft = create_scheduling_unit_draft_from_observing_strategy_template(strategy_template, cls.scheduling_set_medium, "Test Scheduling Unit many stations")
         cls.scheduling_unit_blueprint = create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft(scheduling_unit_draft)
diff --git a/SAS/TMSS/backend/services/scheduling/test/t_scheduling_constraints.py b/SAS/TMSS/backend/services/scheduling/test/t_scheduling_constraints.py
index 4d25bf978bfa88b29cb3070d950f6936d410b20d..974a1dd133b1665d3e3280cd39e2169617b72f75 100755
--- a/SAS/TMSS/backend/services/scheduling/test/t_scheduling_constraints.py
+++ b/SAS/TMSS/backend/services/scheduling/test/t_scheduling_constraints.py
@@ -90,12 +90,12 @@ class BaseSchedulingConstraintsTestCase(unittest.TestCase):
     def create_simple_observation_scheduling_unit(name:str=None, scheduling_set=None,
                                                   obs_duration:int=60,
                                                   constraints=None) -> models.SchedulingUnitDraft:
-        constraints_template = models.SchedulingConstraintsTemplate.objects.get(name="constraints")
+        constraints_template = models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints")
         constraints = add_defaults_to_json_object_for_schema(constraints or {}, constraints_template.schema)
 
         # we're testing at scheduling unit level here.
         # so, use a simple template with just one observation.
-        strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="Simple Observation")
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="Simple Observation")
         scheduling_unit_spec = add_defaults_to_json_object_for_schema(strategy_template.template,
                                                                       strategy_template.scheduling_unit_template.schema)
         scheduling_unit_spec['tasks']['Observation']['specifications_doc']['duration'] = obs_duration
diff --git a/SAS/TMSS/backend/services/scheduling/test/t_subtask_scheduling_service.py b/SAS/TMSS/backend/services/scheduling/test/t_subtask_scheduling_service.py
index 2d014a9feb4de280b7a06d5c50576bbc5a3cc351..691a39ae539b710af9c78989818b1ebf704fb317 100755
--- a/SAS/TMSS/backend/services/scheduling/test/t_subtask_scheduling_service.py
+++ b/SAS/TMSS/backend/services/scheduling/test/t_subtask_scheduling_service.py
@@ -145,14 +145,14 @@ class TestSubtaskSchedulingService(unittest.TestCase):
         with BusListenerJanitor(service):
             # -------------------------
             # setup of objects: create the UC1 scheduling unit, and then select the first runnable subtasks
-            strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+            strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
             spec = add_defaults_to_json_object_for_schema(strategy_template.template, strategy_template.scheduling_unit_template.schema)
-            scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(name="LoTSS Observing strategy",
+            scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(name="IM HBA LoTSS - 2 Beams",
                                                                               scheduling_set=models.SchedulingSet.objects.create(**SchedulingSet_test_data()),
                                                                               specifications_template=strategy_template.scheduling_unit_template,
                                                                               observation_strategy_template=strategy_template,
-                                                                              scheduling_constraints_doc=get_default_json_object_for_schema(models.SchedulingConstraintsTemplate.objects.get(name="constraints").schema),
-                                                                              scheduling_constraints_template=models.SchedulingConstraintsTemplate.objects.get(name="constraints"))
+                                                                              scheduling_constraints_doc=get_default_json_object_for_schema(models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints").schema),
+                                                                              scheduling_constraints_template=models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints"))
 
             update_task_graph_from_specifications_doc(scheduling_unit_draft, spec)
             scheduling_unit_blueprint = create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft(scheduling_unit_draft)
diff --git a/SAS/TMSS/backend/services/workflow_service/test/t_workflow_qaworkflow.py b/SAS/TMSS/backend/services/workflow_service/test/t_workflow_qaworkflow.py
index 28f2289257e8ca084f01f1db539af3a3f380eeaa..7e265d68173fdc9b3b34334e891656b86f75de1c 100755
--- a/SAS/TMSS/backend/services/workflow_service/test/t_workflow_qaworkflow.py
+++ b/SAS/TMSS/backend/services/workflow_service/test/t_workflow_qaworkflow.py
@@ -90,7 +90,7 @@ class SchedulingUnitFlowTest(unittest.TestCase):
         service = create_workflow_service(handler_type=SchedulingUnitFlowTest.TestSchedulingUnitEventMessageHandler,
                                           exchange=self.tmp_exchange.address)
         with BusListenerJanitor(service):
-            strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+            strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
 
             scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(
                                             name="Test Scheduling Unit UC1",
@@ -387,7 +387,7 @@ class SchedulingUnitFlowTest(unittest.TestCase):
                                           exchange=self.tmp_exchange.address)
         with BusListenerJanitor(service):
 
-            strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+            strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
 
             scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(
                                             name="Test Scheduling Unit UC1",
@@ -580,7 +580,7 @@ class SchedulingUnitFlowTest(unittest.TestCase):
         service = create_workflow_service(handler_type=SchedulingUnitFlowTest.TestSchedulingUnitEventMessageHandler,
                                           exchange=self.tmp_exchange.address)
         with BusListenerJanitor(service):
-            strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+            strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
 
             scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(
                                             name="Test Scheduling Unit UC1",
@@ -801,7 +801,7 @@ class SchedulingUnitFlowTest(unittest.TestCase):
         service = create_workflow_service(handler_type=SchedulingUnitFlowTest.TestSchedulingUnitEventMessageHandler,
                                           exchange=self.tmp_exchange.address)
         with BusListenerJanitor(service):
-            strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+            strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
 
             scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(
                                             name="Test Scheduling Unit UC1",
@@ -1080,7 +1080,7 @@ class SchedulingUnitFlowTest(unittest.TestCase):
         service = create_workflow_service(handler_type=SchedulingUnitFlowTest.TestSchedulingUnitEventMessageHandler,
                                           exchange=self.tmp_exchange.address)
         with BusListenerJanitor(service):
-            strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+            strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
 
             scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(
                                             name="Test Scheduling Unit UC1",
@@ -1351,7 +1351,7 @@ class SchedulingUnitFlowTest(unittest.TestCase):
         service = create_workflow_service(handler_type=SchedulingUnitFlowTest.TestSchedulingUnitEventMessageHandler,
                                           exchange=self.tmp_exchange.address)
         with BusListenerJanitor(service):
-            strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+            strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
 
             scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(
                 name="Test Scheduling Unit UC1",
diff --git a/SAS/TMSS/backend/src/migrate_momdb_to_tmss.py b/SAS/TMSS/backend/src/migrate_momdb_to_tmss.py
index 2cbb910899f45d925c1302b0a5b65330851a952f..ec10e31465a4a6844dcfa71ba2090c8ae46e8598 100755
--- a/SAS/TMSS/backend/src/migrate_momdb_to_tmss.py
+++ b/SAS/TMSS/backend/src/migrate_momdb_to_tmss.py
@@ -317,7 +317,7 @@ def get_or_create_task_for_subtask(scheduling_unit_draft, scheduling_unit_bluepr
                 return draft, blueprint
             else:
                 try:
-                    return models.TaskTemplate.objects.get(name=details['default_template'])
+                    return models.TaskTemplate.get_version_or_latest(name=details['default_template'])
                 except:
                     task_template = _dummy_task_template(details['template'])
 
@@ -350,7 +350,7 @@ def get_or_create_task_for_subtask(scheduling_unit_draft, scheduling_unit_bluepr
 def _dummy_subtask_template(name):
     template_name = "%s_dummy" % name
     try:
-        return models.SubtaskTemplate.objects.get(name=template_name)
+        return models.SubtaskTemplate.get_version_or_latest(name=template_name)
     except:
         dummy_template_details = {"name": template_name,
                                   "description": "Dummy subtask template for MoM migration, when no matching template in TMSS",
@@ -368,7 +368,7 @@ def _dummy_subtask_template(name):
 def _dummy_scheduling_unit_template(name):
     template_name = "%s_dummy" % name
     try:
-        return models.SchedulingUnitTemplate.objects.get(name=template_name)
+        return models.SchedulingUnitTemplate.get_version_or_latest(name=template_name)
     except:
         dummy_scheduling_unit_template_details = {"name": template_name,
                                   "description": "Dummy scheduling unit template for MoM migration, when no matching template in TMSS",
@@ -383,7 +383,7 @@ def _dummy_scheduling_unit_template(name):
 def _dummy_task_template(name):
     template_name = "%s_dummy" % name
     try:
-        return models.TaskTemplate.objects.get(name=template_name)
+        return models.TaskTemplate.get_version_or_latest(name=template_name)
     except:
         dummy_task_template_details = {"name": template_name,
                                        "description": 'Dummy task template for MoM migration, when no matching template in TMSS',
@@ -471,7 +471,7 @@ def create_subtask_trees_for_project_in_momdb(project_mom2id, project):
 
         if template_name is not None:
             try:
-                specifications_template = models.SubtaskTemplate.objects.get(name=template_name)
+                specifications_template = models.SubtaskTemplate.get_version_or_latest(name=template_name)
                 logger.info('...found SubtaskTemplate id=%s for subtask mom2id=%s templatename=%s' % (specifications_template.id, mom_details["mom2id"], template_name))
             except:
                 # todo: create a lot of templates to reflect what was used for the actual task?
@@ -489,7 +489,7 @@ def create_subtask_trees_for_project_in_momdb(project_mom2id, project):
 
         # scheduling unit template
         try:
-            scheduling_unit_template = models.SchedulingUnitTemplate.objects.get(name=template_name)
+            scheduling_unit_template = models.SchedulingUnitTemplate.get_version_or_latest(name=template_name)
             logger.info('...found SchedulingUnitTemplate id=%s for subtask mom2id=%s templatename=%s' % (scheduling_unit_template.id, mom_details["mom2id"], template_name))
         except:
             scheduling_unit_template = _dummy_scheduling_unit_template(template_name)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/feedback.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/feedback.py
index 07f02c6f7690e2e72db5f4f7eade04fd5e4a01c3..6f95de76f9d404a449ce2122f4cc0dbfe5510dd5 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/feedback.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/feedback.py
@@ -310,7 +310,7 @@ def observation_process_feedback_to_feedback_doc_and_template(feedback: paramete
         }
     }
 
-    template = SubtaskFeedbackTemplate.objects.get(name='observation')
+    template = SubtaskFeedbackTemplate.get_version_or_latest(name='observation')
 
     return (doc, template)
 
@@ -349,7 +349,7 @@ def process_feedback_into_subtask_properties(subtask:Subtask, feedback: paramete
         else:
             # this subtask type has no processing feedback
             (subtask.processing_feedback_doc,
-            subtask.processing_feedback_template) = ({}, SubtaskFeedbackTemplate.objects.get(name='empty'))
+            subtask.processing_feedback_template) = ({}, SubtaskFeedbackTemplate.get_version_or_latest(name='empty'))
             subtask.save()
     except Exception as e:
         # just log any feedback handling/processing exceptions, do not go to error, stay in FINISHING state so the user can repair.
@@ -385,10 +385,10 @@ def process_feedback_into_subtask_dataproducts(subtask:Subtask, feedback: parame
             # derive values or collect for different subtask types
             if subtask.specifications_template.type.value == SubtaskType.Choices.OBSERVATION.value:
                 if dataproduct.datatype.value == "visibilities":
-                    dataproduct.feedback_template = DataproductFeedbackTemplate.objects.get(name='feedback')
+                    dataproduct.feedback_template = DataproductFeedbackTemplate.get_version_or_latest(name='feedback')
                     dataproduct.feedback_doc = observation_correlated_feedback_to_feedback_doc(dp_feedback)
                 elif dataproduct.datatype.value == "time series":
-                    dataproduct.feedback_template = DataproductFeedbackTemplate.objects.get(name='feedback')
+                    dataproduct.feedback_template = DataproductFeedbackTemplate.get_version_or_latest(name='feedback')
                     dataproduct.feedback_doc = observation_beamformed_feedback_to_feedback_doc(dp_feedback)
                 else:
                     logger.error("cannot process feedback for dataproduct with specification template %s", dataproduct.specifications_template.name)
@@ -398,19 +398,19 @@ def process_feedback_into_subtask_dataproducts(subtask:Subtask, feedback: parame
                     # each file has exactly 1 input.
                     input_dataproduct = DataproductTransform.objects.get(output=dataproduct).input
 
-                    dataproduct.feedback_template = DataproductFeedbackTemplate.objects.get(name='feedback')
+                    dataproduct.feedback_template = DataproductFeedbackTemplate.get_version_or_latest(name='feedback')
                     dataproduct.feedback_doc = preprocessing_pipeline_feedback_to_feedback_doc(input_dataproduct.feedback_doc, dp_feedback)
 
                 elif subtask.specifications_template.name == "pulsar pipeline":
                     if dataproduct.specifications_template.name == "pulp summary":
                         # pulp summary file
-                        dataproduct.feedback_template = DataproductFeedbackTemplate.objects.get(name='pulp summary')
+                        dataproduct.feedback_template = DataproductFeedbackTemplate.get_version_or_latest(name='pulp summary')
                         dataproduct.feedback_doc = pulsar_pipeline_summary_feedback_to_feedback_doc(dp_feedback)
                     else:
                         # pulp analysis file, which has 1-4 inputs. just use the first.
                         input_dataproduct = DataproductTransform.objects.filter(output=dataproduct).first().input
 
-                        dataproduct.feedback_template = DataproductFeedbackTemplate.objects.get(name='feedback')
+                        dataproduct.feedback_template = DataproductFeedbackTemplate.get_version_or_latest(name='feedback')
                         dataproduct.feedback_doc = pulsar_pipeline_analysis_feedback_to_feedback_doc(input_dataproduct.feedback_doc, dp_feedback)
                 else:
                     logger.error("cannot process feedback for pipelines with schema named %s", subtask.specifications_template.name)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/conversions.py b/SAS/TMSS/backend/src/tmss/tmssapp/conversions.py
index 13ccc953580c07e0772c9d57633ebc2dbf86283c..1795130d009c4f4da9fac18c78ec99d467b03a73 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/conversions.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/conversions.py
@@ -370,7 +370,7 @@ def get_all_stations():
     Retrieve station names from station template by getting the Dutch and International stations,
     then you should have it all.
     """
-    station_schema_template = CommonSchemaTemplate.objects.get(name="stations", version=1)
+    station_schema_template = CommonSchemaTemplate.get_version_or_latest(name="stations")
     groups = station_schema_template.schema['definitions']['station_group']['anyOf']
     selected_group = next(g for g in groups if g['title'].lower() == 'all')
     return tuple(sorted(set(selected_group['properties']['stations']['enum'][0])))
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0030_patches.py b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0030_patches.py
new file mode 100644
index 0000000000000000000000000000000000000000..8f5086d0aa4752e502f2ef9a5a859caf73eb0230
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0030_patches.py
@@ -0,0 +1,141 @@
+from django.db import migrations, models
+import django.db.models.deletion
+from lofar.sas.tmss.tmss.tmssapp.populate import populate_task_schedulingunit_choices
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tmssapp', '0029_output_pinned'),
+    ]
+
+    operations = [
+        # the following migration step alters the tmssapp_taskblueprint_compute_aggretates_for_schedulingunitblueprint trigger function from migration 0015_db_aggregates
+        # the only difference is that there is a patch in assigning the scheduling unit error/processed status.
+        # yes, this is ugly/annoying that we have to replicate code, but that's how database migration steps/deltas/patches work...
+        migrations.RunSQL('''CREATE OR REPLACE FUNCTION tmssapp_taskblueprint_compute_aggretates_for_schedulingunitblueprint()
+             RETURNS trigger AS
+             $BODY$
+             DECLARE
+               agg_scheduled_start_time timestamp with time zone;
+               agg_scheduled_stop_time timestamp with time zone;
+               agg_actual_process_start_time timestamp with time zone;
+               agg_actual_process_stop_time timestamp with time zone;
+               agg_actual_on_sky_start_time timestamp with time zone;
+               agg_actual_on_sky_stop_time timestamp with time zone;
+               agg_process_start_time timestamp with time zone;
+               agg_process_stop_time timestamp with time zone;
+               agg_on_sky_start_time timestamp with time zone;
+               agg_on_sky_stop_time timestamp with time zone;
+               agg_observed_start_time timestamp with time zone;
+               agg_observed_stop_time timestamp with time zone;
+               agg_status character varying(128);
+               agg_obsolete_since timestamp with time zone;
+               agg_on_sky_duration interval;
+               agg_observed_duration interval;
+               agg_duration interval;
+             BEGIN
+
+                   -- aggregate the various timestamps
+                   -- consider all the tasks for this schedulingunitblueprint
+                   -- use a WITH Common Table Expression followed by a SELECT INTO variables for speed 
+                   WITH task_agg AS (SELECT MIN(scheduled_start_time) as scheduled_start_time,
+                                            MAX(scheduled_stop_time) as scheduled_stop_time,
+                                            MIN(actual_process_start_time) as actual_process_start_time,
+                                            MAX(actual_process_stop_time) as actual_process_stop_time,
+                                            SUM(duration) as duration,
+                                            MIN(actual_on_sky_start_time) as actual_on_sky_start_time,
+                                            MAX(actual_on_sky_stop_time) as actual_on_sky_stop_time,
+                                            MIN(process_start_time) as process_start_time,
+                                            MAX(process_stop_time) as process_stop_time,
+                                            MIN(on_sky_start_time) as on_sky_start_time,
+                                            MAX(on_sky_stop_time) as on_sky_stop_time,
+                                            SUM(on_sky_duration) as on_sky_duration,
+                                            MIN(obsolete_since) as obsolete_since
+                                            FROM tmssapp_taskblueprint
+                                            WHERE tmssapp_taskblueprint.scheduling_unit_blueprint_id=NEW.scheduling_unit_blueprint_id
+                                            AND tmssapp_taskblueprint.obsolete_since IS NULL)
+                   SELECT     scheduled_start_time,      scheduled_stop_time,    actual_process_start_time,     actual_process_stop_time,     actual_on_sky_start_time,     actual_on_sky_stop_time,     on_sky_start_time,     on_sky_stop_time,     process_start_time,     process_stop_time,     on_sky_start_time,     on_sky_stop_time,     obsolete_since,     duration,     on_sky_duration
+                   INTO   agg_scheduled_start_time, agg_scheduled_stop_time, agg_actual_process_start_time, agg_actual_process_stop_time, agg_actual_on_sky_start_time, agg_actual_on_sky_stop_time, agg_on_sky_start_time, agg_on_sky_stop_time, agg_process_start_time, agg_process_stop_time, agg_on_sky_start_time, agg_on_sky_stop_time, agg_obsolete_since, agg_duration, agg_on_sky_duration
+                   FROM task_agg;
+
+                   -- compute observed_start/stop_time observerd_duration. These are derived from finished/observed tasks only.
+                   -- use a WITH Common Table Expression followed by a SELECT INTO variables for speed 
+                   WITH observed_task_agg AS (SELECT MIN(on_sky_start_time) as observed_start_time,
+                                                     MAX(on_sky_stop_time) as observed_stop_time,
+                                                     SUM(on_sky_duration) as observed_duration
+                                                     FROM tmssapp_taskblueprint
+                                                     WHERE tmssapp_taskblueprint.scheduling_unit_blueprint_id=NEW.scheduling_unit_blueprint_id
+                                                     AND tmssapp_taskblueprint.status_id in ('observed', 'finished')
+                                                     AND tmssapp_taskblueprint.obsolete_since IS NULL)
+                   SELECT     observed_start_time,     observed_stop_time,     observed_duration
+                   INTO   agg_observed_start_time, agg_observed_stop_time, agg_observed_duration
+                   FROM observed_task_agg;
+
+                   -- aggregate the task statuses into one schedulingunit status 
+                   -- See design: https://support.astron.nl/confluence/display/TMSS/Specification+Flow/#SpecificationFlow-SchedulingUnitBlueprints
+                   -- consider all the taskblueprints for this schedulingunitblueprint
+                   -- use a WITH Common Table Expression followed by a SELECT INTO variables for speed 
+                   WITH task_statuses AS (SELECT tmssapp_taskblueprint.status_id, tmssapp_tasktemplate.type_id
+                                          FROM tmssapp_taskblueprint
+                                          INNER JOIN tmssapp_tasktemplate on tmssapp_tasktemplate.id=tmssapp_taskblueprint.specifications_template_id
+                                          WHERE tmssapp_taskblueprint.scheduling_unit_blueprint_id=NEW.scheduling_unit_blueprint_id
+                                          AND tmssapp_taskblueprint.obsolete_since IS NULL)
+                   SELECT CASE
+                       WHEN (SELECT COUNT(true) FROM task_statuses)=0 THEN 'defined'
+                       WHEN EXISTS(SELECT true FROM task_statuses WHERE status_id='defined') THEN 'defined'
+                       WHEN (SELECT COUNT(true) FROM task_statuses WHERE status_id in ('finished', 'observed'))=(SELECT COUNT(true) FROM task_statuses) THEN 'finished'
+                       WHEN EXISTS(SELECT true FROM task_statuses WHERE status_id='cancelled') THEN 'cancelled'
+                       WHEN EXISTS(SELECT true FROM task_statuses WHERE status_id='error') THEN 'error'
+                       WHEN EXISTS(SELECT true FROM task_statuses WHERE status_id='unschedulable') THEN 'unschedulable'
+                       WHEN EXISTS(SELECT true FROM task_statuses WHERE status_id IN ('queued', 'started', 'observed', 'finished')) THEN 
+                           CASE
+                               WHEN (SELECT COUNT(true) FROM task_statuses WHERE type_id='observation' AND status_id IN ('observed', 'finished'))<(SELECT COUNT(true) FROM task_statuses WHERE type_id='observation') THEN 'observing'
+                               WHEN NOT EXISTS(SELECT true FROM task_statuses WHERE type_id='pipeline' AND status_id IN ('queued', 'started', 'finished')) THEN 'observed'
+                               WHEN EXISTS(SELECT true FROM task_statuses WHERE type_id='ingest' AND status_id IN ('queued', 'started')) THEN 'ingesting'
+                               WHEN (SELECT COUNT(true) FROM task_statuses WHERE type_id='ingest' AND status_id='finished')=(SELECT COUNT(true) FROM task_statuses WHERE type_id='ingest') THEN 'ingested'
+                               WHEN (SELECT COUNT(true) FROM task_statuses WHERE type_id='pipeline' AND status_id='finished')=(SELECT COUNT(true) FROM task_statuses WHERE type_id='pipeline') THEN 'processed'
+                               WHEN EXISTS(SELECT true FROM task_statuses WHERE type_id='pipeline' AND status_id IN ('queued', 'started', 'scheduled', 'finished')) THEN 'processing'
+                           END                            
+                       WHEN EXISTS(SELECT true FROM task_statuses WHERE status_id='scheduled') THEN 'scheduled'
+                     END
+                   INTO agg_status
+                   FROM task_statuses;
+
+                   -- default when no tasks available
+                   IF agg_status IS NULL THEN
+                       agg_status := 'schedulable';
+                   END IF;
+
+                   -- all aggregated timestamps and statuses were computed
+                   -- now update the referred taskblueprint with these aggregated values  
+                   UPDATE tmssapp_schedulingunitblueprint
+                   SET scheduled_start_time=agg_scheduled_start_time, 
+                       scheduled_stop_time=agg_scheduled_stop_time,
+                       actual_process_start_time=agg_actual_process_start_time, 
+                       actual_process_stop_time=agg_actual_process_stop_time, 
+                       actual_on_sky_start_time=agg_actual_on_sky_start_time, 
+                       actual_on_sky_stop_time=agg_actual_on_sky_stop_time, 
+                       process_start_time=agg_process_start_time, 
+                       process_stop_time=agg_process_stop_time, 
+                       on_sky_start_time=agg_on_sky_start_time, 
+                       on_sky_stop_time=agg_on_sky_stop_time, 
+                       observed_start_time=agg_observed_start_time, 
+                       observed_stop_time=agg_observed_stop_time, 
+                       status_id=agg_status, 
+                       obsolete_since=agg_obsolete_since,
+                       on_sky_duration=agg_on_sky_duration,
+                       observed_duration=agg_observed_duration,
+                       duration=agg_duration
+                   WHERE id=NEW.scheduling_unit_blueprint_id;
+               RETURN NEW;
+               END;
+               $BODY$
+               LANGUAGE plpgsql VOLATILE;
+               DROP TRIGGER IF EXISTS tmssapp_taskblueprint_compute_aggretates_for_schedulingunitblueprint ON tmssapp_taskblueprint ;
+               CREATE TRIGGER tmssapp_taskblueprint_compute_aggretates_for_schedulingunitblueprint
+               AFTER INSERT OR UPDATE ON tmssapp_taskblueprint
+               FOR EACH ROW EXECUTE PROCEDURE tmssapp_taskblueprint_compute_aggretates_for_schedulingunitblueprint();
+             '''),
+
+    ]
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/models/common.py b/SAS/TMSS/backend/src/tmss/tmssapp/models/common.py
index 5b2454325bfabd860cb2dda327a20f704837b737..284b7f874b0c9e9d518e3f68b3dc26d1de3df291 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/models/common.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/models/common.py
@@ -17,6 +17,7 @@ from enum import Enum
 import json
 import jsonschema
 from datetime import timedelta
+from typing import Union
 from django.utils.functional import cached_property
 from lofar.sas.tmss.tmss.exceptions import TMSSException
 
@@ -147,6 +148,21 @@ class AbstractTemplate(NamedCommon):
         abstract = True
         constraints = [UniqueConstraint(fields=['name', 'version'], name='%(class)s_unique_name_version')]
 
+    @classmethod
+    def get_latest(cls, name: str):
+        '''get the latest non-obsolete version of this template'''
+        return cls.objects.exclude(state__value=TemplateState.Choices.OBSOLETE.value).filter(name=name).order_by('-version').first()
+
+    @classmethod
+    def get_version_or_latest(cls, name: str, version: Union[int, str, None]=None):
+        '''get the non-obsolete template with the given specific version, or the latest non-obsolete version if None or 'latest' '''
+        try:
+            return cls.objects.exclude(state__value=TemplateState.Choices.OBSOLETE.value).get(name=name, version=version)
+        except:
+            if version is not None:
+                logger.warning("Could not get %s name='%s' with specific version='%s', using latest version", cls.__name__, name, version)
+            return cls.get_latest(name=name)
+
     @property
     def _need_to_auto_increment_version_number(self) -> bool:
         if self.pk is None:
@@ -163,7 +179,8 @@ class AbstractTemplate(NamedCommon):
         So, update the version number if the template is already used, else keep it.'''
         if self._need_to_auto_increment_version_number:
             self.pk = None # this forces the creation of a new instance
-            self.version = self.__class__.objects.filter(name=self.name).count() + 1
+            same_name_obj = self.__class__.objects.filter(name=self.name).order_by('-version').first()
+            self.version = same_name_obj.version + 1 if same_name_obj is not None else 1
 
 
 class AbstractSchemaTemplate(AbstractTemplate):
@@ -248,8 +265,8 @@ class AbstractSchemaTemplate(AbstractTemplate):
     def _need_to_auto_increment_version_number(self) -> bool:
         '''For any Template instance, we only update the version number if the schema document itself changed'''
         if self.pk is None:
-            # this is a new instance, so we need a new version number
-            return True
+            # this is a new instance, so we need a new version number, if and only if no version was given
+            return self.version is None
 
         # check current contents of template document in the database...
         prev_schema_value = self.__class__.objects.values('schema').get(pk=self.pk)['schema']
@@ -282,8 +299,8 @@ class AbstractStrategyTemplate(AbstractTemplate):
     def _need_to_auto_increment_version_number(self) -> bool:
         '''For any StrategyTemplate instance, we only update the version number if the template document itself changed'''
         if self.pk is None:
-            # this is a new instance, so we need a new version number
-            return True
+            # this is a new instance, so we need a new version number, if and only if no version was given
+            return self.version is None
 
         # check current contents of template document in the database...
         prev_template_value = self.__class__.objects.values('template').get(pk=self.pk)['template']
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
index bdec49fa3d363bd531d3eb13d1b684008a6850b1..d75af64bb0f4384d447c00f21d79892a11a1802d 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
@@ -14,7 +14,7 @@ from enum import Enum
 from django.db.models.expressions import RawSQL
 from django.db.models.deletion import ProtectedError
 from .common import AbstractChoice, BasicCommon, AbstractSchemaTemplate, AbstractStrategyTemplate, NamedCommon, TemplateSchemaMixin, NamedCommonPK, RefreshFromDbInvalidatesCachedPropertiesMixin, ProjectPropertyMixin
-from lofar.common.json_utils import validate_json_against_schema, validate_json_against_its_schema, add_defaults_to_json_object_for_schema
+from lofar.common.json_utils import validate_json_against_schema, validate_json_against_its_schema, add_defaults_to_json_object_for_schema, without_schema_property
 from lofar.sas.tmss.tmss.exceptions import *
 from django.core.exceptions import ValidationError
 import datetime
@@ -322,7 +322,7 @@ class SchedulingUnitObservingStrategyTemplate(AbstractStrategyTemplate):
 
         # loop over all tasks, and add the defaults to each task given the task's specifications_template
         for task_name, task_doc in list(template_doc.get('tasks',{}).items()):
-            task_specifications_template = TaskTemplate.objects.get(name=task_doc['specifications_template']['name'], version=task_doc['specifications_template'].get('version',1))
+            task_specifications_template = TaskTemplate.get_version_or_latest(name=task_doc['specifications_template']['name'], version=task_doc['specifications_template'].get('version',1))
             task_spec_doc_with_defaults = task_specifications_template.add_defaults_to_json_object_for_schema(task_doc['specifications_doc'])
             template_doc['tasks'][task_name]['specifications_doc'] = task_spec_doc_with_defaults
 
@@ -330,7 +330,7 @@ class SchedulingUnitObservingStrategyTemplate(AbstractStrategyTemplate):
         if 'scheduling_constraints_template' not in template_doc:
             try:
                 # try to use a known default SchedulingConstraintsTemplate...
-                constraints_template = SchedulingConstraintsTemplate.objects.get(name='constraints', version=1)
+                constraints_template = SchedulingConstraintsTemplate.get_version_or_latest(name='constraints', version=1)
             except SchedulingConstraintsTemplate.DoesNotExist:
                 # or use the latest if the default does not exist
                 constraints_template = SchedulingConstraintsTemplate.objects.order_by('-updated_at').first()
@@ -339,7 +339,7 @@ class SchedulingUnitObservingStrategyTemplate(AbstractStrategyTemplate):
             # inject name/version into template_doc
             template_doc['scheduling_constraints_template'] = {"name": constraints_template.name, "version": constraints_template.version}
 
-        constraints_template = SchedulingConstraintsTemplate.objects.get(name=template_doc['scheduling_constraints_template']['name'],
+        constraints_template = SchedulingConstraintsTemplate.get_version_or_latest(name=template_doc['scheduling_constraints_template']['name'],
                                                                          version=template_doc['scheduling_constraints_template'].get('version',1))
         constraints_doc = add_defaults_to_json_object_for_schema(template_doc.get('scheduling_constraints_doc', {}), constraints_template.schema,
                                                                  cache=TemplateSchemaMixin._schema_cache, max_cache_age=TemplateSchemaMixin._MAX_SCHEMA_CACHE_AGE)
@@ -410,16 +410,13 @@ class TaskTemplate(AbstractSchemaTemplate):
     def _need_to_auto_increment_version_number(self) -> bool:
         '''override, because for TaskTemplates we are interested in the template being used by other instances except for TaskConnectors'''
         if self.pk is None:
-            # this is a new instance, so we need a new version number
+            # this is a new instance, so we need a new version number, if and only if no version was given
+            return self.version is None
+
+        # we're only interested in usage in TaskDrafts/TaskBlueprints
+        if self.taskdraft_set.exists() or self.taskblueprint_set.exists():
             return True
 
-        for rel_obj in self._meta.related_objects:
-            if isinstance(rel_obj, TaskConnectorType):
-                # skip TaskConnectorType, because each TaskTemplate is being used by TaskConnectorType which is not very interesting.
-                # we're only interested in usage in mainly TaskDrafts
-                continue
-            if rel_obj.related_model.objects.filter(**{rel_obj.field.attname: self}).count() > 0:
-                return True
         return False
 
     def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
@@ -705,7 +702,7 @@ class SchedulingUnitDraft(NamedCommon, TemplateSchemaMixin, ProjectPropertyMixin
         # add all tasks
         for task in self.task_drafts.order_by('name').all():
             specifications_doc['tasks'][task.name] = {'description': task.description,
-                                                      'specifications_doc': task.specifications_doc,
+                                                      'specifications_doc': without_schema_property(task.specifications_doc),
                                                       'specifications_template': {'name': task.specifications_template.name,
                                                                                   'version': task.specifications_template.version}}
 
@@ -720,8 +717,10 @@ class SchedulingUnitDraft(NamedCommon, TemplateSchemaMixin, ProjectPropertyMixin
                                                          'output': {'role': task_rel.output_role.role.value,
                                                                     'datatype': task_rel.output_role.datatype.value,
                                                                     'dataformat': task_rel.output_role.dataformat.value},
-                                                         'selection_doc': task_rel.selection_doc,
-                                                         'selection_template': task_rel.selection_template.name})
+                                                         'selection_doc': without_schema_property(task_rel.selection_doc),
+                                                         'selection_template': {
+                                                             'name': task_rel.selection_template.name,
+                                                             'version': task_rel.selection_template.version }})
 
         # add all task scheduling relations
         for task_sched_rel in TaskSchedulingRelationDraft.objects.filter(Q(first__scheduling_unit_draft__id=self.id) | Q(second__scheduling_unit_draft__id=self.id)).order_by('first__name', 'second__name').all():
@@ -734,7 +733,8 @@ class SchedulingUnitDraft(NamedCommon, TemplateSchemaMixin, ProjectPropertyMixin
         if self.scheduling_constraints_template:
             specifications_doc['scheduling_constraints_template'] = {'name': self.scheduling_constraints_template.name,
                                                                      'version': self.scheduling_constraints_template.version}
-            specifications_doc['scheduling_constraints_doc'] = self.scheduling_constraints_doc or self.scheduling_constraints_template.get_default_json_document_for_schema()
+            scheduling_constraints_doc = deepcopy(self.scheduling_constraints_doc or self.scheduling_constraints_template.get_default_json_document_for_schema())
+            specifications_doc['scheduling_constraints_doc'] = without_schema_property(scheduling_constraints_doc)
 
         # if this scheduling unit was created from an observation_strategy_template, then copy the parameters list
         if self.observation_strategy_template and self.observation_strategy_template.template:
@@ -749,7 +749,7 @@ class SchedulingUnitDraft(NamedCommon, TemplateSchemaMixin, ProjectPropertyMixin
         '''create a new observing_strategy_template containing the specifications_doc which defines this scheduling_unit.'''
         return SchedulingUnitObservingStrategyTemplate.objects.create(name=name,
                                                                       description=self.description,
-                                                                      scheduling_unit_template=SchedulingUnitTemplate.objects.get(name='scheduling unit'),
+                                                                      scheduling_unit_template=SchedulingUnitTemplate.get_version_or_latest(name='scheduling unit'),
                                                                       template=self.specifications_doc)
 
 
@@ -894,7 +894,7 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
         # add all tasks
         for task in self.task_blueprints.order_by('name').all():
             specifications_doc['tasks'][task.name] = {'description': task.description,
-                                                      'specifications_doc': task.specifications_doc,
+                                                      'specifications_doc': without_schema_property(task.specifications_doc),
                                                       'specifications_template': {'name': task.specifications_template.name,
                                                                                   'version': task.specifications_template.version}}
 
@@ -908,8 +908,10 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
                                                          'output': {'role': task_rel.output_role.role.value,
                                                                     'datatype': task_rel.output_role.datatype.value,
                                                                     'dataformat': task_rel.output_role.dataformat.value},
-                                                         'selection_doc': task_rel.selection_doc,
-                                                         'selection_template': task_rel.selection_template.name})
+                                                         'selection_doc': without_schema_property(task_rel.selection_doc),
+                                                         'selection_template': {
+                                                             'name': task_rel.selection_template.name,
+                                                             'version': task_rel.selection_template.version }})
 
         # add all task scheduling relations
         for task_sched_rel in TaskSchedulingRelationBlueprint.objects.filter(Q(first__scheduling_unit_blueprint__id=self.id) | Q(second__scheduling_unit_blueprint__id=self.id)).order_by('first__name', 'second__name').all():
@@ -922,7 +924,8 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
             # copy the scheduling_constraints
             specifications_doc['scheduling_constraints_template'] = {'name': self.scheduling_constraints_template.name,
                                                                      'version': self.scheduling_constraints_template.version}
-            specifications_doc['scheduling_constraints_doc'] = self.scheduling_constraints_doc or self.scheduling_constraints_template.get_default_json_document_for_schema()
+            scheduling_constraints_doc = deepcopy(self.scheduling_constraints_doc or self.scheduling_constraints_template.get_default_json_document_for_schema())
+            specifications_doc['scheduling_constraints_doc'] = without_schema_property(scheduling_constraints_doc)
 
         # if this scheduling unit was created from an observation_strategy_template, then copy the parameters list
         if self.draft.observation_strategy_template and self.draft.observation_strategy_template.template:
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/populate.py b/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
index e0257aef4a118a407943c6705436254ee1b45649..1a3760d73dfcd1218a7803e421d807d054fe6b68 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
@@ -271,7 +271,7 @@ def populate_test_data():
             from lofar.sas.tmss.tmss.tmssapp.subtasks import schedule_subtask
             from lofar.common.json_utils import get_default_json_object_for_schema
 
-            constraints_template = models.SchedulingConstraintsTemplate.objects.get(name="constraints")
+            constraints_template = models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints")
             constraints_spec = get_default_json_object_for_schema(constraints_template.schema)
 
             next_fixed_time_start_time = datetime.utcnow() + timedelta(minutes=5)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/.gitignore b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/.gitignore
deleted file mode 100644
index 1533d6c9ff211adc2d76ae8d4a349989a2c8eaea..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-readme.txt
-
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/QA-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/QA-2.json
similarity index 97%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/QA-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/QA-2.json
index 0ee27dd8c97da70ded4e7cb36341d123000c43ad..4b0cd9a460dfb69aabe5a87f4004cb5cc3d0e86f 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/QA-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/QA-2.json
@@ -3,7 +3,7 @@
   "name": "QA",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/QA/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {
@@ -115,8 +115,8 @@
       "^[$]schema$": {}
     },
     "title": "QA",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/beamforming-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/beamforming-2.json
similarity index 97%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/beamforming-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/beamforming-2.json
index c964f0071440a630150a6163ca47c25d3e2dfd16..87608c3ff0b099dce14a300227e811937380f815 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/beamforming-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/beamforming-2.json
@@ -3,7 +3,7 @@
   "name": "beamforming",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/beamforming/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {
@@ -13,15 +13,15 @@
         "properties": {
           "pipelines": {
             "additionalItems": false,
-            "description": "This array of beamformer pipelines is currently restricted to exactly 1 item. Support for handling multiple pipelines (in cobalt) will be added in the future.",
             "default": [
               {}
             ],
+            "description": "This array of beamformer pipelines is currently restricted to exactly 1 item. Support for handling multiple pipelines (in cobalt) will be added in the future.",
             "items": {
               "$ref": "#/definitions/beamformer_pipeline"
             },
-            "minItems": 1,
             "maxItems": 1,
+            "minItems": 1,
             "title": "Pipelines",
             "type": "array"
           },
@@ -99,7 +99,7 @@
                         "headerTemplate": "TAB {{ self.index }}",
                         "properties": {
                           "pointing": {
-                            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+                            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pointing/2/#/definitions/pointing",
                             "default": {}
                           },
                           "relative": {
@@ -217,7 +217,7 @@
             "type": "string"
           },
           "station_groups": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_groups",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/station_groups",
             "default": [
               {
                 "max_nr_missing": 1,
@@ -409,8 +409,8 @@
     ],
     "title": "beamforming",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/calibrator-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/calibrator-1.json
index 3a78f3cbdf2c3ff1ccae34f6363dce525552260f..d4294901e1506fde316c78711fc868af98871a84 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/calibrator-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/calibrator-1.json
@@ -3,7 +3,7 @@
   "name": "calibrator",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/calibrator/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/calibrator/1#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {
@@ -24,7 +24,7 @@
             "type": "string"
           },
           "pointing": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pointing/2/#/definitions/pointing",
             "default": {},
             "description": "Manually selected calibrator",
             "title": "Digital pointing"
@@ -47,4 +47,4 @@
   },
   "state": "active",
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/correlator-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/correlator-1.json
index 433fe7ef0242633fa74552ade85df5c11434c7bc..4d4f1a7ba42862744f1dff3c8de3b16520e6b881 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/correlator-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/correlator-1.json
@@ -3,7 +3,7 @@
   "name": "correlator",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/correlator/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/correlator/1#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {
@@ -29,7 +29,7 @@
             "type": "integer"
           },
           "integration_time": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
             "default": 1,
             "description": "Desired integration period (seconds)",
             "minimum": 0.1,
@@ -63,4 +63,4 @@
   },
   "state": "active",
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/datetime-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/datetime-2.json
similarity index 89%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/datetime-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/datetime-2.json
index 5ae556c4467a899111bd115231e1d283bc97fbbd..c5a77d631a00cd910a8922c3eb0656b198df00de 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/datetime-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/datetime-2.json
@@ -3,7 +3,7 @@
   "name": "datetime",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {
@@ -13,6 +13,7 @@
         "type": "number"
       },
       "timestamp": {
+        "default": "1970-01-01T00:00:00Z",
         "description": "A timestamp defined in UTC",
         "format": "date-time",
         "pattern": "\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\d(\\.\\d+)?Z?",
@@ -42,8 +43,8 @@
     },
     "title": "datetime",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pipeline-2.json
similarity index 95%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pipeline-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pipeline-2.json
index f04db6ff41c507ccb334c69a305f35565920f603..dca91a9f8310b5a4aaf235e0b8b9af4e47a6fb73 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pipeline-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pipeline-2.json
@@ -3,7 +3,7 @@
   "name": "pipeline",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pipeline/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pipeline/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {
@@ -84,8 +84,8 @@
     },
     "title": "pipeline",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pointing-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pointing-2.json
similarity index 94%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pointing-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pointing-2.json
index ed9fc48dbe424c76491511fba502d12fe3293159..84bffbbc95baf22392cedcf0dc438198ae764821 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pointing-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pointing-2.json
@@ -3,7 +3,7 @@
   "name": "pointing",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pointing/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {
@@ -65,8 +65,8 @@
     },
     "title": "pointing",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/station_configuration-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/station_configuration-1.json
index cd32c4ca2442cbf205eeb8d906ede72966ca5ac7..da5674f22e7503c1d02f76c3a19c7967c88d42b7 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/station_configuration-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/station_configuration-1.json
@@ -3,7 +3,7 @@
   "name": "station_configuration",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/station_configuration/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/station_configuration/1#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {
@@ -11,22 +11,22 @@
         "default": {},
         "properties": {
           "SAPs": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/SAPs",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/SAPs",
             "default": [
               {}
             ],
             "minItems": 1
           },
           "antenna_set": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/antenna_set",
             "default": "HBA_DUAL"
           },
           "filter": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/filter",
             "default": "HBA_110_190"
           },
           "station_groups": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_groups",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2#/definitions/station_groups",
             "default": [
               {
                 "max_nr_missing": 1,
@@ -42,7 +42,7 @@
             ]
           },
           "tile_beam": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pointing/2/#/definitions/pointing",
             "default": {},
             "description": "HBA only",
             "title": "Tile beam"
@@ -62,9 +62,18 @@
     "patternProperties": {
       "^[$]schema$": {}
     },
+    "properties": {
+      "station_configuration": {
+        "$ref": "#/definitions/station_configuration",
+        "default": {}
+      }
+    },
+    "required": [
+      "station_configuration"
+    ],
     "title": "station_configuration",
     "version": 1
   },
   "state": "active",
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/stations-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/stations-2.json
similarity index 98%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/stations-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/stations-2.json
index 4fe36dd944feb85be8ffbcb3310570167cc99971..68cec179fe2093cb98a08842856e6834c534b896 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/stations-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/stations-2.json
@@ -3,7 +3,7 @@
   "name": "stations",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {
@@ -20,7 +20,7 @@
           "properties": {
             "digital_pointing": {
               "$id": "#target_pointing",
-              "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+              "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pointing/2/#/definitions/pointing",
               "default": {},
               "title": "Digital pointing"
             },
@@ -33,15 +33,17 @@
             },
             "subbands": {
               "additionalItems": false,
-              "default": [255],
+              "default": [
+                255
+              ],
               "items": {
                 "maximum": 511,
                 "minimum": 0,
                 "title": "Subband",
                 "type": "integer"
               },
-              "minItems": 1,
               "maxItems": 488,
+              "minItems": 1,
               "title": "Subband list",
               "type": "array"
             }
@@ -783,8 +785,8 @@
     },
     "title": "stations",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/tasks-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/tasks-2.json
similarity index 94%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/tasks-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/tasks-2.json
index 4031ffa8ca647c9d7bf24b799c9119c1365e6a1a..e60fbf3151cacdea05936b1902fed78891246833 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/tasks-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/tasks-2.json
@@ -3,7 +3,7 @@
   "name": "tasks",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/tasks/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/tasks/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {
@@ -66,8 +66,8 @@
     },
     "title": "tasks",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/triggers-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/triggers-2.json
similarity index 96%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/triggers-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/triggers-2.json
index dfe52f784128d8ef9bcd71110a5c73764fb917cb..428d661293de8e92624dcb30de1ccc8ec645d4a1 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/triggers-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/triggers-2.json
@@ -3,7 +3,7 @@
   "name": "triggers",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/triggers/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/commonschematemplate/triggers/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "definitions": {},
@@ -79,8 +79,8 @@
     ],
     "title": "triggers",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/empty-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/empty-2.json
similarity index 75%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/empty-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/empty-2.json
index d4b255259433e9f211bc72205845087fe6a2b773..72310c33a3919237ff6a1832311e26cc2a619cba 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/empty-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/empty-2.json
@@ -3,7 +3,7 @@
   "name": "empty",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/dataproductfeedbacktemplate/empty/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/dataproductfeedbacktemplate/empty/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "empty",
@@ -13,8 +13,8 @@
     "properties": {},
     "title": "empty",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/feedback-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/feedback-2.json
similarity index 92%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/feedback-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/feedback-2.json
index b5604fe28b333d2382265aba906aaf51aafba56e..30c5d52ce0f9814cbc8bab2ba61a16d399067f95 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/feedback-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/feedback-2.json
@@ -3,7 +3,7 @@
   "name": "feedback",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/dataproductfeedbacktemplate/feedback/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/dataproductfeedbacktemplate/feedback/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -13,7 +13,7 @@
     },
     "properties": {
       "antennas": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antennas",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/antennas",
         "default": {}
       },
       "files": {
@@ -194,7 +194,7 @@
             "type": "boolean"
           },
           "pointing": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pointing/2/#/definitions/pointing",
             "default": {},
             "title": "Pointing"
           }
@@ -219,7 +219,7 @@
             "type": "number"
           },
           "start_time": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timestamp",
             "default": "1970-01-01T00:00:00Z",
             "title": "Start time"
           }
@@ -243,8 +243,8 @@
     ],
     "title": "feedback",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/pulp_summary-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/pulp_summary-2.json
similarity index 91%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/pulp_summary-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/pulp_summary-2.json
index 5bf8af089ba660944dba9374e4e4ea03619a8c1c..0423fa711d1231d5d328f138fd8c047b9b769ca1 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/pulp_summary-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/pulp_summary-2.json
@@ -3,7 +3,7 @@
   "name": "pulp summary",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/dataproductfeedbacktemplate/pulp%20summary/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/dataproductfeedbacktemplate/pulp%20summary/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -54,8 +54,8 @@
     ],
     "title": "pulp summary",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/SAP-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/SAP-2.json
similarity index 84%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/SAP-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/SAP-2.json
index acd81e7cf53618c1d691e67c5cfb83acbafe179f..bc144044f9cf178198274d4d4335b44fd7decbf7 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/SAP-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/SAP-2.json
@@ -3,7 +3,7 @@
   "name": "SAP",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/dataproductspecificationstemplate/SAP/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/dataproductspecificationstemplate/SAP/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "SAP",
@@ -26,8 +26,8 @@
     },
     "title": "SAP",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/empty-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/empty-2.json
similarity index 74%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/empty-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/empty-2.json
index 56b0ecf4dc57746987558dafc6366d9e08cf4d49..9456e91f3050be4d866e9f39abe3490f51dca69a 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/empty-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/empty-2.json
@@ -3,7 +3,7 @@
   "name": "empty",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/dataproductspecificationstemplate/empty/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/dataproductspecificationstemplate/empty/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "empty",
@@ -13,8 +13,8 @@
     "properties": {},
     "title": "empty",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/pulp_summary-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/pulp_summary-2.json
similarity index 90%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/pulp_summary-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/pulp_summary-2.json
index a5ca43c4db959cb37606b274877b43fffad8b1e6..13d51787bfcf4f07182902e929b502953ab30209 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/pulp_summary-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/pulp_summary-2.json
@@ -3,7 +3,7 @@
   "name": "pulp summary",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/dataproductspecificationstemplate/pulp%20summary/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/dataproductspecificationstemplate/pulp%20summary/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -46,8 +46,8 @@
     ],
     "title": "pulp summary",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/time_series-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/time_series-2.json
similarity index 90%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/time_series-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/time_series-2.json
index c50ab515b9114e4e2837ec3be53346082e36ebfd..4dcb76e6f71f0a8b156e73ebc23c2730a306808e 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/time_series-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/time_series-2.json
@@ -3,7 +3,7 @@
   "name": "time series",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/dataproductspecificationstemplate/time%20series/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/dataproductspecificationstemplate/time%20series/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -74,7 +74,7 @@
         "type": "string"
       },
       "stokes_set": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/beamforming/2#/definitions/stokes",
         "description": "To which set of stokes this dataproduct belongs"
       }
     },
@@ -83,8 +83,8 @@
     ],
     "title": "time series",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/visibilities-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/visibilities-2.json
similarity index 85%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/visibilities-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/visibilities-2.json
index ff1c64ad9dd7b10a28c698ec7bdbe697a6f76ea4..471d8e2902f57905b261e7a9a75e2ddffff1eb04 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/visibilities-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/visibilities-2.json
@@ -3,7 +3,7 @@
   "name": "visibilities",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/dataproductspecificationstemplate/visibilities/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/dataproductspecificationstemplate/visibilities/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -32,8 +32,8 @@
     ],
     "title": "visibilities",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/ILT_stations_in_local_mode-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/ILT_stations_in_local_mode-1.json
index b20efce0eaa4f906260e8b8503fadb1f211e280d..19772ef1a8a08f326db359a7005dafbb43e8cf46 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/ILT_stations_in_local_mode-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/ILT_stations_in_local_mode-1.json
@@ -4,9 +4,9 @@
   "purpose": "technical_commissioning",
   "reservation_template": {
     "name": "reservation",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "activity": {
       "contact": "Operator",
@@ -46,4 +46,4 @@
     }
   },
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_grass_mowing-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_grass_mowing-1.json
index 8be014f9db99b2a635689d6288e08c49686b8a29..7ca784b3f0cb8e5ba962d207a1a20fa920559ae3 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_grass_mowing-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_grass_mowing-1.json
@@ -4,9 +4,9 @@
   "purpose": "technical_commissioning",
   "reservation_template": {
     "name": "reservation",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "activity": {
       "contact": "Operator",
@@ -31,4 +31,4 @@
     }
   },
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_station_maintenance-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_station_maintenance-1.json
index 59b48abfa8b18747d4739fb52c2864d5f16a6a6f..6ccd02cd8ca17e8abe29bd05712ca816383fdd54 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_station_maintenance-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_station_maintenance-1.json
@@ -4,9 +4,9 @@
   "purpose": "technical_commissioning",
   "reservation_template": {
     "name": "reservation",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "activity": {
       "contact": "Operator",
@@ -31,4 +31,4 @@
     }
   },
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Simple_Core_Reservation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Simple_Core_Reservation-1.json
index a018fb74c26fe265c72027ee3d40f19abd1b0718..af1971f28e2d0269ec68b425df5ee01128fa3c9b 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Simple_Core_Reservation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Simple_Core_Reservation-1.json
@@ -4,9 +4,9 @@
   "purpose": "technical_commissioning",
   "reservation_template": {
     "name": "reservation",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "activity": {
       "contact": "Operator",
@@ -55,4 +55,4 @@
     }
   },
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Station_cool_down-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Station_cool_down-1.json
index e3168d800ea858fc1b624b092d48276193d77e58..35f14449f308b2a68166554d4e4276cf2b260c60 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Station_cool_down-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Station_cool_down-1.json
@@ -4,9 +4,9 @@
   "purpose": "technical_commissioning",
   "reservation_template": {
     "name": "reservation",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "activity": {
       "contact": "Operator",
@@ -65,4 +65,4 @@
     }
   },
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/VLBI_session-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/VLBI_session-1.json
index 4580f0f6086bc3f678a935307ffb99b7dbf8a558..e9b2e89825264826056ec593f7b07e5e918fdd54 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/VLBI_session-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/VLBI_session-1.json
@@ -4,9 +4,9 @@
   "purpose": "technical_commissioning",
   "reservation_template": {
     "name": "reservation",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "activity": {
       "contact": "Operator",
@@ -46,4 +46,4 @@
     }
   },
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Windmill_standstill-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Windmill_standstill-1.json
deleted file mode 100644
index 1aea451f7a2b49476b7670e730c9f194a4662c2e..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Windmill_standstill-1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "description": "Planned windmill stand-still time",
-  "name": "Windmill standstill",
-  "purpose": "technical_commissioning",
-  "reservation_template": {
-    "name": "reservation",
-    "version": 1
-  },
-  "state": "active",
-  "template": {
-    "activity": {
-      "contact": "Operator",
-      "description": "Planned windmill stand-still time",
-      "name": "Windmill standstill",
-      "planned": true,
-      "subject": "environment",
-      "type": "windmill standstill"
-    },
-    "effects": {
-      "expert": false,
-      "hba_rfi": false,
-      "lba_rfi": false
-    },
-    "resources": {
-      "stations": [
-        "CS001",
-        "CS002",
-        "CS003",
-        "CS004",
-        "CS005",
-        "CS006",
-        "CS007",
-        "CS011",
-        "CS013",
-        "CS017",
-        "CS021",
-        "CS024",
-        "CS026",
-        "CS028",
-        "CS030",
-        "CS031",
-        "CS032",
-        "CS101",
-        "CS103",
-        "CS201",
-        "CS301",
-        "CS302",
-        "CS401",
-        "CS501"
-      ]
-    },
-    "schedulability": {
-      "dynamic": true,
-      "fixed_time": true,
-      "project_exclusive": false
-    }
-  },
-  "version": 1
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template/reservation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template/reservation-2.json
similarity index 95%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template/reservation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template/reservation-2.json
index c056b249c618846244965155fe2ec5e722d8ca44..15757c547b154199543a5ddb0f56ea4008b0cea3 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template/reservation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template/reservation-2.json
@@ -3,7 +3,7 @@
   "name": "reservation",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/reservationtemplate/reservation/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/reservationtemplate/reservation/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters to reserve instrument resources, and to annotate the reservation.",
@@ -110,7 +110,7 @@
         "description": "Which resources are affected",
         "properties": {
           "stations": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2#/definitions/station_list",
             "description": "List of stations",
             "title": "Stations"
           }
@@ -154,8 +154,8 @@
     ],
     "title": "reservation",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template/SAP-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template/SAP-2.json
similarity index 72%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template/SAP-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template/SAP-2.json
index 4bddbd9a49e52313c17c6e7d75646ee83f363f13..4960a3d0e25ffaa961329086ae27faa5b040b816 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template/SAP-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template/SAP-2.json
@@ -3,7 +3,7 @@
   "name": "SAP",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/saptemplate/SAP/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/saptemplate/SAP/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -13,7 +13,7 @@
     },
     "properties": {
       "antennas": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antennas",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/antennas",
         "default": {}
       },
       "measurement_type": {
@@ -30,7 +30,7 @@
         "type": "string"
       },
       "pointing": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pointing/2/#/definitions/pointing",
         "default": {},
         "title": "Pointing"
       },
@@ -44,11 +44,11 @@
         "default": {},
         "properties": {
           "duration": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
             "default": 0
           },
           "start_time": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timestamp",
             "default": "1970-01-01T00:00:00.000000Z"
           }
         },
@@ -67,8 +67,8 @@
     ],
     "title": "SAP",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_constraints_template/constraints-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_constraints_template/constraints-1.json
index 318855786e12ec114db979a2c57033681d767d57..4f1437f9437fd35523059d2e970617da2b857a3d 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_constraints_template/constraints-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_constraints_template/constraints-1.json
@@ -3,7 +3,7 @@
   "name": "constraints",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/schedulingconstraintstemplate/constraints/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/schedulingconstraintstemplate/constraints/1#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -102,13 +102,13 @@
             "description": "Offset window to LST centering",
             "properties": {
               "from": {
-                "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+                "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
                 "default": -7200,
                 "maximum": 86400,
                 "minimum": -86400
               },
               "to": {
-                "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+                "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
                 "default": 7200,
                 "maximum": 86400,
                 "minimum": -86400
@@ -128,22 +128,22 @@
         "default": {},
         "properties": {
           "after": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timestamp",
             "description": "Start after this moment"
           },
           "at": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timestamp",
             "description": "Start at the specified date/time. Overrules dynamic scheduler priority. To be used only if really needed. Requires 'scheduler' to be set to 'fixed_time'."
           },
           "before": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timestamp",
             "description": "End before this moment"
           },
           "between": {
             "default": [],
             "description": "Run within one of these time windows",
             "items": {
-              "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timewindow"
+              "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timewindow"
             },
             "minItems": 0,
             "type": "array",
@@ -153,7 +153,7 @@
             "default": [],
             "description": "Do NOT run within any of these time windows",
             "items": {
-              "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timewindow"
+              "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timewindow"
             },
             "minItems": 0,
             "type": "array",
@@ -172,4 +172,4 @@
   },
   "state": "active",
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF_CV_FRB-2.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF_CV_FRB-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..4a93a25d7cdb2051fea0771ab5b9cf0fd626133b
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF_CV_FRB-2.json
@@ -0,0 +1,1220 @@
+{
+  "description": "BF test for FRB observations. Full description to follow once accepted. High resolution and 8-bit output possible.",
+  "name": "BF CV FRB",
+  "purpose": "technical_commissioning",
+  "scheduling_unit_template": {
+    "name": "scheduling unit",
+    "version": 2
+  },
+  "state": "development",
+  "template": {
+    "parameters": [
+      {
+        "name": "Scheduling Constraints",
+        "refs": [
+          "#/scheduling_constraints_doc"
+        ]
+      },
+      {
+        "name": "Duration",
+        "refs": [
+          "#/tasks/Observation/specifications_doc/duration"
+        ]
+      },
+      {
+        "name": "Target Pointing",
+        "refs": [
+          "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+          "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
+        ]
+      },
+      {
+        "name": "Digifil options",
+        "refs": [
+          "#/tasks/Pipeline/specifications_doc/dspsr/digifil"
+        ]
+      },
+      {
+        "name": "Dispersion Measure",
+        "refs": [
+          "#/tasks/Pipeline/specifications_doc/presto/prepdata/dm"
+        ]
+      },
+      {
+        "name": "Name of close pulsar",
+        "refs": [
+          "#/tasks/Pipeline/specifications_doc/pulsar/name"
+        ]
+      },
+      {
+        "name": "Raw output (8bit)",
+        "refs": [
+          "#/tasks/Pipeline/specifications_doc/output/quantisation/enabled"
+        ]
+      },
+      {
+        "name": "Subbands per file",
+        "refs": [
+          "#/tasks/Observation/specifications_doc/beamformer/pipelines/0/coherent/settings/subbands_per_file"
+        ]
+      },
+      {
+        "name": "Frequency channels per file (multiple of subbands per file)",
+        "refs": [
+          "#/tasks/Pipeline/specifications_doc/dspsr/filterbank/frequency_channels"
+        ]
+      }
+    ],
+    "scheduling_constraints_doc": {
+      "sky": {
+        "min_distance": {
+          "jupiter": 0,
+          "moon": 0.00872665,
+          "sun": 0.00872665
+        },
+        "transit_offset": {
+          "from": -21600,
+          "to": 21600
+        }
+      }
+    },
+    "scheduling_constraints_template": {
+      "name": "constraints",
+      "version": 1
+    },
+    "task_relations": [
+      {
+        "consumer": "Pipeline",
+        "input": {
+          "dataformat": "Beamformed",
+          "datatype": "time series",
+          "role": "beamformer"
+        },
+        "output": {
+          "dataformat": "Beamformed",
+          "datatype": "time series",
+          "role": "beamformer"
+        },
+        "producer": "Observation",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "pulp summary",
+          "datatype": "quality",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "pulp summary",
+          "datatype": "quality",
+          "role": "any"
+        },
+        "producer": "Pipeline",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "pulp analysis",
+          "datatype": "pulsar profile",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "pulp analysis",
+          "datatype": "pulsar profile",
+          "role": "any"
+        },
+        "producer": "Pipeline",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "Beamformed",
+          "datatype": "time series",
+          "role": "beamformer"
+        },
+        "output": {
+          "dataformat": "Beamformed",
+          "datatype": "time series",
+          "role": "beamformer"
+        },
+        "producer": "Observation",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "pulp summary",
+          "datatype": "quality",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "pulp summary",
+          "datatype": "quality",
+          "role": "any"
+        },
+        "producer": "Pipeline",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "pulp analysis",
+          "datatype": "pulsar profile",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "pulp analysis",
+          "datatype": "pulsar profile",
+          "role": "any"
+        },
+        "producer": "Pipeline",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      }
+    ],
+    "task_scheduling_relations": [],
+    "tasks": {
+      "Cleanup": {
+        "description": "Cleanup all dataproducts from disk",
+        "specifications_doc": {},
+        "specifications_template": {
+          "name": "cleanup",
+          "version": 2
+        }
+      },
+      "Ingest": {
+        "description": "Ingest the pipeline outputs dataproducts",
+        "specifications_doc": {},
+        "specifications_template": {
+          "name": "ingest",
+          "version": 2
+        }
+      },
+      "Observation": {
+        "description": "Beamforming observation for default pulsar timing with HBA",
+        "specifications_doc": {
+          "beamformer": {
+            "pipelines": [
+              {
+                "coherent": {
+                  "SAPs": [
+                    {
+                      "name": "SAP0",
+                      "subbands": {
+                        "list": [
+                          51,
+                          52,
+                          53,
+                          54,
+                          55,
+                          56,
+                          57,
+                          58,
+                          59,
+                          60,
+                          61,
+                          62,
+                          63,
+                          64,
+                          65,
+                          66,
+                          67,
+                          68,
+                          69,
+                          70,
+                          71,
+                          72,
+                          73,
+                          74,
+                          75,
+                          76,
+                          77,
+                          78,
+                          79,
+                          80,
+                          81,
+                          82,
+                          83,
+                          84,
+                          85,
+                          86,
+                          87,
+                          88,
+                          89,
+                          90,
+                          91,
+                          92,
+                          93,
+                          94,
+                          95,
+                          96,
+                          97,
+                          98,
+                          99,
+                          100,
+                          101,
+                          102,
+                          103,
+                          104,
+                          105,
+                          106,
+                          107,
+                          108,
+                          109,
+                          110,
+                          111,
+                          112,
+                          113,
+                          114,
+                          115,
+                          116,
+                          117,
+                          118,
+                          119,
+                          120,
+                          121,
+                          122,
+                          123,
+                          124,
+                          125,
+                          126,
+                          127,
+                          128,
+                          129,
+                          130,
+                          131,
+                          132,
+                          133,
+                          134,
+                          135,
+                          136,
+                          137,
+                          138,
+                          139,
+                          140,
+                          141,
+                          142,
+                          143,
+                          144,
+                          145,
+                          146,
+                          147,
+                          148,
+                          149,
+                          150,
+                          151,
+                          152,
+                          153,
+                          154,
+                          155,
+                          156,
+                          157,
+                          158,
+                          159,
+                          160,
+                          161,
+                          162,
+                          163,
+                          164,
+                          165,
+                          166,
+                          167,
+                          168,
+                          169,
+                          170,
+                          171,
+                          172,
+                          173,
+                          174,
+                          175,
+                          176,
+                          177,
+                          178,
+                          179,
+                          180,
+                          181,
+                          182,
+                          183,
+                          184,
+                          185,
+                          186,
+                          187,
+                          188,
+                          189,
+                          190,
+                          191,
+                          192,
+                          193,
+                          194,
+                          195,
+                          196,
+                          197,
+                          198,
+                          199,
+                          200,
+                          201,
+                          202,
+                          203,
+                          204,
+                          205,
+                          206,
+                          207,
+                          208,
+                          209,
+                          210,
+                          211,
+                          212,
+                          213,
+                          214,
+                          215,
+                          216,
+                          217,
+                          218,
+                          219,
+                          220,
+                          221,
+                          222,
+                          223,
+                          224,
+                          225,
+                          226,
+                          227,
+                          228,
+                          229,
+                          230,
+                          231,
+                          232,
+                          233,
+                          234,
+                          235,
+                          236,
+                          237,
+                          238,
+                          239,
+                          240,
+                          241,
+                          242,
+                          243,
+                          244,
+                          245,
+                          246,
+                          247,
+                          248,
+                          249,
+                          250,
+                          251,
+                          252,
+                          253,
+                          254,
+                          255,
+                          256,
+                          257,
+                          258,
+                          259,
+                          260,
+                          261,
+                          262,
+                          263,
+                          264,
+                          265,
+                          266,
+                          267,
+                          268,
+                          269,
+                          270,
+                          271,
+                          272,
+                          273,
+                          274,
+                          275,
+                          276,
+                          277,
+                          278,
+                          279,
+                          280,
+                          281,
+                          282,
+                          283,
+                          284,
+                          285,
+                          286,
+                          287,
+                          288,
+                          289,
+                          290,
+                          291,
+                          292,
+                          293,
+                          294,
+                          295,
+                          296,
+                          297,
+                          298,
+                          299,
+                          300,
+                          301,
+                          302,
+                          303,
+                          304,
+                          305,
+                          306,
+                          307,
+                          308,
+                          309,
+                          310,
+                          311,
+                          312,
+                          313,
+                          314,
+                          315,
+                          316,
+                          317,
+                          318,
+                          319,
+                          320,
+                          321,
+                          322,
+                          323,
+                          324,
+                          325,
+                          326,
+                          327,
+                          328,
+                          329,
+                          330,
+                          331,
+                          332,
+                          333,
+                          334,
+                          335,
+                          336,
+                          337,
+                          338,
+                          339,
+                          340,
+                          341,
+                          342,
+                          343,
+                          344,
+                          345,
+                          346,
+                          347,
+                          348,
+                          349,
+                          350,
+                          351,
+                          352,
+                          353,
+                          354,
+                          355,
+                          356,
+                          357,
+                          358,
+                          359,
+                          360,
+                          361,
+                          362,
+                          363,
+                          364,
+                          365,
+                          366,
+                          367,
+                          368,
+                          369,
+                          370,
+                          371,
+                          372,
+                          373,
+                          374,
+                          375,
+                          376,
+                          377,
+                          378,
+                          379,
+                          380,
+                          381,
+                          382,
+                          383,
+                          384,
+                          385,
+                          386,
+                          387,
+                          388,
+                          389,
+                          390,
+                          391,
+                          392,
+                          393,
+                          394,
+                          395,
+                          396,
+                          397,
+                          398,
+                          399,
+                          400,
+                          401,
+                          402,
+                          403,
+                          404,
+                          405,
+                          406,
+                          407,
+                          408,
+                          409,
+                          410,
+                          411,
+                          412,
+                          413,
+                          414,
+                          415,
+                          416,
+                          417,
+                          418,
+                          419,
+                          420,
+                          421,
+                          422,
+                          423,
+                          424,
+                          425,
+                          426,
+                          427,
+                          428,
+                          429,
+                          430,
+                          431,
+                          432,
+                          433,
+                          434,
+                          435,
+                          436,
+                          437,
+                          438,
+                          439,
+                          440,
+                          441,
+                          442,
+                          443,
+                          444,
+                          445,
+                          446,
+                          447,
+                          448,
+                          449,
+                          450
+                        ],
+                        "method": "copy"
+                      },
+                      "tab_rings": {
+                        "count": 0,
+                        "width": 0.01
+                      },
+                      "tabs": [
+                        {
+                          "pointing": {
+                            "angle1": 0,
+                            "angle2": 0,
+                            "direction_type": "J2000",
+                            "target": "target1"
+                          },
+                          "relative": true
+                        }
+                      ]
+                    }
+                  ],
+                  "settings": {
+                    "channels_per_subband": 1,
+                    "quantisation": {
+                      "bits": 8,
+                      "enabled": false,
+                      "scale_max": 5,
+                      "scale_min": -5
+                    },
+                    "stokes": "XXYY",
+                    "subbands_per_file": 20,
+                    "time_integration_factor": 1
+                  }
+                },
+                "name": "Beamformer CV",
+                "station_groups": [
+                  {
+                    "max_nr_missing": 1,
+                    "stations": [
+                      "CS001",
+                      "CS002",
+                      "CS003",
+                      "CS004",
+                      "CS005",
+                      "CS006",
+                      "CS007",
+                      "CS011",
+                      "CS013",
+                      "CS017",
+                      "CS021",
+                      "CS024",
+                      "CS026",
+                      "CS028",
+                      "CS030",
+                      "CS031",
+                      "CS032",
+                      "CS101",
+                      "CS103",
+                      "CS201",
+                      "CS301",
+                      "CS302",
+                      "CS401",
+                      "CS501"
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          "duration": 120,
+          "station_configuration": {
+            "SAPs": [
+              {
+                "digital_pointing": {
+                  "angle1": 0.92934186635,
+                  "angle2": 0.952579228492,
+                  "direction_type": "J2000",
+                  "target": "target1"
+                },
+                "name": "SAP0",
+                "subbands": [
+                  51,
+                  52,
+                  53,
+                  54,
+                  55,
+                  56,
+                  57,
+                  58,
+                  59,
+                  60,
+                  61,
+                  62,
+                  63,
+                  64,
+                  65,
+                  66,
+                  67,
+                  68,
+                  69,
+                  70,
+                  71,
+                  72,
+                  73,
+                  74,
+                  75,
+                  76,
+                  77,
+                  78,
+                  79,
+                  80,
+                  81,
+                  82,
+                  83,
+                  84,
+                  85,
+                  86,
+                  87,
+                  88,
+                  89,
+                  90,
+                  91,
+                  92,
+                  93,
+                  94,
+                  95,
+                  96,
+                  97,
+                  98,
+                  99,
+                  100,
+                  101,
+                  102,
+                  103,
+                  104,
+                  105,
+                  106,
+                  107,
+                  108,
+                  109,
+                  110,
+                  111,
+                  112,
+                  113,
+                  114,
+                  115,
+                  116,
+                  117,
+                  118,
+                  119,
+                  120,
+                  121,
+                  122,
+                  123,
+                  124,
+                  125,
+                  126,
+                  127,
+                  128,
+                  129,
+                  130,
+                  131,
+                  132,
+                  133,
+                  134,
+                  135,
+                  136,
+                  137,
+                  138,
+                  139,
+                  140,
+                  141,
+                  142,
+                  143,
+                  144,
+                  145,
+                  146,
+                  147,
+                  148,
+                  149,
+                  150,
+                  151,
+                  152,
+                  153,
+                  154,
+                  155,
+                  156,
+                  157,
+                  158,
+                  159,
+                  160,
+                  161,
+                  162,
+                  163,
+                  164,
+                  165,
+                  166,
+                  167,
+                  168,
+                  169,
+                  170,
+                  171,
+                  172,
+                  173,
+                  174,
+                  175,
+                  176,
+                  177,
+                  178,
+                  179,
+                  180,
+                  181,
+                  182,
+                  183,
+                  184,
+                  185,
+                  186,
+                  187,
+                  188,
+                  189,
+                  190,
+                  191,
+                  192,
+                  193,
+                  194,
+                  195,
+                  196,
+                  197,
+                  198,
+                  199,
+                  200,
+                  201,
+                  202,
+                  203,
+                  204,
+                  205,
+                  206,
+                  207,
+                  208,
+                  209,
+                  210,
+                  211,
+                  212,
+                  213,
+                  214,
+                  215,
+                  216,
+                  217,
+                  218,
+                  219,
+                  220,
+                  221,
+                  222,
+                  223,
+                  224,
+                  225,
+                  226,
+                  227,
+                  228,
+                  229,
+                  230,
+                  231,
+                  232,
+                  233,
+                  234,
+                  235,
+                  236,
+                  237,
+                  238,
+                  239,
+                  240,
+                  241,
+                  242,
+                  243,
+                  244,
+                  245,
+                  246,
+                  247,
+                  248,
+                  249,
+                  250,
+                  251,
+                  252,
+                  253,
+                  254,
+                  255,
+                  256,
+                  257,
+                  258,
+                  259,
+                  260,
+                  261,
+                  262,
+                  263,
+                  264,
+                  265,
+                  266,
+                  267,
+                  268,
+                  269,
+                  270,
+                  271,
+                  272,
+                  273,
+                  274,
+                  275,
+                  276,
+                  277,
+                  278,
+                  279,
+                  280,
+                  281,
+                  282,
+                  283,
+                  284,
+                  285,
+                  286,
+                  287,
+                  288,
+                  289,
+                  290,
+                  291,
+                  292,
+                  293,
+                  294,
+                  295,
+                  296,
+                  297,
+                  298,
+                  299,
+                  300,
+                  301,
+                  302,
+                  303,
+                  304,
+                  305,
+                  306,
+                  307,
+                  308,
+                  309,
+                  310,
+                  311,
+                  312,
+                  313,
+                  314,
+                  315,
+                  316,
+                  317,
+                  318,
+                  319,
+                  320,
+                  321,
+                  322,
+                  323,
+                  324,
+                  325,
+                  326,
+                  327,
+                  328,
+                  329,
+                  330,
+                  331,
+                  332,
+                  333,
+                  334,
+                  335,
+                  336,
+                  337,
+                  338,
+                  339,
+                  340,
+                  341,
+                  342,
+                  343,
+                  344,
+                  345,
+                  346,
+                  347,
+                  348,
+                  349,
+                  350,
+                  351,
+                  352,
+                  353,
+                  354,
+                  355,
+                  356,
+                  357,
+                  358,
+                  359,
+                  360,
+                  361,
+                  362,
+                  363,
+                  364,
+                  365,
+                  366,
+                  367,
+                  368,
+                  369,
+                  370,
+                  371,
+                  372,
+                  373,
+                  374,
+                  375,
+                  376,
+                  377,
+                  378,
+                  379,
+                  380,
+                  381,
+                  382,
+                  383,
+                  384,
+                  385,
+                  386,
+                  387,
+                  388,
+                  389,
+                  390,
+                  391,
+                  392,
+                  393,
+                  394,
+                  395,
+                  396,
+                  397,
+                  398,
+                  399,
+                  400,
+                  401,
+                  402,
+                  403,
+                  404,
+                  405,
+                  406,
+                  407,
+                  408,
+                  409,
+                  410,
+                  411,
+                  412,
+                  413,
+                  414,
+                  415,
+                  416,
+                  417,
+                  418,
+                  419,
+                  420,
+                  421,
+                  422,
+                  423,
+                  424,
+                  425,
+                  426,
+                  427,
+                  428,
+                  429,
+                  430,
+                  431,
+                  432,
+                  433,
+                  434,
+                  435,
+                  436,
+                  437,
+                  438,
+                  439,
+                  440,
+                  441,
+                  442,
+                  443,
+                  444,
+                  445,
+                  446,
+                  447,
+                  448,
+                  449,
+                  450
+                ]
+              }
+            ],
+            "antenna_set": "HBA_DUAL_INNER",
+            "filter": "HBA_110_190",
+            "station_groups": [
+              {
+                "max_nr_missing": 1,
+                "stations": [
+                  "CS001",
+                  "CS002",
+                  "CS003",
+                  "CS004",
+                  "CS005",
+                  "CS006",
+                  "CS007",
+                  "CS011",
+                  "CS013",
+                  "CS017",
+                  "CS021",
+                  "CS024",
+                  "CS026",
+                  "CS028",
+                  "CS030",
+                  "CS031",
+                  "CS032",
+                  "CS101",
+                  "CS103",
+                  "CS201",
+                  "CS301",
+                  "CS302",
+                  "CS401",
+                  "CS501"
+                ]
+              }
+            ],
+            "tile_beam": {
+              "angle1": 0.92934186635,
+              "angle2": 0.952579228492,
+              "direction_type": "J2000",
+              "target": "target1"
+            }
+          }
+        },
+        "specifications_template": {
+          "name": "beamforming observation",
+          "version": 2
+        }
+      },
+      "Pipeline": {
+        "description": "Pulsar Pipeline for FRB observation",
+        "specifications_doc": {
+          "dspsr": {
+            "digifil": {
+              "coherent_dedispersion": true,
+              "dm": 0,
+              "frequency_channels": 20,
+              "integration_time": 4
+            },
+            "enabled": true,
+            "filterbank": {
+              "coherent_dedispersion": true,
+              "enabled": false,
+              "frequency_channels": 120
+            },
+            "optimise_period_dm": true,
+            "rfi_excision": true,
+            "subintegration_length": -1
+          },
+          "output": {
+            "dynamic_spectrum": {
+              "enabled": false,
+              "time_average": 0.5
+            },
+            "quantisation": {
+              "enabled": false,
+              "scale": 5
+            }
+          },
+          "presto": {
+            "fold_profile": false,
+            "input": {
+              "decode_sigma": 3,
+              "nr_blocks": 100,
+              "samples_per_block": 8192
+            },
+            "prepdata": {
+              "dm": -1
+            },
+            "prepfold": false,
+            "rrats": {
+              "dm_range": 5,
+              "enabled": false
+            }
+          },
+          "pulsar": {
+            "name": "",
+            "strategy": "meta"
+          },
+          "single_pulse_search": true
+        },
+        "specifications_template": {
+          "name": "pulsar pipeline",
+          "version": 2
+        }
+      }
+    }
+  },
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF+IM_-_Pipeline_-_Ingest-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF_CV_Pulsar_Timing_Scintillation-2.json
similarity index 65%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF+IM_-_Pipeline_-_Ingest-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF_CV_Pulsar_Timing_Scintillation-2.json
index 70bfd147521a01e6b1619efd361c8e0f98081038..545125669a1ddb2fb5be796a164a67dc22f315ed 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF+IM_-_Pipeline_-_Ingest-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF_CV_Pulsar_Timing_Scintillation-2.json
@@ -1,11 +1,12 @@
 {
-  "description": "This observation strategy template defines a task that combines parallel target and beamformer observation, plus corresponding preprocessing/pulsar pipelines and ingest",
-  "name": "Parallel BF+IM - Pipeline - Ingest",
+  "description": "BF test for pulsar timing. Full description to follow once accepted. High resolution and 8-bit output possible.",
+  "name": "BF CV Pulsar Timing Scintillation",
   "purpose": "technical_commissioning",
   "scheduling_unit_template": {
     "name": "scheduling unit",
-    "version": 1
+    "version": 2
   },
+  "state": "development",
   "template": {
     "parameters": [
       {
@@ -23,71 +24,60 @@
       {
         "name": "Target Pointing",
         "refs": [
-          "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+          "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+          "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
         ]
       },
       {
-        "name": "Tile Beam",
+        "name": "Optimise period & DM",
         "refs": [
-          "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
+          "#/tasks/Pipeline/specifications_doc/dspsr/optimise_period_dm"
+        ]
+      },
+      {
+        "name": "Subintegration time",
+        "refs": [
+          "#/tasks/Pipeline/specifications_doc/dspsr/subintegration_length"
+        ]
+      },
+      {
+        "name": "Raw output (8bit)",
+        "refs": [
+          "#/tasks/Pipeline/specifications_doc/output/quantisation/enabled"
+        ]
+      },
+      {
+        "name": "Subbands per file",
+        "refs": [
+          "#/tasks/Observation/specifications_doc/beamformer/pipelines/0/coherent/settings/subbands_per_file"
         ]
       },
       {
-        "name": "Beamformers",
+        "name": "Frequency channels per file (multiple of subbands per file)",
         "refs": [
-          "#/tasks/Observation/specifications_doc/beamformer"
+          "#/tasks/Pipeline/specifications_doc/dspsr/filterbank/frequency_channels"
         ]
       }
     ],
     "scheduling_constraints_doc": {
-      "$schema": "http://127.0.0.1:8000/api/schemas/schedulingconstraintstemplate/constraints/1#",
-      "daily": {
-        "avoid_twilight": false,
-        "require_day": false,
-        "require_night": false
-      },
-      "scheduler": "dynamic",
       "sky": {
         "min_distance": {
-          "jupiter": 0.0,
-          "moon": 0.0,
-          "sun": 0.0
+          "jupiter": 0,
+          "moon": 0.00872665,
+          "sun": 0.00872665
         },
-        "min_elevation":  {"target":  0.1},
         "transit_offset": {
           "from": -21600,
           "to": 21600
         }
-      },
-      "time": {
-        "between": [],
-        "not_between": []
       }
     },
     "scheduling_constraints_template": {
-      "name": "constraints",
-      "version": 1
+      "name": "constraints"
     },
     "task_relations": [
       {
-        "consumer": "Preprocessing Pipeline",
-        "input": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "any"
-        },
-        "output": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "correlator"
-        },
-        "producer": "Observation",
-        "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
-      },
-      {
-        "consumer": "Pulsar Pipeline",
+        "consumer": "Pipeline",
         "input": {
           "dataformat": "Beamformed",
           "datatype": "time series",
@@ -100,25 +90,10 @@
         },
         "producer": "Observation",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
-      },
-      {
-        "consumer": "Ingest",
-        "input": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "any"
-        },
-        "output": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "any"
-        },
-        "producer": "Preprocessing Pipeline",
-        "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -132,9 +107,12 @@
           "datatype": "quality",
           "role": "any"
         },
-        "producer": "Pulsar Pipeline",
+        "producer": "Pipeline",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -148,111 +126,101 @@
           "datatype": "pulsar profile",
           "role": "any"
         },
-        "producer": "Pulsar Pipeline",
+        "producer": "Pipeline",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
-        "consumer": "Ingest",
+        "consumer": "Cleanup",
         "input": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "any"
+          "dataformat": "Beamformed",
+          "datatype": "time series",
+          "role": "beamformer"
         },
         "output": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "correlator"
+          "dataformat": "Beamformed",
+          "datatype": "time series",
+          "role": "beamformer"
         },
         "producer": "Observation",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
-        "consumer": "Ingest",
+        "consumer": "Cleanup",
         "input": {
-          "dataformat": "Beamformed",
-          "datatype": "time series",
-          "role": "beamformer"
+          "dataformat": "pulp summary",
+          "datatype": "quality",
+          "role": "any"
         },
         "output": {
-          "dataformat": "Beamformed",
-          "datatype": "time series",
-          "role": "beamformer"
+          "dataformat": "pulp summary",
+          "datatype": "quality",
+          "role": "any"
         },
-        "producer": "Observation",
+        "producer": "Pipeline",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "pulp analysis",
+          "datatype": "pulsar profile",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "pulp analysis",
+          "datatype": "pulsar profile",
+          "role": "any"
+        },
+        "producer": "Pipeline",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       }
     ],
     "task_scheduling_relations": [],
     "tasks": {
+      "Cleanup": {
+        "description": "Cleanup all dataproducts from disk",
+        "specifications_doc": {},
+        "specifications_template": {
+          "name": "cleanup",
+          "version": 2
+        }
+      },
+      "Ingest": {
+        "description": "Ingest the pipeline outputs dataproducts",
+        "specifications_doc": {},
+        "specifications_template": {
+          "name": "ingest",
+          "version": 2
+        }
+      },
       "Observation": {
-        "description": "Combined parallel target and beamforming observation",
+        "description": "Beamforming observation for default pulsar timing with HBA",
         "specifications_doc": {
-          "duration": 300,
           "beamformer": {
             "pipelines": [
               {
                 "coherent": {
                   "SAPs": [
                     {
-                      "name": "_SAP_name_",
+                      "name": "SAP0",
                       "subbands": {
                         "list": [
-                          0,
-                          1,
-                          2,
-                          3,
-                          4,
-                          5,
-                          6,
-                          7,
-                          8,
-                          9,
-                          10,
-                          11,
-                          12,
-                          13,
-                          14,
-                          15,
-                          16,
-                          17,
-                          18,
-                          19,
-                          20,
-                          21,
-                          22,
-                          23,
-                          24,
-                          25,
-                          26,
-                          27,
-                          28,
-                          29,
-                          30,
-                          31,
-                          32,
-                          33,
-                          34,
-                          35,
-                          36,
-                          37,
-                          38,
-                          39,
-                          40,
-                          41,
-                          42,
-                          43,
-                          44,
-                          45,
-                          46,
-                          47,
-                          48,
-                          49,
-                          50,
                           51,
                           52,
                           53,
@@ -445,7 +413,214 @@
                           240,
                           241,
                           242,
-                          243
+                          243,
+                          244,
+                          245,
+                          246,
+                          247,
+                          248,
+                          249,
+                          250,
+                          251,
+                          252,
+                          253,
+                          254,
+                          255,
+                          256,
+                          257,
+                          258,
+                          259,
+                          260,
+                          261,
+                          262,
+                          263,
+                          264,
+                          265,
+                          266,
+                          267,
+                          268,
+                          269,
+                          270,
+                          271,
+                          272,
+                          273,
+                          274,
+                          275,
+                          276,
+                          277,
+                          278,
+                          279,
+                          280,
+                          281,
+                          282,
+                          283,
+                          284,
+                          285,
+                          286,
+                          287,
+                          288,
+                          289,
+                          290,
+                          291,
+                          292,
+                          293,
+                          294,
+                          295,
+                          296,
+                          297,
+                          298,
+                          299,
+                          300,
+                          301,
+                          302,
+                          303,
+                          304,
+                          305,
+                          306,
+                          307,
+                          308,
+                          309,
+                          310,
+                          311,
+                          312,
+                          313,
+                          314,
+                          315,
+                          316,
+                          317,
+                          318,
+                          319,
+                          320,
+                          321,
+                          322,
+                          323,
+                          324,
+                          325,
+                          326,
+                          327,
+                          328,
+                          329,
+                          330,
+                          331,
+                          332,
+                          333,
+                          334,
+                          335,
+                          336,
+                          337,
+                          338,
+                          339,
+                          340,
+                          341,
+                          342,
+                          343,
+                          344,
+                          345,
+                          346,
+                          347,
+                          348,
+                          349,
+                          350,
+                          351,
+                          352,
+                          353,
+                          354,
+                          355,
+                          356,
+                          357,
+                          358,
+                          359,
+                          360,
+                          361,
+                          362,
+                          363,
+                          364,
+                          365,
+                          366,
+                          367,
+                          368,
+                          369,
+                          370,
+                          371,
+                          372,
+                          373,
+                          374,
+                          375,
+                          376,
+                          377,
+                          378,
+                          379,
+                          380,
+                          381,
+                          382,
+                          383,
+                          384,
+                          385,
+                          386,
+                          387,
+                          388,
+                          389,
+                          390,
+                          391,
+                          392,
+                          393,
+                          394,
+                          395,
+                          396,
+                          397,
+                          398,
+                          399,
+                          400,
+                          401,
+                          402,
+                          403,
+                          404,
+                          405,
+                          406,
+                          407,
+                          408,
+                          409,
+                          410,
+                          411,
+                          412,
+                          413,
+                          414,
+                          415,
+                          416,
+                          417,
+                          418,
+                          419,
+                          420,
+                          421,
+                          422,
+                          423,
+                          424,
+                          425,
+                          426,
+                          427,
+                          428,
+                          429,
+                          430,
+                          431,
+                          432,
+                          433,
+                          434,
+                          435,
+                          436,
+                          437,
+                          438,
+                          439,
+                          440,
+                          441,
+                          442,
+                          443,
+                          444,
+                          445,
+                          446,
+                          447,
+                          448,
+                          449,
+                          450
                         ],
                         "method": "copy"
                       },
@@ -456,12 +631,12 @@
                       "tabs": [
                         {
                           "pointing": {
-                            "angle1": 0.92934186635,
-                            "angle2": 0.952579228492,
+                            "angle1": 0,
+                            "angle2": 0,
                             "direction_type": "J2000",
                             "target": "target1"
                           },
-                          "relative": false
+                          "relative": true
                         }
                       ]
                     }
@@ -474,120 +649,58 @@
                       "scale_max": 5,
                       "scale_min": -5
                     },
-                    "stokes": "I",
-                    "subbands_per_file": 488,
-                    "time_integration_factor": 1
-                  }
-                },
-                "flys eye": {
-                  "enabled": false,
-                  "settings": {
-                    "channels_per_subband": 1,
-                    "quantisation": {
-                      "bits": 8,
-                      "enabled": false,
-                      "scale_max": 5,
-                      "scale_min": -5
-                    },
-                    "stokes": "I",
-                    "subbands_per_file": 488,
-                    "time_integration_factor": 1
-                  }
-                },
-                "incoherent": {
-                  "SAPs": [],
-                  "settings": {
-                    "channels_per_subband": 1,
-                    "quantisation": {
-                      "bits": 8,
-                      "enabled": false,
-                      "scale_max": 5,
-                      "scale_min": -5
-                    },
-                    "stokes": "I",
-                    "subbands_per_file": 488,
+                    "stokes": "XXYY",
+                    "subbands_per_file": 20,
                     "time_integration_factor": 1
                   }
                 },
-                "name": "B0329+54",
+                "name": "Beamformer CV",
                 "station_groups": [
                   {
                     "max_nr_missing": 1,
                     "stations": [
+                      "CS001",
                       "CS002",
                       "CS003",
                       "CS004",
                       "CS005",
                       "CS006",
-                      "CS007"
+                      "CS007",
+                      "CS011",
+                      "CS013",
+                      "CS017",
+                      "CS021",
+                      "CS024",
+                      "CS026",
+                      "CS028",
+                      "CS030",
+                      "CS031",
+                      "CS032",
+                      "CS101",
+                      "CS103",
+                      "CS201",
+                      "CS301",
+                      "CS302",
+                      "CS401",
+                      "CS501"
                     ]
                   }
                 ]
               }
-            ],
-            "ppf": false
+            ]
           },
-          "correlator": {
-              "channels_per_subband": 64,
-              "topocentric_frequency_correction": false,
-              "integration_time": 1,
-              "storage_cluster": "CEP4"
-            },
-          "QA": {
-              "file_conversion": {
-                "enabled": true,
-                "nr_of_subbands": -1,
-                "nr_of_timestamps": 256
-              },
-              "inspection_plots": "msplots",
-              "plots": {
-                "autocorrelation": true,
-                "crosscorrelation": true,
-                "enabled": true
-              }
-            },
+          "duration": 120,
           "station_configuration": {
             "SAPs": [
               {
                 "digital_pointing": {
-                  "angle1": 0.6624317181687094,
-                  "angle2": 1.5579526427549426,
-                  "target": "_target_name_",
-                  "direction_type": "J2000"
+                  "angle1": 0.92934186635,
+                  "angle2": 0.952579228492,
+                  "direction_type": "J2000",
+                  "target": "target1"
                 },
-                "name": "_SAP_name_",
+                "name": "SAP0",
                 "subbands": [
-                  20,
-                  21,
-                  22,
-                  23,
-                  24,
-                  25,
-                  26,
-                  27,
-                  28,
-                  29,
-                  30,
-                  31,
-                  32,
-                  33,
-                  34,
-                  35,
-                  36,
-                  37,
-                  38,
-                  39,
-                  40,
-                  41,
-                  42,
-                  43,
-                  44,
-                  45,
-                  46,
-                  47,
-                  48,
-                  49,
-                  50,
                   51,
                   52,
                   53,
@@ -987,119 +1100,59 @@
                   447,
                   448,
                   449,
-                  450,
-                  451,
-                  452,
-                  453,
-                  454,
-                  455,
-                  456,
-                  457,
-                  458,
-                  459,
-                  460,
-                  461,
-                  462,
-                  463,
-                  464,
-                  465,
-                  466,
-                  467,
-                  468,
-                  469,
-                  470,
-                  471,
-                  472,
-                  473,
-                  474,
-                  475,
-                  476,
-                  477,
-                  478,
-                  479,
-                  480,
-                  481,
-                  482,
-                  483,
-                  484,
-                  485,
-                  486,
-                  487,
-                  488,
-                  489,
-                  490,
-                  491,
-                  492,
-                  493,
-                  494,
-                  495,
-                  496,
-                  497,
-                  498,
-                  499,
-                  500,
-                  501,
-                  502
+                  450
                 ]
               }
             ],
-            "antenna_set": "HBA_DUAL",
+            "antenna_set": "HBA_DUAL_INNER",
             "filter": "HBA_110_190",
             "station_groups": [
               {
                 "max_nr_missing": 1,
                 "stations": [
+                  "CS001",
                   "CS002",
                   "CS003",
                   "CS004",
                   "CS005",
                   "CS006",
-                  "CS007"
+                  "CS007",
+                  "CS011",
+                  "CS013",
+                  "CS017",
+                  "CS021",
+                  "CS024",
+                  "CS026",
+                  "CS028",
+                  "CS030",
+                  "CS031",
+                  "CS032",
+                  "CS101",
+                  "CS103",
+                  "CS201",
+                  "CS301",
+                  "CS302",
+                  "CS401",
+                  "CS501"
                 ]
               }
             ],
             "tile_beam": {
-              "angle1": 0.6624317181687094,
-              "angle2": 1.5579526427549426,
+              "angle1": 0.92934186635,
+              "angle2": 0.952579228492,
               "direction_type": "J2000",
               "target": "target1"
             }
           }
         },
         "specifications_template": {
-          "name": "parallel target and beamforming observation",
-          "version": 1
+          "name": "beamforming observation",
+          "version": 2
         }
       },
-      "Preprocessing Pipeline": {
-        "description": "Preprocessing Pipeline for the BF+IM Observation",
+      "Pipeline": {
+        "description": "Pulsar Pipeline for default HBA pulsar timing observation",
         "specifications_doc": {
-          "average": {
-            "frequency_steps": 4,
-            "time_steps": 1
-          },
-          "demix": {
-            "frequency_steps": 64,
-            "ignore_target": false,
-            "sources": [],
-            "time_steps": 10
-          },
-          "flag": {
-            "autocorrelations": true,
-            "outerchannels": true,
-            "rfi_strategy": "HBAdefault"
-          },
-          "storagemanager": "dysco"
-        },
-        "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
-      },
-      "Pulsar Pipeline": {
-        "description": "Pulsar Pipeline for the BF+IM observation",
-        "specifications_doc": {
-          "$schema": "http://127.0.0.1:8000/api/schemas/tasktemplate/pulsar%20pipeline/1#",
           "dspsr": {
             "digifil": {
               "coherent_dedispersion": false,
@@ -1108,6 +1161,11 @@
               "integration_time": 4
             },
             "enabled": true,
+            "filterbank": {
+              "coherent_dedispersion": true,
+              "enabled": true,
+              "frequency_channels": 120
+            },
             "optimise_period_dm": true,
             "rfi_excision": true,
             "subintegration_length": -1
@@ -1142,18 +1200,11 @@
           "single_pulse_search": false
         },
         "specifications_template": {
-          "name": "pulsar pipeline"
-        }
-      },
-      "Ingest": {
-        "description": "Ingest the pipelines outputs dataproducts",
-        "specifications_doc": {},
-        "specifications_template": {
-          "name": "ingest"
+          "name": "pulsar pipeline",
+          "version": 2
         }
       }
     }
   },
-  "state": "active",
-  "version": 1
+  "version": 2
 }
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Pulsar_timing-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF_Pulsar_Timing-2.json
similarity index 91%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Pulsar_timing-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF_Pulsar_Timing-2.json
index 5edfd29ad73711167a168ae118f0ba0d3f9852db..4ab34fa34802efe0377361add0aab38173f6438d 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Pulsar_timing-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/BF_Pulsar_Timing-2.json
@@ -1,12 +1,12 @@
 {
-  "description": "This observation strategy template defines the pulsar timing template, a complex voltage beamformed observation with 1 pointing and a pulsar pipeline for a known pulsar.",
-  "name": "Pulsar timing",
+  "description": "BF test for pulsar timing. Full description to follow once accepted.",
+  "name": "BF Pulsar Timing",
   "purpose": "technical_commissioning",
   "scheduling_unit_template": {
     "name": "scheduling unit",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "parameters": [
       {
@@ -22,21 +22,22 @@
         ]
       },
       {
-        "name": "Target Name",
+        "name": "Target Pointing",
         "refs": [
-          "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/name"
+          "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+          "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
         ]
       },
       {
-        "name": "Target Pointing",
+        "name": "Optimise period & DM",
         "refs": [
-          "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+          "#/tasks/Pipeline/specifications_doc/dspsr/optimise_period_dm"
         ]
       },
       {
-        "name": "Tile Beam",
+        "name": "Subintegration time",
         "refs": [
-          "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
+          "#/tasks/Pipeline/specifications_doc/dspsr/subintegration_length"
         ]
       }
     ],
@@ -44,12 +45,8 @@
       "sky": {
         "min_distance": {
           "jupiter": 0,
-          "moon": 0,
-          "sun": 0
-        },
-        "min_elevation": {
-          "calibrator": 0.5,
-          "target": 0.261666666667
+          "moon": 0.00872665,
+          "sun": 0.00872665
         },
         "transit_offset": {
           "from": -21600,
@@ -58,7 +55,8 @@
       }
     },
     "scheduling_constraints_template": {
-      "name": "constraints"
+      "name": "constraints",
+      "version": 1
     },
     "task_relations": [
       {
@@ -75,7 +73,10 @@
         },
         "producer": "Observation",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -91,7 +92,10 @@
         },
         "producer": "Pipeline",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -107,7 +111,10 @@
         },
         "producer": "Pipeline",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Cleanup",
@@ -123,7 +130,10 @@
         },
         "producer": "Observation",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Cleanup",
@@ -139,7 +149,10 @@
         },
         "producer": "Pipeline",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Cleanup",
@@ -155,7 +168,10 @@
         },
         "producer": "Pipeline",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       }
     ],
     "task_scheduling_relations": [],
@@ -164,463 +180,28 @@
         "description": "Cleanup all dataproducts from disk",
         "specifications_doc": {},
         "specifications_template": {
-          "name": "cleanup"
+          "name": "cleanup",
+          "version": 2
         }
       },
       "Ingest": {
         "description": "Ingest the pipeline outputs dataproducts",
         "specifications_doc": {},
         "specifications_template": {
-          "name": "ingest"
+          "name": "ingest",
+          "version": 2
         }
       },
       "Observation": {
-        "description": "beamforming observation for pulsars",
+        "description": "Beamforming observation for default pulsar timing with HBA",
         "specifications_doc": {
-          "duration": 120,
-          "station_configuration": {
-            "SAPs": [
-              {
-                "digital_pointing": {
-                  "angle1": 0.92934186635,
-                  "angle2": 0.952579228492,
-                  "direction_type": "J2000",
-                  "target": "target1"
-                },
-                "name": "B0329+54",
-                "subbands": [
-                  51,
-                  52,
-                  53,
-                  54,
-                  55,
-                  56,
-                  57,
-                  58,
-                  59,
-                  60,
-                  61,
-                  62,
-                  63,
-                  64,
-                  65,
-                  66,
-                  67,
-                  68,
-                  69,
-                  70,
-                  71,
-                  72,
-                  73,
-                  74,
-                  75,
-                  76,
-                  77,
-                  78,
-                  79,
-                  80,
-                  81,
-                  82,
-                  83,
-                  84,
-                  85,
-                  86,
-                  87,
-                  88,
-                  89,
-                  90,
-                  91,
-                  92,
-                  93,
-                  94,
-                  95,
-                  96,
-                  97,
-                  98,
-                  99,
-                  100,
-                  101,
-                  102,
-                  103,
-                  104,
-                  105,
-                  106,
-                  107,
-                  108,
-                  109,
-                  110,
-                  111,
-                  112,
-                  113,
-                  114,
-                  115,
-                  116,
-                  117,
-                  118,
-                  119,
-                  120,
-                  121,
-                  122,
-                  123,
-                  124,
-                  125,
-                  126,
-                  127,
-                  128,
-                  129,
-                  130,
-                  131,
-                  132,
-                  133,
-                  134,
-                  135,
-                  136,
-                  137,
-                  138,
-                  139,
-                  140,
-                  141,
-                  142,
-                  143,
-                  144,
-                  145,
-                  146,
-                  147,
-                  148,
-                  149,
-                  150,
-                  151,
-                  152,
-                  153,
-                  154,
-                  155,
-                  156,
-                  157,
-                  158,
-                  159,
-                  160,
-                  161,
-                  162,
-                  163,
-                  164,
-                  165,
-                  166,
-                  167,
-                  168,
-                  169,
-                  170,
-                  171,
-                  172,
-                  173,
-                  174,
-                  175,
-                  176,
-                  177,
-                  178,
-                  179,
-                  180,
-                  181,
-                  182,
-                  183,
-                  184,
-                  185,
-                  186,
-                  187,
-                  188,
-                  189,
-                  190,
-                  191,
-                  192,
-                  193,
-                  194,
-                  195,
-                  196,
-                  197,
-                  198,
-                  199,
-                  200,
-                  201,
-                  202,
-                  203,
-                  204,
-                  205,
-                  206,
-                  207,
-                  208,
-                  209,
-                  210,
-                  211,
-                  212,
-                  213,
-                  214,
-                  215,
-                  216,
-                  217,
-                  218,
-                  219,
-                  220,
-                  221,
-                  222,
-                  223,
-                  224,
-                  225,
-                  226,
-                  227,
-                  228,
-                  229,
-                  230,
-                  231,
-                  232,
-                  233,
-                  234,
-                  235,
-                  236,
-                  237,
-                  238,
-                  239,
-                  240,
-                  241,
-                  242,
-                  243,
-                  244,
-                  245,
-                  246,
-                  247,
-                  248,
-                  249,
-                  250,
-                  251,
-                  252,
-                  253,
-                  254,
-                  255,
-                  256,
-                  257,
-                  258,
-                  259,
-                  260,
-                  261,
-                  262,
-                  263,
-                  264,
-                  265,
-                  266,
-                  267,
-                  268,
-                  269,
-                  270,
-                  271,
-                  272,
-                  273,
-                  274,
-                  275,
-                  276,
-                  277,
-                  278,
-                  279,
-                  280,
-                  281,
-                  282,
-                  283,
-                  284,
-                  285,
-                  286,
-                  287,
-                  288,
-                  289,
-                  290,
-                  291,
-                  292,
-                  293,
-                  294,
-                  295,
-                  296,
-                  297,
-                  298,
-                  299,
-                  300,
-                  301,
-                  302,
-                  303,
-                  304,
-                  305,
-                  306,
-                  307,
-                  308,
-                  309,
-                  310,
-                  311,
-                  312,
-                  313,
-                  314,
-                  315,
-                  316,
-                  317,
-                  318,
-                  319,
-                  320,
-                  321,
-                  322,
-                  323,
-                  324,
-                  325,
-                  326,
-                  327,
-                  328,
-                  329,
-                  330,
-                  331,
-                  332,
-                  333,
-                  334,
-                  335,
-                  336,
-                  337,
-                  338,
-                  339,
-                  340,
-                  341,
-                  342,
-                  343,
-                  344,
-                  345,
-                  346,
-                  347,
-                  348,
-                  349,
-                  350,
-                  351,
-                  352,
-                  353,
-                  354,
-                  355,
-                  356,
-                  357,
-                  358,
-                  359,
-                  360,
-                  361,
-                  362,
-                  363,
-                  364,
-                  365,
-                  366,
-                  367,
-                  368,
-                  369,
-                  370,
-                  371,
-                  372,
-                  373,
-                  374,
-                  375,
-                  376,
-                  377,
-                  378,
-                  379,
-                  380,
-                  381,
-                  382,
-                  383,
-                  384,
-                  385,
-                  386,
-                  387,
-                  388,
-                  389,
-                  390,
-                  391,
-                  392,
-                  393,
-                  394,
-                  395,
-                  396,
-                  397,
-                  398,
-                  399,
-                  400,
-                  401,
-                  402,
-                  403,
-                  404,
-                  405,
-                  406,
-                  407,
-                  408,
-                  409,
-                  410,
-                  411,
-                  412,
-                  413,
-                  414,
-                  415,
-                  416,
-                  417,
-                  418,
-                  419,
-                  420,
-                  421,
-                  422,
-                  423,
-                  424,
-                  425,
-                  426,
-                  427,
-                  428,
-                  429,
-                  430,
-                  431,
-                  432,
-                  433,
-                  434,
-                  435,
-                  436,
-                  437,
-                  438,
-                  439,
-                  440,
-                  441,
-                  442,
-                  443,
-                  444,
-                  445,
-                  446,
-                  447,
-                  448,
-                  449,
-                  450
-                ]
-              }
-            ],
-            "antenna_set": "HBA_DUAL_INNER",
-            "filter": "HBA_110_190",
-            "station_groups": [
-              {
-                "max_nr_missing": 1,
-                "stations": [
-                  "CS002",
-                  "CS003",
-                  "CS004",
-                  "CS005",
-                  "CS006",
-                  "CS007"
-                ]
-              }
-            ],
-            "tile_beam": {
-              "angle1": 0.92934186635,
-              "angle2": 0.952579228492,
-              "direction_type": "J2000",
-              "target": "target1"
-            }
-          },
-          "beamformer": {
-            "pipelines": [
+          "beamformer": {
+            "pipelines": [
               {
                 "coherent": {
                   "SAPs": [
                     {
-                      "name": "B0329+54",
+                      "name": "SAP0",
                       "subbands": {
                         "list": [
                           51,
@@ -1056,33 +637,506 @@
                     "time_integration_factor": 1
                   }
                 },
-                "name": "B0329+54",
+                "name": "Beamformer CV",
                 "station_groups": [
                   {
                     "max_nr_missing": 1,
                     "stations": [
+                      "CS001",
                       "CS002",
                       "CS003",
                       "CS004",
                       "CS005",
                       "CS006",
-                      "CS007"
+                      "CS007",
+                      "CS011",
+                      "CS013",
+                      "CS017",
+                      "CS021",
+                      "CS024",
+                      "CS026",
+                      "CS028",
+                      "CS030",
+                      "CS031",
+                      "CS032",
+                      "CS101",
+                      "CS103",
+                      "CS201",
+                      "CS301",
+                      "CS302",
+                      "CS401",
+                      "CS501"
                     ]
                   }
                 ]
               }
             ],
             "ppf": false
+          },
+          "duration": 120,
+          "station_configuration": {
+            "SAPs": [
+              {
+                "digital_pointing": {
+                  "angle1": 0.92934186635,
+                  "angle2": 0.952579228492,
+                  "direction_type": "J2000",
+                  "target": "target1"
+                },
+                "name": "SAP0",
+                "subbands": [
+                  51,
+                  52,
+                  53,
+                  54,
+                  55,
+                  56,
+                  57,
+                  58,
+                  59,
+                  60,
+                  61,
+                  62,
+                  63,
+                  64,
+                  65,
+                  66,
+                  67,
+                  68,
+                  69,
+                  70,
+                  71,
+                  72,
+                  73,
+                  74,
+                  75,
+                  76,
+                  77,
+                  78,
+                  79,
+                  80,
+                  81,
+                  82,
+                  83,
+                  84,
+                  85,
+                  86,
+                  87,
+                  88,
+                  89,
+                  90,
+                  91,
+                  92,
+                  93,
+                  94,
+                  95,
+                  96,
+                  97,
+                  98,
+                  99,
+                  100,
+                  101,
+                  102,
+                  103,
+                  104,
+                  105,
+                  106,
+                  107,
+                  108,
+                  109,
+                  110,
+                  111,
+                  112,
+                  113,
+                  114,
+                  115,
+                  116,
+                  117,
+                  118,
+                  119,
+                  120,
+                  121,
+                  122,
+                  123,
+                  124,
+                  125,
+                  126,
+                  127,
+                  128,
+                  129,
+                  130,
+                  131,
+                  132,
+                  133,
+                  134,
+                  135,
+                  136,
+                  137,
+                  138,
+                  139,
+                  140,
+                  141,
+                  142,
+                  143,
+                  144,
+                  145,
+                  146,
+                  147,
+                  148,
+                  149,
+                  150,
+                  151,
+                  152,
+                  153,
+                  154,
+                  155,
+                  156,
+                  157,
+                  158,
+                  159,
+                  160,
+                  161,
+                  162,
+                  163,
+                  164,
+                  165,
+                  166,
+                  167,
+                  168,
+                  169,
+                  170,
+                  171,
+                  172,
+                  173,
+                  174,
+                  175,
+                  176,
+                  177,
+                  178,
+                  179,
+                  180,
+                  181,
+                  182,
+                  183,
+                  184,
+                  185,
+                  186,
+                  187,
+                  188,
+                  189,
+                  190,
+                  191,
+                  192,
+                  193,
+                  194,
+                  195,
+                  196,
+                  197,
+                  198,
+                  199,
+                  200,
+                  201,
+                  202,
+                  203,
+                  204,
+                  205,
+                  206,
+                  207,
+                  208,
+                  209,
+                  210,
+                  211,
+                  212,
+                  213,
+                  214,
+                  215,
+                  216,
+                  217,
+                  218,
+                  219,
+                  220,
+                  221,
+                  222,
+                  223,
+                  224,
+                  225,
+                  226,
+                  227,
+                  228,
+                  229,
+                  230,
+                  231,
+                  232,
+                  233,
+                  234,
+                  235,
+                  236,
+                  237,
+                  238,
+                  239,
+                  240,
+                  241,
+                  242,
+                  243,
+                  244,
+                  245,
+                  246,
+                  247,
+                  248,
+                  249,
+                  250,
+                  251,
+                  252,
+                  253,
+                  254,
+                  255,
+                  256,
+                  257,
+                  258,
+                  259,
+                  260,
+                  261,
+                  262,
+                  263,
+                  264,
+                  265,
+                  266,
+                  267,
+                  268,
+                  269,
+                  270,
+                  271,
+                  272,
+                  273,
+                  274,
+                  275,
+                  276,
+                  277,
+                  278,
+                  279,
+                  280,
+                  281,
+                  282,
+                  283,
+                  284,
+                  285,
+                  286,
+                  287,
+                  288,
+                  289,
+                  290,
+                  291,
+                  292,
+                  293,
+                  294,
+                  295,
+                  296,
+                  297,
+                  298,
+                  299,
+                  300,
+                  301,
+                  302,
+                  303,
+                  304,
+                  305,
+                  306,
+                  307,
+                  308,
+                  309,
+                  310,
+                  311,
+                  312,
+                  313,
+                  314,
+                  315,
+                  316,
+                  317,
+                  318,
+                  319,
+                  320,
+                  321,
+                  322,
+                  323,
+                  324,
+                  325,
+                  326,
+                  327,
+                  328,
+                  329,
+                  330,
+                  331,
+                  332,
+                  333,
+                  334,
+                  335,
+                  336,
+                  337,
+                  338,
+                  339,
+                  340,
+                  341,
+                  342,
+                  343,
+                  344,
+                  345,
+                  346,
+                  347,
+                  348,
+                  349,
+                  350,
+                  351,
+                  352,
+                  353,
+                  354,
+                  355,
+                  356,
+                  357,
+                  358,
+                  359,
+                  360,
+                  361,
+                  362,
+                  363,
+                  364,
+                  365,
+                  366,
+                  367,
+                  368,
+                  369,
+                  370,
+                  371,
+                  372,
+                  373,
+                  374,
+                  375,
+                  376,
+                  377,
+                  378,
+                  379,
+                  380,
+                  381,
+                  382,
+                  383,
+                  384,
+                  385,
+                  386,
+                  387,
+                  388,
+                  389,
+                  390,
+                  391,
+                  392,
+                  393,
+                  394,
+                  395,
+                  396,
+                  397,
+                  398,
+                  399,
+                  400,
+                  401,
+                  402,
+                  403,
+                  404,
+                  405,
+                  406,
+                  407,
+                  408,
+                  409,
+                  410,
+                  411,
+                  412,
+                  413,
+                  414,
+                  415,
+                  416,
+                  417,
+                  418,
+                  419,
+                  420,
+                  421,
+                  422,
+                  423,
+                  424,
+                  425,
+                  426,
+                  427,
+                  428,
+                  429,
+                  430,
+                  431,
+                  432,
+                  433,
+                  434,
+                  435,
+                  436,
+                  437,
+                  438,
+                  439,
+                  440,
+                  441,
+                  442,
+                  443,
+                  444,
+                  445,
+                  446,
+                  447,
+                  448,
+                  449,
+                  450
+                ]
+              }
+            ],
+            "antenna_set": "HBA_DUAL_INNER",
+            "filter": "HBA_110_190",
+            "station_groups": [
+              {
+                "max_nr_missing": 1,
+                "stations": [
+                  "CS001",
+                  "CS002",
+                  "CS003",
+                  "CS004",
+                  "CS005",
+                  "CS006",
+                  "CS007",
+                  "CS011",
+                  "CS013",
+                  "CS017",
+                  "CS021",
+                  "CS024",
+                  "CS026",
+                  "CS028",
+                  "CS030",
+                  "CS031",
+                  "CS032",
+                  "CS101",
+                  "CS103",
+                  "CS201",
+                  "CS301",
+                  "CS302",
+                  "CS401",
+                  "CS501"
+                ]
+              }
+            ],
+            "tile_beam": {
+              "angle1": 0.92934186635,
+              "angle2": 0.952579228492,
+              "direction_type": "J2000",
+              "target": "target1"
+            }
           }
         },
         "specifications_template": {
-          "name": "beamforming observation"
+          "name": "beamforming observation",
+          "version": 2
         }
       },
       "Pipeline": {
-        "description": "Pulsar Pipeline for the test observation",
+        "description": "Pulsar Pipeline for default HBA pulsar timing observation",
         "specifications_doc": {
-          "$schema": "http://127.0.0.1:8000/api/schemas/tasktemplate/pulsar%20pipeline/1#",
           "dspsr": {
             "digifil": {
               "coherent_dedispersion": false,
@@ -1125,10 +1179,11 @@
           "single_pulse_search": false
         },
         "specifications_template": {
-          "name": "pulsar pipeline"
+          "name": "pulsar pipeline",
+          "version": 2
         }
       }
     }
   },
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Beamformed_Observation_-_Pipeline_-_Ingest-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/COM_COBALT2_BF_test-2.json
similarity index 52%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Beamformed_Observation_-_Pipeline_-_Ingest-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/COM_COBALT2_BF_test-2.json
index 9556dfed7626d86557fe6c440f05d3ee46695674..b9c93d392076a7fc0a42d19fd7c73fcb23480192 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Beamformed_Observation_-_Pipeline_-_Ingest-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/COM_COBALT2_BF_test-2.json
@@ -1,12 +1,12 @@
 {
-  "description": "This observation strategy template defines a short Beamformed Observation, Pulsar Pipeline and Ingest.",
-  "name": "Short Test Beamformed Observation - Pipeline - Ingest",
+  "description": "BF Coherent Stokes test for COBALT2 Specifations.",
+  "name": "COM COBALT2 BF test",
   "purpose": "technical_commissioning",
   "scheduling_unit_template": {
     "name": "scheduling unit",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "parameters": [
       {
@@ -24,32 +24,17 @@
       {
         "name": "Target Pointing",
         "refs": [
-          "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
-        ]
-      },
-      {
-        "name": "Tile Beam",
-        "refs": [
+          "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
           "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
         ]
-      },
-      {
-        "name": "Beamformers",
-        "refs": [
-          "#/tasks/Observation/specifications_doc/beamformers"
-        ]
       }
     ],
     "scheduling_constraints_doc": {
       "sky": {
         "min_distance": {
           "jupiter": 0,
-          "moon": 0,
-          "sun": 0
-        },
-        "min_elevation": {
-          "calibrator": 0.5,
-          "target": 0.261666666667
+          "moon": 0.00872665,
+          "sun": 0.00872665
         },
         "transit_offset": {
           "from": -21600,
@@ -58,466 +43,23 @@
       }
     },
     "scheduling_constraints_template": {
-      "name": "constraints"
+      "name": "constraints",
+      "version": 1
     },
-    "task_relations": [
-      {
-        "consumer": "Pipeline",
-        "input": {
-          "dataformat": "Beamformed",
-          "datatype": "time series",
-          "role": "beamformer"
-        },
-        "output": {
-          "dataformat": "Beamformed",
-          "datatype": "time series",
-          "role": "beamformer"
-        },
-        "producer": "Observation",
-        "selection_doc": {},
-        "selection_template": "all"
-      },
-      {
-        "consumer": "Ingest",
-        "input": {
-          "dataformat": "pulp summary",
-          "datatype": "quality",
-          "role": "any"
-        },
-        "output": {
-          "dataformat": "pulp summary",
-          "datatype": "quality",
-          "role": "any"
-        },
-        "producer": "Pipeline",
-        "selection_doc": {},
-        "selection_template": "all"
-      },
-      {
-        "consumer": "Ingest",
-        "input": {
-          "dataformat": "pulp analysis",
-          "datatype": "pulsar profile",
-          "role": "any"
-        },
-        "output": {
-          "dataformat": "pulp analysis",
-          "datatype": "pulsar profile",
-          "role": "any"
-        },
-        "producer": "Pipeline",
-        "selection_doc": {},
-        "selection_template": "all"
-      },
-      {
-        "consumer": "Cleanup",
-        "input": {
-          "dataformat": "Beamformed",
-          "datatype": "time series",
-          "role": "beamformer"
-        },
-        "output": {
-          "dataformat": "Beamformed",
-          "datatype": "time series",
-          "role": "beamformer"
-        },
-        "producer": "Observation",
-        "selection_doc": {},
-        "selection_template": "all"
-      },
-      {
-        "consumer": "Cleanup",
-        "input": {
-          "dataformat": "pulp summary",
-          "datatype": "quality",
-          "role": "any"
-        },
-        "output": {
-          "dataformat": "pulp summary",
-          "datatype": "quality",
-          "role": "any"
-        },
-        "producer": "Pipeline",
-        "selection_doc": {},
-        "selection_template": "all"
-      },
-      {
-        "consumer": "Cleanup",
-        "input": {
-          "dataformat": "pulp analysis",
-          "datatype": "pulsar profile",
-          "role": "any"
-        },
-        "output": {
-          "dataformat": "pulp analysis",
-          "datatype": "pulsar profile",
-          "role": "any"
-        },
-        "producer": "Pipeline",
-        "selection_doc": {},
-        "selection_template": "all"
-      }
-    ],
+    "task_relations": [],
     "task_scheduling_relations": [],
     "tasks": {
-      "Cleanup": {
-        "description": "Cleanup all dataproducts from disk",
-        "specifications_doc": {},
-        "specifications_template": {
-          "name": "cleanup"
-        }
-      },
-      "Ingest": {
-        "description": "Ingest the pipeline outputs dataproducts",
-        "specifications_doc": {},
-        "specifications_template": {
-          "name": "ingest"
-        }
-      },
       "Observation": {
-        "description": "A simple short test beamforming observation",
         "specifications_doc": {
-          "station_configuration": {
-            "SAPs": [
-              {
-                "digital_pointing": {
-                  "angle1": 0.92934186635,
-                  "angle2": 0.952579228492,
-                  "direction_type": "J2000",
-                  "target": "target1"
-                },
-                "name": "B0329+54",
-                "subbands": [
-                  0,
-                  1,
-                  2,
-                  3,
-                  4,
-                  5,
-                  6,
-                  7,
-                  8,
-                  9,
-                  10,
-                  11,
-                  12,
-                  13,
-                  14,
-                  15,
-                  16,
-                  17,
-                  18,
-                  19,
-                  20,
-                  21,
-                  22,
-                  23,
-                  24,
-                  25,
-                  26,
-                  27,
-                  28,
-                  29,
-                  30,
-                  31,
-                  32,
-                  33,
-                  34,
-                  35,
-                  36,
-                  37,
-                  38,
-                  39,
-                  40,
-                  41,
-                  42,
-                  43,
-                  44,
-                  45,
-                  46,
-                  47,
-                  48,
-                  49,
-                  50,
-                  51,
-                  52,
-                  53,
-                  54,
-                  55,
-                  56,
-                  57,
-                  58,
-                  59,
-                  60,
-                  61,
-                  62,
-                  63,
-                  64,
-                  65,
-                  66,
-                  67,
-                  68,
-                  69,
-                  70,
-                  71,
-                  72,
-                  73,
-                  74,
-                  75,
-                  76,
-                  77,
-                  78,
-                  79,
-                  80,
-                  81,
-                  82,
-                  83,
-                  84,
-                  85,
-                  86,
-                  87,
-                  88,
-                  89,
-                  90,
-                  91,
-                  92,
-                  93,
-                  94,
-                  95,
-                  96,
-                  97,
-                  98,
-                  99,
-                  100,
-                  101,
-                  102,
-                  103,
-                  104,
-                  105,
-                  106,
-                  107,
-                  108,
-                  109,
-                  110,
-                  111,
-                  112,
-                  113,
-                  114,
-                  115,
-                  116,
-                  117,
-                  118,
-                  119,
-                  120,
-                  121,
-                  122,
-                  123,
-                  124,
-                  125,
-                  126,
-                  127,
-                  128,
-                  129,
-                  130,
-                  131,
-                  132,
-                  133,
-                  134,
-                  135,
-                  136,
-                  137,
-                  138,
-                  139,
-                  140,
-                  141,
-                  142,
-                  143,
-                  144,
-                  145,
-                  146,
-                  147,
-                  148,
-                  149,
-                  150,
-                  151,
-                  152,
-                  153,
-                  154,
-                  155,
-                  156,
-                  157,
-                  158,
-                  159,
-                  160,
-                  161,
-                  162,
-                  163,
-                  164,
-                  165,
-                  166,
-                  167,
-                  168,
-                  169,
-                  170,
-                  171,
-                  172,
-                  173,
-                  174,
-                  175,
-                  176,
-                  177,
-                  178,
-                  179,
-                  180,
-                  181,
-                  182,
-                  183,
-                  184,
-                  185,
-                  186,
-                  187,
-                  188,
-                  189,
-                  190,
-                  191,
-                  192,
-                  193,
-                  194,
-                  195,
-                  196,
-                  197,
-                  198,
-                  199,
-                  200,
-                  201,
-                  202,
-                  203,
-                  204,
-                  205,
-                  206,
-                  207,
-                  208,
-                  209,
-                  210,
-                  211,
-                  212,
-                  213,
-                  214,
-                  215,
-                  216,
-                  217,
-                  218,
-                  219,
-                  220,
-                  221,
-                  222,
-                  223,
-                  224,
-                  225,
-                  226,
-                  227,
-                  228,
-                  229,
-                  230,
-                  231,
-                  232,
-                  233,
-                  234,
-                  235,
-                  236,
-                  237,
-                  238,
-                  239,
-                  240,
-                  241,
-                  242,
-                  243
-                ]
-              }
-            ],
-            "antenna_set": "HBA_DUAL_INNER",
-            "filter": "HBA_110_190",
-            "station_groups": [
-              {
-                "max_nr_missing": 1,
-                "stations": [
-                  "CS002",
-                  "CS003",
-                  "CS004",
-                  "CS005",
-                  "CS006",
-                  "CS007"
-                ]
-              }
-            ],
-            "tile_beam": {
-              "angle1": 0.6624317181687094,
-              "angle2": 1.5579526427549426,
-              "direction_type": "J2000",
-              "target": "target1"
-            }
-          },
-          "duration": 120,
           "beamformer": {
             "pipelines": [
               {
                 "coherent": {
                   "SAPs": [
                     {
-                      "name": "B0329+54",
+                      "name": "SAP0",
                       "subbands": {
                         "list": [
-                          0,
-                          1,
-                          2,
-                          3,
-                          4,
-                          5,
-                          6,
-                          7,
-                          8,
-                          9,
-                          10,
-                          11,
-                          12,
-                          13,
-                          14,
-                          15,
-                          16,
-                          17,
-                          18,
-                          19,
-                          20,
-                          21,
-                          22,
-                          23,
-                          24,
-                          25,
-                          26,
-                          27,
-                          28,
-                          29,
-                          30,
-                          31,
-                          32,
-                          33,
-                          34,
-                          35,
-                          36,
-                          37,
-                          38,
-                          39,
-                          40,
-                          41,
-                          42,
-                          43,
-                          44,
-                          45,
-                          46,
-                          47,
-                          48,
-                          49,
-                          50,
                           51,
                           52,
                           53,
@@ -710,7 +252,214 @@
                           240,
                           241,
                           242,
-                          243
+                          243,
+                          244,
+                          245,
+                          246,
+                          247,
+                          248,
+                          249,
+                          250,
+                          251,
+                          252,
+                          253,
+                          254,
+                          255,
+                          256,
+                          257,
+                          258,
+                          259,
+                          260,
+                          261,
+                          262,
+                          263,
+                          264,
+                          265,
+                          266,
+                          267,
+                          268,
+                          269,
+                          270,
+                          271,
+                          272,
+                          273,
+                          274,
+                          275,
+                          276,
+                          277,
+                          278,
+                          279,
+                          280,
+                          281,
+                          282,
+                          283,
+                          284,
+                          285,
+                          286,
+                          287,
+                          288,
+                          289,
+                          290,
+                          291,
+                          292,
+                          293,
+                          294,
+                          295,
+                          296,
+                          297,
+                          298,
+                          299,
+                          300,
+                          301,
+                          302,
+                          303,
+                          304,
+                          305,
+                          306,
+                          307,
+                          308,
+                          309,
+                          310,
+                          311,
+                          312,
+                          313,
+                          314,
+                          315,
+                          316,
+                          317,
+                          318,
+                          319,
+                          320,
+                          321,
+                          322,
+                          323,
+                          324,
+                          325,
+                          326,
+                          327,
+                          328,
+                          329,
+                          330,
+                          331,
+                          332,
+                          333,
+                          334,
+                          335,
+                          336,
+                          337,
+                          338,
+                          339,
+                          340,
+                          341,
+                          342,
+                          343,
+                          344,
+                          345,
+                          346,
+                          347,
+                          348,
+                          349,
+                          350,
+                          351,
+                          352,
+                          353,
+                          354,
+                          355,
+                          356,
+                          357,
+                          358,
+                          359,
+                          360,
+                          361,
+                          362,
+                          363,
+                          364,
+                          365,
+                          366,
+                          367,
+                          368,
+                          369,
+                          370,
+                          371,
+                          372,
+                          373,
+                          374,
+                          375,
+                          376,
+                          377,
+                          378,
+                          379,
+                          380,
+                          381,
+                          382,
+                          383,
+                          384,
+                          385,
+                          386,
+                          387,
+                          388,
+                          389,
+                          390,
+                          391,
+                          392,
+                          393,
+                          394,
+                          395,
+                          396,
+                          397,
+                          398,
+                          399,
+                          400,
+                          401,
+                          402,
+                          403,
+                          404,
+                          405,
+                          406,
+                          407,
+                          408,
+                          409,
+                          410,
+                          411,
+                          412,
+                          413,
+                          414,
+                          415,
+                          416,
+                          417,
+                          418,
+                          419,
+                          420,
+                          421,
+                          422,
+                          423,
+                          424,
+                          425,
+                          426,
+                          427,
+                          428,
+                          429,
+                          430,
+                          431,
+                          432,
+                          433,
+                          434,
+                          435,
+                          436,
+                          437,
+                          438,
+                          439,
+                          440,
+                          441,
+                          442,
+                          443,
+                          444,
+                          445,
+                          446,
+                          447,
+                          448,
+                          449,
+                          450
                         ],
                         "method": "copy"
                       },
@@ -721,10 +470,10 @@
                       "tabs": [
                         {
                           "pointing": {
-                            "angle1": 0.92934186635,
-                            "angle2": 0.952579228492,
+                            "angle1": 0,
+                            "angle2": 1.5707963267948966,
                             "direction_type": "J2000",
-                            "target": "target1"
+                            "target": "Zenith"
                           },
                           "relative": false
                         }
@@ -732,7 +481,7 @@
                     }
                   ],
                   "settings": {
-                    "channels_per_subband": 16,
+                    "channels_per_subband": 256,
                     "quantisation": {
                       "bits": 8,
                       "enabled": false,
@@ -741,7 +490,7 @@
                     },
                     "stokes": "I",
                     "subbands_per_file": 488,
-                    "time_integration_factor": 6
+                    "time_integration_factor": 1
                   }
                 },
                 "flys eye": {
@@ -762,7 +511,7 @@
                 "incoherent": {
                   "SAPs": [],
                   "settings": {
-                    "channels_per_subband": 16,
+                    "channels_per_subband": 1,
                     "quantisation": {
                       "bits": 8,
                       "enabled": false,
@@ -771,39 +520,484 @@
                     },
                     "stokes": "I",
                     "subbands_per_file": 488,
-                    "time_integration_factor": 6
+                    "time_integration_factor": 1
                   }
                 },
-                "name": "B0329+54",
+                "name": "Beamformer CV",
                 "station_groups": [
                   {
                     "max_nr_missing": 1,
                     "stations": [
+                      "CS001",
                       "CS002",
                       "CS003",
                       "CS004",
                       "CS005",
                       "CS006",
-                      "CS007"
+                      "CS007",
+                      "CS011",
+                      "CS013",
+                      "CS017",
+                      "CS021",
+                      "CS024",
+                      "CS026",
+                      "CS028",
+                      "CS030",
+                      "CS031",
+                      "CS032",
+                      "CS101",
+                      "CS103",
+                      "CS201",
+                      "CS301",
+                      "CS302",
+                      "CS401",
+                      "CS501"
                     ]
                   }
                 ]
               }
-            ]
+            ],
+            "ppf": true
+          },
+          "duration": 120,
+          "station_configuration": {
+            "SAPs": [
+              {
+                "digital_pointing": {
+                  "angle1": 0,
+                  "angle2": 1.5707963267948966,
+                  "direction_type": "J2000",
+                  "target": "NEP"
+                },
+                "name": "SAP0",
+                "subbands": [
+                  51,
+                  52,
+                  53,
+                  54,
+                  55,
+                  56,
+                  57,
+                  58,
+                  59,
+                  60,
+                  61,
+                  62,
+                  63,
+                  64,
+                  65,
+                  66,
+                  67,
+                  68,
+                  69,
+                  70,
+                  71,
+                  72,
+                  73,
+                  74,
+                  75,
+                  76,
+                  77,
+                  78,
+                  79,
+                  80,
+                  81,
+                  82,
+                  83,
+                  84,
+                  85,
+                  86,
+                  87,
+                  88,
+                  89,
+                  90,
+                  91,
+                  92,
+                  93,
+                  94,
+                  95,
+                  96,
+                  97,
+                  98,
+                  99,
+                  100,
+                  101,
+                  102,
+                  103,
+                  104,
+                  105,
+                  106,
+                  107,
+                  108,
+                  109,
+                  110,
+                  111,
+                  112,
+                  113,
+                  114,
+                  115,
+                  116,
+                  117,
+                  118,
+                  119,
+                  120,
+                  121,
+                  122,
+                  123,
+                  124,
+                  125,
+                  126,
+                  127,
+                  128,
+                  129,
+                  130,
+                  131,
+                  132,
+                  133,
+                  134,
+                  135,
+                  136,
+                  137,
+                  138,
+                  139,
+                  140,
+                  141,
+                  142,
+                  143,
+                  144,
+                  145,
+                  146,
+                  147,
+                  148,
+                  149,
+                  150,
+                  151,
+                  152,
+                  153,
+                  154,
+                  155,
+                  156,
+                  157,
+                  158,
+                  159,
+                  160,
+                  161,
+                  162,
+                  163,
+                  164,
+                  165,
+                  166,
+                  167,
+                  168,
+                  169,
+                  170,
+                  171,
+                  172,
+                  173,
+                  174,
+                  175,
+                  176,
+                  177,
+                  178,
+                  179,
+                  180,
+                  181,
+                  182,
+                  183,
+                  184,
+                  185,
+                  186,
+                  187,
+                  188,
+                  189,
+                  190,
+                  191,
+                  192,
+                  193,
+                  194,
+                  195,
+                  196,
+                  197,
+                  198,
+                  199,
+                  200,
+                  201,
+                  202,
+                  203,
+                  204,
+                  205,
+                  206,
+                  207,
+                  208,
+                  209,
+                  210,
+                  211,
+                  212,
+                  213,
+                  214,
+                  215,
+                  216,
+                  217,
+                  218,
+                  219,
+                  220,
+                  221,
+                  222,
+                  223,
+                  224,
+                  225,
+                  226,
+                  227,
+                  228,
+                  229,
+                  230,
+                  231,
+                  232,
+                  233,
+                  234,
+                  235,
+                  236,
+                  237,
+                  238,
+                  239,
+                  240,
+                  241,
+                  242,
+                  243,
+                  244,
+                  245,
+                  246,
+                  247,
+                  248,
+                  249,
+                  250,
+                  251,
+                  252,
+                  253,
+                  254,
+                  255,
+                  256,
+                  257,
+                  258,
+                  259,
+                  260,
+                  261,
+                  262,
+                  263,
+                  264,
+                  265,
+                  266,
+                  267,
+                  268,
+                  269,
+                  270,
+                  271,
+                  272,
+                  273,
+                  274,
+                  275,
+                  276,
+                  277,
+                  278,
+                  279,
+                  280,
+                  281,
+                  282,
+                  283,
+                  284,
+                  285,
+                  286,
+                  287,
+                  288,
+                  289,
+                  290,
+                  291,
+                  292,
+                  293,
+                  294,
+                  295,
+                  296,
+                  297,
+                  298,
+                  299,
+                  300,
+                  301,
+                  302,
+                  303,
+                  304,
+                  305,
+                  306,
+                  307,
+                  308,
+                  309,
+                  310,
+                  311,
+                  312,
+                  313,
+                  314,
+                  315,
+                  316,
+                  317,
+                  318,
+                  319,
+                  320,
+                  321,
+                  322,
+                  323,
+                  324,
+                  325,
+                  326,
+                  327,
+                  328,
+                  329,
+                  330,
+                  331,
+                  332,
+                  333,
+                  334,
+                  335,
+                  336,
+                  337,
+                  338,
+                  339,
+                  340,
+                  341,
+                  342,
+                  343,
+                  344,
+                  345,
+                  346,
+                  347,
+                  348,
+                  349,
+                  350,
+                  351,
+                  352,
+                  353,
+                  354,
+                  355,
+                  356,
+                  357,
+                  358,
+                  359,
+                  360,
+                  361,
+                  362,
+                  363,
+                  364,
+                  365,
+                  366,
+                  367,
+                  368,
+                  369,
+                  370,
+                  371,
+                  372,
+                  373,
+                  374,
+                  375,
+                  376,
+                  377,
+                  378,
+                  379,
+                  380,
+                  381,
+                  382,
+                  383,
+                  384,
+                  385,
+                  386,
+                  387,
+                  388,
+                  389,
+                  390,
+                  391,
+                  392,
+                  393,
+                  394,
+                  395,
+                  396,
+                  397,
+                  398,
+                  399,
+                  400,
+                  401,
+                  402,
+                  403,
+                  404,
+                  405,
+                  406,
+                  407,
+                  408,
+                  409,
+                  410,
+                  411,
+                  412,
+                  413,
+                  414,
+                  415,
+                  416,
+                  417,
+                  418,
+                  419,
+                  420,
+                  421,
+                  422,
+                  423,
+                  424,
+                  425,
+                  426,
+                  427,
+                  428,
+                  429,
+                  430,
+                  431,
+                  432,
+                  433,
+                  434,
+                  435,
+                  436,
+                  437,
+                  438,
+                  439,
+                  440,
+                  441,
+                  442,
+                  443,
+                  444,
+                  445,
+                  446,
+                  447,
+                  448,
+                  449,
+                  450
+                ]
+              }
+            ],
+            "antenna_set": "HBA_DUAL_INNER",
+            "filter": "HBA_110_190",
+            "station_groups": [
+              {
+                "max_nr_missing": 0,
+                "stations": [
+                  "CS001"
+                ]
+              }
+            ],
+            "tile_beam": {
+              "angle1": 0,
+              "angle2": 1.5707963267948966,
+              "direction_type": "J2000",
+              "target": "zenith"
+            }
           }
         },
         "specifications_template": {
-          "name": "beamforming observation"
-        }
-      },
-      "Pipeline": {
-        "description": "Pulsar Pipeline for the test observation",
-        "specifications_doc": {},
-        "specifications_template": {
-          "name": "pulsar pipeline"
+          "name": "beamforming observation",
+          "version": 2
         }
       }
     }
   },
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/HBA_single_beam_imaging-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_HBA_-_1_Beam-2.json
similarity index 94%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/HBA_single_beam_imaging-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_HBA_-_1_Beam-2.json
index 65f126da491649d9a02e45a775331b54a785b938..9342c1467453db6faaf442300d2eb575f3229e9b 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/HBA_single_beam_imaging-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_HBA_-_1_Beam-2.json
@@ -1,11 +1,12 @@
 {
   "description": "This observation strategy template defines an single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
-  "name": "HBA single beam imaging",
+  "name": "IM HBA - 1 Beam",
   "purpose": "technical_commissioning",
   "scheduling_unit_template": {
     "name": "scheduling unit",
-    "version": 1
+    "version": 2
   },
+  "state": "development",
   "template": {
     "parameters": [
       {
@@ -90,7 +91,8 @@
       }
     },
     "scheduling_constraints_template": {
-      "name": "constraints"
+      "name": "constraints",
+      "version": 1
     },
     "task_relations": [
       {
@@ -107,8 +109,10 @@
         },
         "producer": "Calibrator Observation 1",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Calibrator Pipeline 2",
@@ -124,8 +128,10 @@
         },
         "producer": "Calibrator Observation 2",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Target Pipeline",
@@ -145,8 +151,10 @@
             "target1"
           ]
         },
-        "selection_template": "SAP",
-        "tags": []
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -162,8 +170,10 @@
         },
         "producer": "Calibrator Pipeline 1",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -179,8 +189,10 @@
         },
         "producer": "Calibrator Pipeline 2",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -196,8 +208,10 @@
         },
         "producer": "Target Pipeline",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       }
     ],
     "task_scheduling_relations": [
@@ -218,7 +232,6 @@
       "Calibrator Observation 1": {
         "description": "Calibrator Observation before Target Observation",
         "specifications_doc": {
-          "duration": 600,
           "calibrator": {
             "autoselect": false,
             "name": "calibrator1",
@@ -228,17 +241,17 @@
               "direction_type": "J2000",
               "target": "target1"
             }
-          }
+          },
+          "duration": 600
         },
         "specifications_template": {
-          "name": "calibrator observation"
-        },
-        "tags": []
+          "name": "calibrator observation",
+          "version": 2
+        }
       },
       "Calibrator Observation 2": {
         "description": "Calibrator Observation after Target Observation",
         "specifications_doc": {
-          "duration": 600,
           "calibrator": {
             "autoselect": false,
             "name": "calibrator2",
@@ -248,12 +261,13 @@
               "direction_type": "J2000",
               "target": "target1"
             }
-          }
+          },
+          "duration": 600
         },
         "specifications_template": {
-          "name": "calibrator observation"
-        },
-        "tags": []
+          "name": "calibrator observation",
+          "version": 2
+        }
       },
       "Calibrator Pipeline 1": {
         "description": "Preprocessing Pipeline for Calibrator Observation 1",
@@ -276,9 +290,9 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
       },
       "Calibrator Pipeline 2": {
         "description": "Preprocessing Pipeline for Calibrator Observation 2",
@@ -301,17 +315,17 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
       },
       "Ingest": {
         "description": "Ingest all preprocessed dataproducts",
         "specifications_doc": {},
         "specifications_template": {
-          "name": "ingest"
-        },
-        "tags": []
+          "name": "ingest",
+          "version": 2
+        }
       },
       "Target Observation": {
         "description": "Target Observation",
@@ -329,6 +343,11 @@
               "enabled": true
             }
           },
+          "correlator": {
+            "channels_per_subband": 64,
+            "integration_time": 1,
+            "storage_cluster": "CEP4"
+          },
           "duration": 28800,
           "station_configuration": {
             "SAPs": [
@@ -906,17 +925,12 @@
               "direction_type": "J2000",
               "target": "target1"
             }
-          },
-          "correlator": {
-              "channels_per_subband": 64,
-              "integration_time": 1,
-              "storage_cluster": "CEP4"
-            }
+          }
         },
         "specifications_template": {
-          "name": "target observation"
-        },
-        "tags": []
+          "name": "target observation",
+          "version": 2
+        }
       },
       "Target Pipeline": {
         "description": "Preprocessing Pipeline for Target Observation",
@@ -939,12 +953,11 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
       }
     }
   },
-  "version": 1,
-  "state": "active"
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_HBA_Deep_-_4_Beams-2.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_HBA_Deep_-_4_Beams-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..9f387e2548dca8099f3f1d5ca62ea5d05562eedf
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_HBA_Deep_-_4_Beams-2.json
@@ -0,0 +1,1250 @@
+{
+  "description": "This observation strategy template defines a LoTSS deep field run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only, using a central beam with 3 flanking fields.",
+  "name": "IM HBA Deep - 4 Beams",
+  "purpose": "technical_commissioning",
+  "scheduling_unit_template": {
+    "name": "scheduling unit",
+    "version": 2
+  },
+  "state": "development",
+  "template": {
+    "parameters": [
+      {
+        "name": "Target Duration",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/duration"
+        ]
+      },
+      {
+        "name": "Scheduling Constraints",
+        "refs": [
+          "#/scheduling_constraints_doc"
+        ]
+      },
+      {
+        "name": "Target Observation Description",
+        "refs": [
+          "#/tasks/Target Observation/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline Central Target Description",
+        "refs": [
+          "#/tasks/Pipeline Central Target/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline Offset A Description",
+        "refs": [
+          "#/tasks/Pipeline Offset A/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline Offset B Description",
+        "refs": [
+          "#/tasks/Pipeline Offset B/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline Offset C Description",
+        "refs": [
+          "#/tasks/Pipeline Offset C/short_description"
+        ]
+      },
+      {
+        "name": "Central Pointing",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing",
+          "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+        ]
+      },
+      {
+        "name": "Pointing Offset A",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+        ]
+      },
+      {
+        "name": "Pointing Offset B",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
+        ]
+      },
+      {
+        "name": "Pointing Offset C",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
+        ]
+      },
+      {
+        "name": "Calibrator 1 Description",
+        "refs": [
+          "#/tasks/Calibrator Observation 1/short_description"
+        ]
+      },
+      {
+        "name": "Calibrator Pipeline 1 Description",
+        "refs": [
+          "#/tasks/Calibrator Pipeline 1/short_description"
+        ]
+      },
+      {
+        "name": "Calibrator 1 Pointing ",
+        "refs": [
+          "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
+        ]
+      },
+      {
+        "name": "Calibrator 2 Description",
+        "refs": [
+          "#/tasks/Calibrator Observation 2/short_description"
+        ]
+      },
+      {
+        "name": "Calibrator Pipeline 2 Description",
+        "refs": [
+          "#/tasks/Calibrator Pipeline 2/short_description"
+        ]
+      },
+      {
+        "name": "Calibrator 2 Pointing",
+        "refs": [
+          "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
+        ]
+      },
+      {
+        "name": "Run ADDER QA",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/QA/file_conversion/enabled",
+          "#/tasks/Target Observation/specifications_doc/QA/plots/enabled"
+        ]
+      }
+    ],
+    "scheduling_constraints_doc": {
+      "sky": {
+        "transit_offset": {
+          "from": -1440,
+          "to": 1440
+        }
+      }
+    },
+    "scheduling_constraints_template": {
+      "name": "constraints",
+      "version": 1
+    },
+    "task_relations": [
+      {
+        "consumer": "Calibrator Pipeline 1",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Calibrator Observation 1",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Calibrator Pipeline 2",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Calibrator Observation 2",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline Central Target",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Target Observation",
+        "selection_doc": {
+          "sap": [
+            "central-sap"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline Offset A",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Target Observation",
+        "selection_doc": {
+          "sap": [
+            "offset-A"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline Offset B",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Target Observation",
+        "selection_doc": {
+          "sap": [
+            "offset-B"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline Offset C",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Target Observation",
+        "selection_doc": {
+          "sap": [
+            "offset-C"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Calibrator Pipeline 1",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Calibrator Pipeline 2",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline Central Target",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline Offset A",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline Offset B",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline Offset C",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      }
+    ],
+    "task_scheduling_relations": [
+      {
+        "first": "Calibrator Observation 1",
+        "placement": "before",
+        "second": "Target Observation",
+        "time_offset": 60
+      },
+      {
+        "first": "Calibrator Observation 2",
+        "placement": "after",
+        "second": "Target Observation",
+        "time_offset": 60
+      }
+    ],
+    "tasks": {
+      "Calibrator Observation 1": {
+        "description": "Calibrator Observation for UC1 HBA scheduling unit",
+        "short_description": "3Cabc",
+        "specifications_doc": {
+          "calibrator": {
+            "autoselect": false,
+            "name": "calibrator1",
+            "pointing": {
+              "angle1": 0.6624317181687094,
+              "angle2": 1.5579526427549426,
+              "direction_type": "J2000",
+              "target": "3Cab1"
+            }
+          },
+          "duration": 600
+        },
+        "specifications_template": {
+          "name": "calibrator observation",
+          "version": 2
+        }
+      },
+      "Calibrator Observation 2": {
+        "description": "Calibrator Observation for UC1 HBA scheduling unit",
+        "short_description": "3Cabc",
+        "specifications_doc": {
+          "calibrator": {
+            "autoselect": false,
+            "name": "calibrator2",
+            "pointing": {
+              "angle1": 0.6624317181687094,
+              "angle2": 1.5579526427549426,
+              "direction_type": "J2000",
+              "target": "3Cab2"
+            }
+          },
+          "duration": 600
+        },
+        "specifications_template": {
+          "name": "calibrator observation",
+          "version": 2
+        }
+      },
+      "Calibrator Pipeline 1": {
+        "description": "Preprocessing Pipeline for Calibrator Observation 1",
+        "short_description": "3Cabc/PP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 4,
+            "time_steps": 1
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "HBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Calibrator Pipeline 2": {
+        "description": "Preprocessing Pipeline for Calibrator Observation 2",
+        "short_description": "3Cabc/PP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 4,
+            "time_steps": 1
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "HBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Ingest": {
+        "description": "Ingest all preprocessed dataproducts",
+        "short_description": "Ingest",
+        "specifications_doc": {},
+        "specifications_template": {
+          "name": "ingest",
+          "version": 2
+        }
+      },
+      "Pipeline Central Target": {
+        "description": "Preprocessing Pipeline for Central Target, SAP000",
+        "short_description": "_target_field_name_/1.0/TP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 4,
+            "time_steps": 2
+          },
+          "demix": {
+            "frequency_steps": 16,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "HBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Pipeline Offset A": {
+        "description": "Preprocessing Pipeline for Offset Target A, SAP001",
+        "short_description": "_target_field_name_-IS-A/1.1/TP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 4,
+            "time_steps": 2
+          },
+          "demix": {
+            "frequency_steps": 16,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "HBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Pipeline Offset B": {
+        "description": "Preprocessing Pipeline for Offset Target B, SAP002",
+        "short_description": "_target_field_name_-IS-B/1.2/TP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 4,
+            "time_steps": 2
+          },
+          "demix": {
+            "frequency_steps": 16,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "HBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Pipeline Offset C": {
+        "description": "Preprocessing Pipeline for Offset Target C, SAP003",
+        "short_description": "_target_field_name_-IS-C/1.3/TP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 4,
+            "time_steps": 2
+          },
+          "demix": {
+            "frequency_steps": 16,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "HBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Target Observation": {
+        "description": "Target Observation for Deep HBA observation with 3 flanking fields",
+        "short_description": "_target_name_ Run _nr_",
+        "specifications_doc": {
+          "QA": {
+            "file_conversion": {
+              "enabled": true,
+              "nr_of_subbands": -1,
+              "nr_of_timestamps": 256
+            },
+            "inspection_plots": "msplots",
+            "plots": {
+              "autocorrelation": true,
+              "crosscorrelation": true,
+              "enabled": true
+            }
+          },
+          "correlator": {
+            "channels_per_subband": 64,
+            "integration_time": 1,
+            "storage_cluster": "CEP4"
+          },
+          "duration": 120,
+          "station_configuration": {
+            "SAPs": [
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "_target_field_name_"
+                },
+                "name": "central-sap",
+                "subbands": [
+                  77,
+                  78,
+                  79,
+                  80,
+                  81,
+                  82,
+                  83,
+                  84,
+                  85,
+                  86,
+                  87,
+                  88,
+                  89,
+                  90,
+                  91,
+                  92,
+                  93,
+                  94,
+                  95,
+                  96,
+                  97,
+                  98,
+                  99,
+                  100,
+                  101,
+                  102,
+                  103,
+                  104,
+                  105,
+                  106,
+                  107,
+                  108,
+                  109,
+                  110,
+                  111,
+                  112,
+                  113,
+                  114,
+                  115,
+                  116,
+                  117,
+                  118,
+                  119,
+                  120,
+                  121,
+                  122,
+                  123,
+                  124,
+                  125,
+                  126,
+                  127,
+                  128,
+                  129,
+                  130,
+                  131,
+                  132,
+                  133,
+                  134,
+                  135,
+                  136,
+                  137,
+                  138,
+                  139,
+                  140,
+                  141,
+                  142,
+                  143,
+                  144,
+                  145,
+                  146,
+                  147,
+                  148,
+                  149,
+                  150,
+                  151,
+                  152,
+                  153,
+                  154,
+                  155,
+                  156,
+                  157,
+                  158,
+                  159,
+                  160,
+                  161,
+                  162,
+                  163,
+                  164,
+                  165,
+                  166,
+                  167,
+                  168,
+                  169,
+                  170,
+                  171,
+                  172,
+                  173,
+                  174,
+                  175,
+                  176,
+                  177,
+                  178,
+                  179,
+                  180,
+                  181,
+                  182,
+                  183,
+                  184,
+                  185,
+                  186,
+                  187,
+                  188,
+                  189,
+                  190,
+                  191,
+                  192,
+                  193,
+                  194,
+                  195,
+                  196,
+                  197,
+                  198,
+                  199,
+                  200,
+                  201,
+                  202,
+                  203,
+                  204,
+                  205,
+                  206,
+                  207,
+                  208,
+                  209,
+                  210,
+                  211,
+                  212,
+                  213,
+                  214,
+                  215,
+                  216,
+                  217,
+                  218,
+                  219,
+                  220,
+                  221,
+                  222,
+                  223,
+                  224,
+                  225,
+                  226,
+                  227,
+                  228,
+                  229,
+                  230,
+                  231,
+                  232,
+                  233,
+                  234,
+                  235,
+                  236,
+                  237,
+                  238,
+                  239,
+                  240,
+                  241,
+                  242,
+                  243,
+                  244,
+                  245,
+                  246,
+                  247,
+                  248,
+                  249,
+                  250,
+                  251,
+                  252,
+                  253,
+                  254,
+                  255,
+                  256,
+                  257,
+                  258,
+                  259,
+                  260,
+                  261,
+                  262,
+                  263,
+                  264,
+                  265,
+                  266,
+                  267,
+                  268,
+                  269,
+                  270,
+                  271,
+                  272,
+                  273,
+                  274,
+                  275,
+                  276,
+                  277,
+                  278,
+                  279,
+                  280,
+                  281,
+                  282,
+                  283,
+                  284,
+                  285,
+                  286,
+                  287,
+                  288,
+                  289,
+                  290,
+                  291,
+                  292,
+                  293,
+                  294,
+                  295,
+                  296,
+                  297,
+                  298,
+                  299,
+                  300,
+                  301,
+                  302,
+                  303,
+                  304,
+                  305,
+                  306,
+                  307,
+                  308,
+                  309,
+                  310,
+                  311,
+                  312,
+                  313,
+                  314,
+                  315,
+                  316,
+                  317,
+                  318,
+                  319,
+                  320,
+                  321,
+                  322,
+                  323,
+                  324,
+                  325,
+                  326,
+                  327,
+                  328,
+                  329,
+                  330,
+                  331,
+                  332,
+                  333,
+                  334,
+                  335,
+                  336,
+                  337,
+                  338,
+                  339,
+                  340,
+                  341,
+                  342,
+                  343,
+                  344,
+                  345,
+                  346,
+                  347,
+                  348,
+                  349,
+                  350,
+                  351,
+                  352,
+                  353,
+                  354,
+                  355,
+                  356,
+                  357,
+                  358,
+                  359,
+                  360,
+                  361,
+                  362,
+                  363,
+                  364,
+                  365,
+                  366,
+                  367,
+                  368,
+                  369,
+                  370,
+                  371,
+                  372,
+                  373,
+                  374,
+                  375,
+                  376,
+                  377,
+                  378,
+                  379,
+                  380,
+                  381,
+                  382,
+                  383,
+                  384,
+                  385,
+                  386,
+                  387,
+                  388,
+                  389,
+                  390,
+                  391,
+                  392,
+                  393,
+                  394,
+                  395,
+                  396,
+                  402,
+                  407,
+                  408,
+                  409,
+                  410,
+                  411,
+                  412,
+                  413,
+                  414,
+                  415,
+                  416,
+                  417,
+                  418,
+                  419,
+                  420,
+                  421,
+                  422,
+                  423,
+                  424,
+                  425,
+                  426,
+                  427,
+                  428,
+                  429,
+                  430,
+                  431,
+                  432,
+                  433,
+                  434,
+                  435,
+                  436,
+                  437,
+                  438,
+                  439,
+                  440,
+                  441,
+                  442,
+                  443,
+                  444,
+                  445,
+                  446,
+                  447,
+                  448,
+                  449,
+                  450,
+                  451,
+                  452,
+                  453,
+                  454,
+                  455,
+                  456
+                ]
+              },
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "_target_field_name_-IS-A"
+                },
+                "name": "offset-1",
+                "subbands": [
+                  77,
+                  87,
+                  97,
+                  107,
+                  117,
+                  127,
+                  137,
+                  147,
+                  157,
+                  167,
+                  177,
+                  187,
+                  197,
+                  207,
+                  217,
+                  227,
+                  237,
+                  247,
+                  257,
+                  267,
+                  277,
+                  287,
+                  297,
+                  307,
+                  317,
+                  327,
+                  337,
+                  347,
+                  357,
+                  367,
+                  377,
+                  387,
+                  396,
+                  407,
+                  417,
+                  427,
+                  437,
+                  447,
+                  456
+                ]
+              },
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "_target_field_name_-IS-B"
+                },
+                "name": "offset-2",
+                "subbands": [
+                  77,
+                  87,
+                  97,
+                  107,
+                  117,
+                  127,
+                  137,
+                  147,
+                  157,
+                  167,
+                  177,
+                  187,
+                  197,
+                  207,
+                  217,
+                  227,
+                  237,
+                  247,
+                  257,
+                  267,
+                  277,
+                  287,
+                  297,
+                  307,
+                  317,
+                  327,
+                  337,
+                  347,
+                  357,
+                  367,
+                  377,
+                  387,
+                  396,
+                  407,
+                  417,
+                  427,
+                  437,
+                  447,
+                  456
+                ]
+              },
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "_target_field_name_-IS-C"
+                },
+                "name": "offset-3",
+                "subbands": [
+                  77,
+                  87,
+                  97,
+                  107,
+                  117,
+                  127,
+                  137,
+                  147,
+                  157,
+                  167,
+                  177,
+                  187,
+                  197,
+                  207,
+                  217,
+                  227,
+                  237,
+                  247,
+                  257,
+                  267,
+                  277,
+                  287,
+                  297,
+                  307,
+                  317,
+                  327,
+                  337,
+                  347,
+                  357,
+                  367,
+                  377,
+                  387,
+                  396,
+                  407,
+                  417,
+                  427,
+                  437,
+                  447,
+                  456
+                ]
+              }
+            ],
+            "antenna_set": "HBA_DUAL_INNER",
+            "filter": "HBA_110_190",
+            "station_groups": [
+              {
+                "max_nr_missing": 4,
+                "stations": [
+                  "CS001",
+                  "CS002",
+                  "CS003",
+                  "CS004",
+                  "CS005",
+                  "CS006",
+                  "CS007",
+                  "CS011",
+                  "CS013",
+                  "CS017",
+                  "CS021",
+                  "CS024",
+                  "CS026",
+                  "CS028",
+                  "CS030",
+                  "CS031",
+                  "CS032",
+                  "CS101",
+                  "CS103",
+                  "CS201",
+                  "CS301",
+                  "CS302",
+                  "CS401",
+                  "CS501",
+                  "RS106",
+                  "RS205",
+                  "RS208",
+                  "RS210",
+                  "RS305",
+                  "RS306",
+                  "RS307",
+                  "RS310",
+                  "RS406",
+                  "RS407",
+                  "RS409",
+                  "RS503",
+                  "RS508",
+                  "RS509"
+                ]
+              },
+              {
+                "max_nr_missing": 2,
+                "stations": [
+                  "DE601",
+                  "DE602",
+                  "DE603",
+                  "DE604",
+                  "DE605",
+                  "DE609",
+                  "FR606",
+                  "SE607",
+                  "UK608",
+                  "PL610",
+                  "PL611",
+                  "PL612",
+                  "IE613",
+                  "LV614"
+                ]
+              },
+              {
+                "max_nr_missing": 1,
+                "stations": [
+                  "DE601",
+                  "DE605"
+                ]
+              }
+            ],
+            "tile_beam": {
+              "angle1": 0.6624317181687094,
+              "angle2": 1.5579526427549426,
+              "direction_type": "J2000",
+              "target": "Tile Beam on Central Target"
+            }
+          }
+        },
+        "specifications_template": {
+          "name": "target observation",
+          "version": 2
+        }
+      }
+    }
+  },
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/LoTSS_Observing_strategy-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_HBA_LoTSS_-_2_Beams-2.json
similarity index 86%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/LoTSS_Observing_strategy-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_HBA_LoTSS_-_2_Beams-2.json
index 30f00d4b184593c47c0e9f6f8d3eba0e0760b590..eaf87c5b60b3a4245e678d0dcedf09a1556d0b70 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/LoTSS_Observing_strategy-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_HBA_LoTSS_-_2_Beams-2.json
@@ -1,85 +1,97 @@
 {
   "description": "This observation strategy template defines a LoTSS (Co-)observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only. Fix target names.",
-  "name": "LoTSS Observing strategy",
+  "name": "IM HBA LoTSS - 2 Beams",
   "purpose": "technical_commissioning",
   "scheduling_unit_template": {
     "name": "scheduling unit",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "parameters": [
       {
-        "name": "Scheduler",
+        "name": "Scheduling Constraints",
         "refs": [
-          "#/scheduling_constraints_doc/scheduler"
+          "#/scheduling_constraints_doc"
         ]
       },
       {
-        "name": "Scheduling Constraints",
+        "name": "Target Pointing 1",
         "refs": [
-          "#/scheduling_constraints_doc/time"
+          "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
         ]
       },
       {
-        "name": "Target 1 Name",
+        "name": "Target Pointing 2",
         "refs": [
-          "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/target"
+          "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
         ]
       },
       {
-        "name": "Target Pointing 1",
+        "name": "Tile Beam",
         "refs": [
-          "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+          "#/tasks/Target Observation/specifications_docstation_configuration//tile_beam"
         ]
       },
       {
-        "name": "Target 2 Name",
+        "name": "Target Duration",
         "refs": [
-          "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/target"
+          "#/tasks/Target Observation/specifications_doc/duration"
         ]
       },
       {
-        "name": "Target Pointing 2",
+        "name": "Observation Description",
         "refs": [
-          "#/tasks/Target Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+          "#/tasks/Target Observation/short_description"
         ]
       },
       {
-        "name": "Tile Beam",
+        "name": "Pipeline 1 Description",
         "refs": [
-          "#/tasks/Target Observation/specifications_doc/station_configuration/tile_beam"
+          "#/tasks/Pipeline target1/short_description"
         ]
       },
       {
-        "name": "Target Duration",
+        "name": "Pipeline 2 Description",
         "refs": [
-          "#/tasks/Target Observation/specifications_doc/duration"
+          "#/tasks/Pipeline target2/short_description"
         ]
       },
       {
-        "name": "Calibrator 1 Name",
+        "name": "Calibrator Observation 1 Description",
         "refs": [
-          "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/name"
+          "#/tasks/Calibrator Observation 1/short_description"
         ]
       },
       {
-        "name": "Calibrator 1 Pointing ",
+        "name": "Calibrator Observation 1 Pointing",
         "refs": [
           "#/tasks/Calibrator Observation 1/specifications_doc/calibrator/pointing"
         ]
       },
       {
-        "name": "Calibrator 2 Name",
+        "name": "Calibrator Pipeline 1 Description",
+        "refs": [
+          "#/tasks/Calibrator Pipeline 1/short_description"
+        ]
+      },
+      {
+        "name": "Calibrator Observation 2 Description",
         "refs": [
-          "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/name"
+          "#/tasks/Calibrator Observation 2/short_description"
         ]
       },
       {
-        "name": "Calibrator 2 Pointing",
+        "name": "Calibrator Observation 2 Pointing",
         "refs": [
           "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
         ]
+      },
+      {
+        "name": "Calibrator Pipeline 2 Description",
+        "refs": [
+          "#/tasks/Calibrator Pipeline 2/short_description"
+        ]
       }
     ],
     "scheduling_constraints_doc": {
@@ -108,8 +120,10 @@
         },
         "producer": "Calibrator Observation 1",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Calibrator Pipeline 2",
@@ -125,8 +139,10 @@
         },
         "producer": "Calibrator Observation 2",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Pipeline target1",
@@ -146,8 +162,10 @@
             "sap1"
           ]
         },
-        "selection_template": "SAP",
-        "tags": []
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
       },
       {
         "consumer": "Pipeline target2",
@@ -167,8 +185,10 @@
             "sap2"
           ]
         },
-        "selection_template": "SAP",
-        "tags": []
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -184,8 +204,10 @@
         },
         "producer": "Calibrator Pipeline 1",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -201,8 +223,10 @@
         },
         "producer": "Calibrator Pipeline 2",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -218,8 +242,10 @@
         },
         "producer": "Pipeline target1",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -235,8 +261,10 @@
         },
         "producer": "Pipeline target2",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       }
     ],
     "task_scheduling_relations": [
@@ -255,9 +283,9 @@
     ],
     "tasks": {
       "Calibrator Observation 1": {
-        "description": "Calibrator Observation for UC1 HBA scheduling unit",
+        "description": "Calibrator Observation 1. Before the Target Observation",
+        "short_description": "Cal1 3Cabc",
         "specifications_doc": {
-          "duration": 600,
           "calibrator": {
             "autoselect": false,
             "name": "calibrator1",
@@ -265,37 +293,40 @@
               "angle1": 0.6624317181687094,
               "angle2": 1.5579526427549426,
               "direction_type": "J2000",
-              "target": "PXXX+YY"
+              "target": "3Cabc"
             }
-          }
+          },
+          "duration": 600
         },
         "specifications_template": {
-          "name": "calibrator observation"
-        },
-        "tags": []
+          "name": "calibrator observation",
+          "version": 2
+        }
       },
       "Calibrator Observation 2": {
-        "description": "Calibrator Observation for UC1 HBA scheduling unit",
+        "description": "Calibrator Observation 2. After the Target Observation",
+        "short_description": "Cal2 3Cdef",
         "specifications_doc": {
-          "duration": 600,
           "calibrator": {
             "autoselect": false,
-            "name": "calibrator2",
+            "name": "calibrator1",
             "pointing": {
               "angle1": 0.6624317181687094,
               "angle2": 1.5579526427549426,
               "direction_type": "J2000",
-              "target": "PXXX+YY"
+              "target": "3Cdef"
             }
-          }
+          },
+          "duration": 600
         },
         "specifications_template": {
-          "name": "calibrator observation"
-        },
-        "tags": []
+          "name": "calibrator observation",
+          "version": 2
+        }
       },
       "Calibrator Pipeline 1": {
         "description": "Preprocessing Pipeline for Calibrator Observation 1",
+        "short_description": "Cal1 3Cabc/PP",
         "specifications_doc": {
           "average": {
             "frequency_steps": 4,
@@ -315,12 +346,13 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
       },
       "Calibrator Pipeline 2": {
         "description": "Preprocessing Pipeline for Calibrator Observation 2",
+        "short_description": "Cal2 3Cdef/PP",
         "specifications_doc": {
           "average": {
             "frequency_steps": 4,
@@ -340,20 +372,21 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
       },
       "Ingest": {
         "description": "Ingest all preprocessed dataproducts",
         "specifications_doc": {},
         "specifications_template": {
-          "name": "ingest"
-        },
-        "tags": []
+          "name": "ingest",
+          "version": 2
+        }
       },
       "Pipeline target1": {
-        "description": "Preprocessing Pipeline for Target Observation target1, SAP000",
+        "description": "Preprocessing Pipeline for Target Observation target1, SAP000, 120-168 MHz, 1s, 16ch/sb",
+        "short_description": "Paaa+01/TP",
         "specifications_doc": {
           "average": {
             "frequency_steps": 4,
@@ -373,12 +406,13 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
       },
       "Pipeline target2": {
-        "description": "Preprocessing Pipeline for Target Observation target2, SAP001",
+        "description": "Preprocessing Pipeline for Target Observation target2, SAP001, 120-168 MHz, 1s, 16ch/sb",
+        "short_description": "Paaa+02/TP",
         "specifications_doc": {
           "average": {
             "frequency_steps": 4,
@@ -398,12 +432,13 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
       },
       "Target Observation": {
-        "description": "Target Observation for UC1 HBA scheduling unit",
+        "description": "Target Observation for LoTSS scheduling unit. HBA_DUAL_INNER, 120-168 MHz, 1s, 64ch/sb ",
+        "short_description": "Paaa+01 & Paaa+02",
         "specifications_doc": {
           "QA": {
             "file_conversion": {
@@ -418,6 +453,11 @@
               "enabled": true
             }
           },
+          "correlator": {
+            "channels_per_subband": 64,
+            "integration_time": 1,
+            "storage_cluster": "CEP4"
+          },
           "duration": 28800,
           "station_configuration": {
             "SAPs": [
@@ -426,7 +466,7 @@
                   "angle1": 0.6624317181687094,
                   "angle2": 1.5579526427549426,
                   "direction_type": "J2000",
-                  "target": "PXXX+YY"
+                  "target": "Paaa+01"
                 },
                 "name": "sap1",
                 "subbands": [
@@ -680,7 +720,7 @@
                   "angle1": 0.6624317181687094,
                   "angle2": 1.5579526427549426,
                   "direction_type": "J2000",
-                  "target": "PXXX+YY"
+                  "target": "Paaa+02"
                 },
                 "name": "sap2",
                 "subbands": [
@@ -1007,21 +1047,16 @@
               "angle1": 0.6624317181687094,
               "angle2": 1.5579526427549426,
               "direction_type": "J2000",
-              "target": "PXXX+YY"
-            }
-          },
-          "correlator": {
-              "channels_per_subband": 64,
-              "integration_time": 1,
-              "storage_cluster": "CEP4"
+              "target": "Paaa+01Paaa+02REF"
             }
+          }
         },
         "specifications_template": {
-          "name": "target observation"
-        },
-        "tags": []
+          "name": "target observation",
+          "version": 2
+        }
       }
     }
   },
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_-_2_Beams-2.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_-_2_Beams-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..04623d0d63fe76732be5cc2db77d349ed1bc8523
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_-_2_Beams-2.json
@@ -0,0 +1,877 @@
+{
+  "description": "LBA Imaging Observing Strategy using 2 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each.",
+  "name": "IM LBA - 2 Beams",
+  "purpose": "technical_commissioning",
+  "scheduling_unit_template": {
+    "name": "scheduling unit",
+    "version": 2
+  },
+  "state": "development",
+  "template": {
+    "parameters": [
+      {
+        "name": "Scheduling Constraints",
+        "refs": [
+          "#/scheduling_constraints_doc"
+        ]
+      },
+      {
+        "name": "Duration",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/duration"
+        ]
+      },
+      {
+        "name": "Antenna Set",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/antenna_set"
+        ]
+      },
+      {
+        "name": "Filter",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/filter"
+        ]
+      },
+      {
+        "name": "Subbands",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/subbands",
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/subbands"
+        ]
+      },
+      {
+        "name": "Run ADDER QA",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
+          "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
+        ]
+      },
+      {
+        "name": "Observation description",
+        "refs": [
+          "#/tasks/Combined Observation/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline 1 description",
+        "refs": [
+          "#/tasks/Pipeline target1/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline 2 description",
+        "refs": [
+          "#/tasks/Pipeline target2/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline Calibrator description",
+        "refs": [
+          "#/tasks/Calibrator Pipeline/short_description"
+        ]
+      },
+      {
+        "name": "Target Pointing 1",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+        ]
+      },
+      {
+        "name": "Target Pointing 2",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+        ]
+      },
+      {
+        "name": "Calibrator Pointing",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
+        ]
+      },
+      {
+        "name": "Time averaging steps",
+        "refs": [
+          "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
+          "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
+          "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
+        ]
+      },
+      {
+        "name": "Time averaging steps demix",
+        "refs": [
+          "#/tasks/Pipeline target1/specifications_doc/demix/time_steps",
+          "#/tasks/Pipeline target2/specifications_doc/demix/time_steps",
+          "#/tasks/Calibrator Pipeline/specifications_doc/demix/time_steps"
+        ]
+      },
+      {
+        "name": "Frequency averaging steps",
+        "refs": [
+          "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
+          "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
+          "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
+        ]
+      },
+      {
+        "name": "Frequency averaging steps demix",
+        "refs": [
+          "#/tasks/Pipeline target1/specifications_doc/demix/frequency_steps",
+          "#/tasks/Pipeline target2/specifications_doc/demix/frequency_steps",
+          "#/tasks/Calibrator Pipeline/specifications_doc/demix/frequency_steps"
+        ]
+      },
+      {
+        "name": "Demix sources Pipeline Target 1",
+        "refs": [
+          "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+        ]
+      },
+      {
+        "name": "Demix sources Pipeline Target 2",
+        "refs": [
+          "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+        ]
+      },
+      {
+        "name": "Demix sources Pipeline Calibrator",
+        "refs": [
+          "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
+        ]
+      }
+    ],
+    "task_relations": [
+      {
+        "consumer": "Calibrator Pipeline",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {
+          "sap": [
+            "calibrator"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline target1",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {
+          "sap": [
+            "target1"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline target2",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {
+          "sap": [
+            "target2"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Calibrator Pipeline",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target1",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target2",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Calibrator Pipeline",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target1",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      }
+    ],
+    "task_scheduling_relations": [],
+    "tasks": {
+      "Calibrator Pipeline": {
+        "description": "Preprocessing Pipeline for Calibrator Observation",
+        "short_description": "3Cabc/1.0/CP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 16,
+            "time_steps": 4
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 8
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "LBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Cleanup": {
+        "description": "Cleaning up all output dataproducts for this scheduling unit",
+        "specifications_doc": {},
+        "specifications_template": {
+          "name": "cleanup",
+          "version": 2
+        }
+      },
+      "Combined Observation": {
+        "description": "Combined parallel Calibrator & Target Observation for LBA with 2 target beams",
+        "short_description": "_observation_name_",
+        "specifications_doc": {
+          "QA": {
+            "file_conversion": {
+              "enabled": true,
+              "nr_of_subbands": -1,
+              "nr_of_timestamps": 256
+            },
+            "inspection_plots": "msplots",
+            "plots": {
+              "autocorrelation": true,
+              "crosscorrelation": true,
+              "enabled": true
+            }
+          },
+          "calibrator": {
+            "autoselect": false,
+            "name": "calibrator",
+            "pointing": {
+              "angle1": 0.6624317181687094,
+              "angle2": 1.5579526427549426,
+              "direction_type": "J2000",
+              "target": "3Cabc"
+            }
+          },
+          "duration": 120,
+          "station_configuration": {
+            "SAPs": [
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "_target_1_name_"
+                },
+                "name": "target1",
+                "subbands": [
+                  177,
+                  178,
+                  179,
+                  180,
+                  181,
+                  182,
+                  183,
+                  184,
+                  185,
+                  186,
+                  187,
+                  188,
+                  189,
+                  190,
+                  191,
+                  192,
+                  193,
+                  194,
+                  195,
+                  196,
+                  197,
+                  198,
+                  199,
+                  200,
+                  201,
+                  202,
+                  203,
+                  204,
+                  205,
+                  206,
+                  207,
+                  208,
+                  209,
+                  210,
+                  211,
+                  212,
+                  213,
+                  214,
+                  215,
+                  216,
+                  217,
+                  218,
+                  219,
+                  220,
+                  221,
+                  222,
+                  223,
+                  224,
+                  225,
+                  226,
+                  227,
+                  228,
+                  229,
+                  230,
+                  231,
+                  232,
+                  233,
+                  234,
+                  235,
+                  236,
+                  237,
+                  238,
+                  239,
+                  240,
+                  241,
+                  242,
+                  243,
+                  244,
+                  245,
+                  246,
+                  247,
+                  248,
+                  249,
+                  250,
+                  251,
+                  252,
+                  253,
+                  254,
+                  255,
+                  256,
+                  257,
+                  258,
+                  259,
+                  260,
+                  261,
+                  262,
+                  263,
+                  264,
+                  265,
+                  266,
+                  267,
+                  268,
+                  269,
+                  270,
+                  271,
+                  272,
+                  273,
+                  274,
+                  275,
+                  276,
+                  277,
+                  278,
+                  279,
+                  280,
+                  281,
+                  282,
+                  283,
+                  284,
+                  285,
+                  286,
+                  287,
+                  288,
+                  289,
+                  290,
+                  291,
+                  292,
+                  293,
+                  294,
+                  295,
+                  296,
+                  297,
+                  298,
+                  299,
+                  300,
+                  301,
+                  302,
+                  303,
+                  304,
+                  305,
+                  306,
+                  307,
+                  308,
+                  309,
+                  310,
+                  311,
+                  312,
+                  313,
+                  314,
+                  315,
+                  316,
+                  317,
+                  318,
+                  319,
+                  320,
+                  321,
+                  322,
+                  323,
+                  324,
+                  325,
+                  326,
+                  327,
+                  328,
+                  329,
+                  330,
+                  331,
+                  332,
+                  333,
+                  334,
+                  335,
+                  336,
+                  337,
+                  338
+                ]
+              },
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "_target_2_name_"
+                },
+                "name": "target2",
+                "subbands": [
+                  177,
+                  178,
+                  179,
+                  180,
+                  181,
+                  182,
+                  183,
+                  184,
+                  185,
+                  186,
+                  187,
+                  188,
+                  189,
+                  190,
+                  191,
+                  192,
+                  193,
+                  194,
+                  195,
+                  196,
+                  197,
+                  198,
+                  199,
+                  200,
+                  201,
+                  202,
+                  203,
+                  204,
+                  205,
+                  206,
+                  207,
+                  208,
+                  209,
+                  210,
+                  211,
+                  212,
+                  213,
+                  214,
+                  215,
+                  216,
+                  217,
+                  218,
+                  219,
+                  220,
+                  221,
+                  222,
+                  223,
+                  224,
+                  225,
+                  226,
+                  227,
+                  228,
+                  229,
+                  230,
+                  231,
+                  232,
+                  233,
+                  234,
+                  235,
+                  236,
+                  237,
+                  238,
+                  239,
+                  240,
+                  241,
+                  242,
+                  243,
+                  244,
+                  245,
+                  246,
+                  247,
+                  248,
+                  249,
+                  250,
+                  251,
+                  252,
+                  253,
+                  254,
+                  255,
+                  256,
+                  257,
+                  258,
+                  259,
+                  260,
+                  261,
+                  262,
+                  263,
+                  264,
+                  265,
+                  266,
+                  267,
+                  268,
+                  269,
+                  270,
+                  271,
+                  272,
+                  273,
+                  274,
+                  275,
+                  276,
+                  277,
+                  278,
+                  279,
+                  280,
+                  281,
+                  282,
+                  283,
+                  284,
+                  285,
+                  286,
+                  287,
+                  288,
+                  289,
+                  290,
+                  291,
+                  292,
+                  293,
+                  294,
+                  295,
+                  296,
+                  297,
+                  298,
+                  299,
+                  300,
+                  301,
+                  302,
+                  303,
+                  304,
+                  305,
+                  306,
+                  307,
+                  308,
+                  309,
+                  310,
+                  311,
+                  312,
+                  313,
+                  314,
+                  315,
+                  316,
+                  317,
+                  318,
+                  319,
+                  320,
+                  321,
+                  322,
+                  323,
+                  324,
+                  325,
+                  326,
+                  327,
+                  328,
+                  329,
+                  330,
+                  331,
+                  332,
+                  333,
+                  334,
+                  335,
+                  336,
+                  337,
+                  338
+                ]
+              }
+            ],
+            "antenna_set": "LBA_OUTER",
+            "correlator": {
+              "channels_per_subband": 64,
+              "integration_time": 1,
+              "storage_cluster": "CEP4"
+            },
+            "filter": "LBA_30_90",
+            "station_groups": [
+              {
+                "max_nr_missing": 4,
+                "stations": [
+                  "CS001",
+                  "CS002",
+                  "CS003",
+                  "CS004",
+                  "CS005",
+                  "CS006",
+                  "CS007",
+                  "CS011",
+                  "CS013",
+                  "CS017",
+                  "CS021",
+                  "CS024",
+                  "CS026",
+                  "CS028",
+                  "CS030",
+                  "CS031",
+                  "CS032",
+                  "CS101",
+                  "CS103",
+                  "CS201",
+                  "CS301",
+                  "CS302",
+                  "CS401",
+                  "CS501",
+                  "RS106",
+                  "RS205",
+                  "RS208",
+                  "RS210",
+                  "RS305",
+                  "RS306",
+                  "RS307",
+                  "RS310",
+                  "RS406",
+                  "RS407",
+                  "RS409",
+                  "RS503",
+                  "RS508",
+                  "RS509"
+                ]
+              },
+              {
+                "max_nr_missing": 1,
+                "stations": [
+                  "RS508",
+                  "RS509"
+                ]
+              },
+              {
+                "max_nr_missing": 0,
+                "stations": [
+                  "RS310",
+                  "RS210"
+                ]
+              }
+            ]
+          }
+        },
+        "specifications_template": {
+          "name": "parallel calibrator target observation",
+          "version": 2
+        }
+      },
+      "Ingest": {
+        "description": "Ingest all preprocessed dataproducts",
+        "specifications_doc": {},
+        "specifications_template": {
+          "name": "ingest",
+          "version": 2
+        }
+      },
+      "Pipeline target1": {
+        "description": "Preprocessing Pipeline for Target Observation target1",
+        "short_description": "_target_1_name_/1.0/TP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 16,
+            "time_steps": 4
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 8
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "LBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Pipeline target2": {
+        "description": "Preprocessing Pipeline for Target Observation target2",
+        "short_description": "_target_2_name_/1.1/TP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 16,
+            "time_steps": 4
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 8
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "LBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      }
+    }
+  },
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_LoDSS_-_5_Beams-2.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_LoDSS_-_5_Beams-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..d33854e524a5b2d9666e4f05f4755b8616484bf2
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_LoDSS_-_5_Beams-2.json
@@ -0,0 +1,1115 @@
+{
+  "description": "LBA Imaging Observing Strategy using 5 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR Decametre Sky Survey. LBA Sparse Even, 14.4-30.1 MHz, 1s, 64ch/sb",
+  "name": "IM LBA LoDSS - 5 Beams",
+  "purpose": "technical_commissioning",
+  "scheduling_unit_template": {
+    "name": "scheduling unit",
+    "version": 2
+  },
+  "state": "development",
+  "template": {
+    "parameters": [
+      {
+        "name": "Scheduling Constraints",
+        "refs": [
+          "#/scheduling_constraints_doc"
+        ]
+      },
+      {
+        "name": "Duration",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/duration"
+        ]
+      },
+      {
+        "name": "Run ADDER QA",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
+          "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
+        ]
+      },
+      {
+        "name": "Observation description",
+        "refs": [
+          "#/tasks/Combined Observation/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline 1 description",
+        "refs": [
+          "#/tasks/Pipeline target1/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline 2 description",
+        "refs": [
+          "#/tasks/Pipeline target2/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline 3 description",
+        "refs": [
+          "#/tasks/Pipeline target3/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline 4 description",
+        "refs": [
+          "#/tasks/Pipeline target4/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline 5 description",
+        "refs": [
+          "#/tasks/Pipeline target5/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline Calibrator description",
+        "refs": [
+          "#/tasks/Calibrator Pipeline/short_description"
+        ]
+      },
+      {
+        "name": "Target Pointing 1",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
+        ]
+      },
+      {
+        "name": "Target Pointing 2",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/1/digital_pointing"
+        ]
+      },
+      {
+        "name": "Target Pointing 3",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/2/digital_pointing"
+        ]
+      },
+      {
+        "name": "Target Pointing 4",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/3/digital_pointing"
+        ]
+      },
+      {
+        "name": "Target Pointing 5",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/station_configuration/SAPs/4/digital_pointing"
+        ]
+      },
+      {
+        "name": "Calibrator Pointing",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
+        ]
+      },
+      {
+        "name": "Time averaging steps",
+        "refs": [
+          "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
+          "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
+          "#/tasks/Pipeline target3/specifications_doc/average/time_steps",
+          "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
+        ]
+      },
+      {
+        "name": "Frequency averaging steps",
+        "refs": [
+          "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
+          "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
+          "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps",
+          "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
+        ]
+      }
+    ],
+    "task_relations": [
+      {
+        "consumer": "Calibrator Pipeline",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {
+          "sap": [
+            "calibrator"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline target1",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {
+          "sap": [
+            "target1"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline target2",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {
+          "sap": [
+            "target2"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline target3",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {
+          "sap": [
+            "target3"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline target4",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {
+          "sap": [
+            "target4"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Pipeline target5",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {
+          "sap": [
+            "target5"
+          ]
+        },
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Calibrator Pipeline",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target1",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target2",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target3",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target4",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target5",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      }
+    ],
+    "task_scheduling_relations": [],
+    "tasks": {
+      "Calibrator Pipeline": {
+        "description": "Preprocessing Pipeline for Calibrator Observation",
+        "short_description": "3Cabc/1.0/CP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 1,
+            "time_steps": 1
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "LBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Combined Observation": {
+        "description": "Combined parallel Calibrator & Target Observation for LBA with 5 target beams",
+        "short_description": "oXXX Paaa+01 3Cabc",
+        "specifications_doc": {
+          "QA": {
+            "file_conversion": {
+              "enabled": true,
+              "nr_of_subbands": -1,
+              "nr_of_timestamps": 256
+            },
+            "inspection_plots": "msplots",
+            "plots": {
+              "autocorrelation": true,
+              "crosscorrelation": true,
+              "enabled": true
+            }
+          },
+          "calibrator": {
+            "autoselect": false,
+            "name": "calibrator",
+            "pointing": {
+              "angle1": 0.6624317181687094,
+              "angle2": 1.5579526427549426,
+              "direction_type": "J2000",
+              "target": "_calibrator_name_"
+            }
+          },
+          "correlator": {
+            "channels_per_subband": 64,
+            "integration_time": 1,
+            "storage_cluster": "CEP4"
+          },
+          "duration": 120,
+          "station_configuration": {
+            "SAPs": [
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "Paaa+01"
+                },
+                "name": "target1",
+                "subbands": [
+                  74,
+                  75,
+                  76,
+                  77,
+                  78,
+                  79,
+                  80,
+                  81,
+                  82,
+                  83,
+                  84,
+                  85,
+                  86,
+                  87,
+                  88,
+                  89,
+                  90,
+                  91,
+                  92,
+                  93,
+                  94,
+                  95,
+                  96,
+                  97,
+                  98,
+                  99,
+                  100,
+                  101,
+                  102,
+                  103,
+                  104,
+                  105,
+                  106,
+                  107,
+                  108,
+                  109,
+                  110,
+                  111,
+                  112,
+                  113,
+                  114,
+                  115,
+                  116,
+                  117,
+                  118,
+                  119,
+                  120,
+                  121,
+                  122,
+                  123,
+                  124,
+                  125,
+                  126,
+                  127,
+                  128,
+                  129,
+                  130,
+                  131,
+                  132,
+                  133,
+                  134,
+                  135,
+                  136,
+                  137,
+                  138,
+                  139,
+                  140,
+                  141,
+                  142,
+                  143,
+                  144,
+                  145,
+                  146,
+                  147,
+                  148,
+                  149,
+                  150,
+                  151,
+                  152,
+                  153,
+                  154
+                ]
+              },
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "Paaa+02"
+                },
+                "name": "target2",
+                "subbands": [
+                  74,
+                  75,
+                  76,
+                  77,
+                  78,
+                  79,
+                  80,
+                  81,
+                  82,
+                  83,
+                  84,
+                  85,
+                  86,
+                  87,
+                  88,
+                  89,
+                  90,
+                  91,
+                  92,
+                  93,
+                  94,
+                  95,
+                  96,
+                  97,
+                  98,
+                  99,
+                  100,
+                  101,
+                  102,
+                  103,
+                  104,
+                  105,
+                  106,
+                  107,
+                  108,
+                  109,
+                  110,
+                  111,
+                  112,
+                  113,
+                  114,
+                  115,
+                  116,
+                  117,
+                  118,
+                  119,
+                  120,
+                  121,
+                  122,
+                  123,
+                  124,
+                  125,
+                  126,
+                  127,
+                  128,
+                  129,
+                  130,
+                  131,
+                  132,
+                  133,
+                  134,
+                  135,
+                  136,
+                  137,
+                  138,
+                  139,
+                  140,
+                  141,
+                  142,
+                  143,
+                  144,
+                  145,
+                  146,
+                  147,
+                  148,
+                  149,
+                  150,
+                  151,
+                  152,
+                  153,
+                  154
+                ]
+              },
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "Paaa+03"
+                },
+                "name": "target3",
+                "subbands": [
+                  74,
+                  75,
+                  76,
+                  77,
+                  78,
+                  79,
+                  80,
+                  81,
+                  82,
+                  83,
+                  84,
+                  85,
+                  86,
+                  87,
+                  88,
+                  89,
+                  90,
+                  91,
+                  92,
+                  93,
+                  94,
+                  95,
+                  96,
+                  97,
+                  98,
+                  99,
+                  100,
+                  101,
+                  102,
+                  103,
+                  104,
+                  105,
+                  106,
+                  107,
+                  108,
+                  109,
+                  110,
+                  111,
+                  112,
+                  113,
+                  114,
+                  115,
+                  116,
+                  117,
+                  118,
+                  119,
+                  120,
+                  121,
+                  122,
+                  123,
+                  124,
+                  125,
+                  126,
+                  127,
+                  128,
+                  129,
+                  130,
+                  131,
+                  132,
+                  133,
+                  134,
+                  135,
+                  136,
+                  137,
+                  138,
+                  139,
+                  140,
+                  141,
+                  142,
+                  143,
+                  144,
+                  145,
+                  146,
+                  147,
+                  148,
+                  149,
+                  150,
+                  151,
+                  152,
+                  153,
+                  154
+                ]
+              },
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "Paaa+04"
+                },
+                "name": "target4",
+                "subbands": [
+                  74,
+                  75,
+                  76,
+                  77,
+                  78,
+                  79,
+                  80,
+                  81,
+                  82,
+                  83,
+                  84,
+                  85,
+                  86,
+                  87,
+                  88,
+                  89,
+                  90,
+                  91,
+                  92,
+                  93,
+                  94,
+                  95,
+                  96,
+                  97,
+                  98,
+                  99,
+                  100,
+                  101,
+                  102,
+                  103,
+                  104,
+                  105,
+                  106,
+                  107,
+                  108,
+                  109,
+                  110,
+                  111,
+                  112,
+                  113,
+                  114,
+                  115,
+                  116,
+                  117,
+                  118,
+                  119,
+                  120,
+                  121,
+                  122,
+                  123,
+                  124,
+                  125,
+                  126,
+                  127,
+                  128,
+                  129,
+                  130,
+                  131,
+                  132,
+                  133,
+                  134,
+                  135,
+                  136,
+                  137,
+                  138,
+                  139,
+                  140,
+                  141,
+                  142,
+                  143,
+                  144,
+                  145,
+                  146,
+                  147,
+                  148,
+                  149,
+                  150,
+                  151,
+                  152,
+                  153,
+                  154
+                ]
+              },
+              {
+                "digital_pointing": {
+                  "angle1": 0.6624317181687094,
+                  "angle2": 1.5579526427549426,
+                  "direction_type": "J2000",
+                  "target": "Paaa+05"
+                },
+                "name": "target5",
+                "subbands": [
+                  74,
+                  75,
+                  76,
+                  77,
+                  78,
+                  79,
+                  80,
+                  81,
+                  82,
+                  83,
+                  84,
+                  85,
+                  86,
+                  87,
+                  88,
+                  89,
+                  90,
+                  91,
+                  92,
+                  93,
+                  94,
+                  95,
+                  96,
+                  97,
+                  98,
+                  99,
+                  100,
+                  101,
+                  102,
+                  103,
+                  104,
+                  105,
+                  106,
+                  107,
+                  108,
+                  109,
+                  110,
+                  111,
+                  112,
+                  113,
+                  114,
+                  115,
+                  116,
+                  117,
+                  118,
+                  119,
+                  120,
+                  121,
+                  122,
+                  123,
+                  124,
+                  125,
+                  126,
+                  127,
+                  128,
+                  129,
+                  130,
+                  131,
+                  132,
+                  133,
+                  134,
+                  135,
+                  136,
+                  137,
+                  138,
+                  139,
+                  140,
+                  141,
+                  142,
+                  143,
+                  144,
+                  145,
+                  146,
+                  147,
+                  148,
+                  149,
+                  150,
+                  151,
+                  152,
+                  153,
+                  154
+                ]
+              }
+            ],
+            "antenna_set": "LBA_SPARSE_EVEN",
+            "filter": "LBA_10_90",
+            "station_groups": [
+              {
+                "max_nr_missing": 4,
+                "stations": [
+                  "CS001",
+                  "CS002",
+                  "CS003",
+                  "CS004",
+                  "CS005",
+                  "CS006",
+                  "CS007",
+                  "CS011",
+                  "CS013",
+                  "CS017",
+                  "CS021",
+                  "CS024",
+                  "CS026",
+                  "CS028",
+                  "CS030",
+                  "CS031",
+                  "CS032",
+                  "CS101",
+                  "CS103",
+                  "CS201",
+                  "CS301",
+                  "CS302",
+                  "CS401",
+                  "CS501",
+                  "RS106",
+                  "RS205",
+                  "RS208",
+                  "RS210",
+                  "RS305",
+                  "RS306",
+                  "RS307",
+                  "RS310",
+                  "RS406",
+                  "RS407",
+                  "RS409",
+                  "RS503",
+                  "RS508",
+                  "RS509"
+                ]
+              },
+              {
+                "max_nr_missing": 1,
+                "stations": [
+                  "RS508",
+                  "RS509"
+                ]
+              },
+              {
+                "max_nr_missing": 0,
+                "stations": [
+                  "RS310",
+                  "RS210"
+                ]
+              }
+            ]
+          }
+        },
+        "specifications_template": {
+          "name": "parallel calibrator target observation",
+          "version": 2
+        }
+      },
+      "Ingest": {
+        "description": "Ingest all preprocessed dataproducts",
+        "specifications_doc": {},
+        "specifications_template": {
+          "name": "ingest",
+          "version": 2
+        }
+      },
+      "Pipeline target1": {
+        "description": "Preprocessing Pipeline for Target Observation target1",
+        "short_description": "Paaa+01/1.0/PP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 1,
+            "time_steps": 1
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "LBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Pipeline target2": {
+        "description": "Preprocessing Pipeline for Target Observation target2",
+        "short_description": "Paaa+02/1.1/PP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 1,
+            "time_steps": 1
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "LBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Pipeline target3": {
+        "description": "Preprocessing Pipeline for Target Observation target3",
+        "short_description": "Paaa+03/1.2/PP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 1,
+            "time_steps": 1
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "LBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Pipeline target4": {
+        "description": "Preprocessing Pipeline for Target Observation target4",
+        "short_description": "Paaa+04/1.3/PP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 1,
+            "time_steps": 1
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "LBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Pipeline target5": {
+        "description": "Preprocessing Pipeline for Target Observation target5",
+        "short_description": "Paaa+05/1.4/PP",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 1,
+            "time_steps": 1
+          },
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": [],
+            "time_steps": 10
+          },
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "LBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      }
+    }
+  },
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_Survey_Strategy_-_3_Beams-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_Survey_-_3_Beams-2.json
similarity index 75%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_Survey_Strategy_-_3_Beams-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_Survey_-_3_Beams-2.json
index fcdcd777d0d1fbff097bcdbabb746c37f2d255a7..d450e8fd13bb85f3157b8aaec237a16e90cfead2 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_Survey_Strategy_-_3_Beams-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_Survey_-_3_Beams-2.json
@@ -1,12 +1,12 @@
 {
-  "description": "LBA Imaging Observing Strategy using 3 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR LBA Survey and LBA Co-Observing.",
-  "name": "IM LBA Survey Strategy - 3 Beams",
+  "description": "LBA Imaging Observing Strategy using 3 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR LBA High Survey and LBA Co-observing.",
+  "name": "IM LBA Survey - 3 Beams",
   "purpose": "technical_commissioning",
   "scheduling_unit_template": {
     "name": "scheduling unit",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "parameters": [
       {
@@ -15,6 +15,49 @@
           "#/scheduling_constraints_doc"
         ]
       },
+      {
+        "name": "Duration",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/duration"
+        ]
+      },
+      {
+        "name": "Run ADDER QA",
+        "refs": [
+          "#/tasks/Combined Observation/specifications_doc/QA/file_conversion/enabled",
+          "#/tasks/Combined Observation/specifications_doc/QA/plots/enabled"
+        ]
+      },
+      {
+        "name": "Observation description",
+        "refs": [
+          "#/tasks/Combined Observation/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline 1 description",
+        "refs": [
+          "#/tasks/Pipeline target1/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline 2 description",
+        "refs": [
+          "#/tasks/Pipeline target2/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline 3 description",
+        "refs": [
+          "#/tasks/Pipeline target3/short_description"
+        ]
+      },
+      {
+        "name": "Pipeline Calibrator description",
+        "refs": [
+          "#/tasks/Calibrator Pipeline/short_description"
+        ]
+      },
       {
         "name": "Target Pointing 1",
         "refs": [
@@ -63,18 +106,36 @@
           "#/tasks/Pipeline target1/specifications_doc/demix/sources"
         ]
       },
+      {
+        "name": "Demix ignore target Pipeline Target 1",
+        "refs": [
+          "#/tasks/Pipeline target1/specifications_doc/demix/ignore_target"
+        ]
+      },
       {
         "name": "Demix sources Pipeline Target 2",
         "refs": [
           "#/tasks/Pipeline target2/specifications_doc/demix/sources"
         ]
       },
+      {
+        "name": "Demix ignore target Pipeline Target 2",
+        "refs": [
+          "#/tasks/Pipeline target2/specifications_doc/demix/ignore_target"
+        ]
+      },
       {
         "name": "Demix sources Pipeline Target 3",
         "refs": [
           "#/tasks/Pipeline target3/specifications_doc/demix/sources"
         ]
       },
+      {
+        "name": "Demix ignore target Pipeline Target 3",
+        "refs": [
+          "#/tasks/Pipeline target3/specifications_doc/demix/ignore_target"
+        ]
+      },
       {
         "name": "Demix sources Pipeline Calibrator",
         "refs": [
@@ -82,6 +143,32 @@
         ]
       }
     ],
+    "scheduling_constraints_doc": {
+      "daily": {
+        "avoid_twilight": false,
+        "require_day": false,
+        "require_night": false
+      },
+      "sky": {
+        "min_distance": {
+          "jupiter": 0.26179938779,
+          "moon": 0.52359877559,
+          "sun": 0.52359877559
+        },
+        "min_elevation": {
+          "calibrator": 0.52359877559,
+          "target": 0.87266462599
+        },
+        "transit_offset": {
+          "from": -14400,
+          "to": 14400
+        }
+      }
+    },
+    "scheduling_constraints_template": {
+      "name": "constraints",
+      "version": 1
+    },
     "task_relations": [
       {
         "consumer": "Calibrator Pipeline",
@@ -101,7 +188,10 @@
             "calibrator"
           ]
         },
-        "selection_template": "SAP"
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
       },
       {
         "consumer": "Pipeline target1",
@@ -121,7 +211,10 @@
             "target1"
           ]
         },
-        "selection_template": "SAP"
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
       },
       {
         "consumer": "Pipeline target2",
@@ -141,7 +234,10 @@
             "target2"
           ]
         },
-        "selection_template": "SAP"
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
       },
       {
         "consumer": "Pipeline target3",
@@ -161,7 +257,10 @@
             "target3"
           ]
         },
-        "selection_template": "SAP"
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -177,7 +276,10 @@
         },
         "producer": "Calibrator Pipeline",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -193,7 +295,10 @@
         },
         "producer": "Pipeline target1",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -209,7 +314,10 @@
         },
         "producer": "Pipeline target2",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -225,13 +333,93 @@
         },
         "producer": "Pipeline target3",
         "selection_doc": {},
-        "selection_template": "all"
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
+        },
+        "producer": "Combined Observation",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target1",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target2",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
+      },
+      {
+        "consumer": "Cleanup",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Pipeline target3",
+        "selection_doc": {},
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       }
     ],
     "task_scheduling_relations": [],
     "tasks": {
       "Calibrator Pipeline": {
         "description": "Preprocessing Pipeline for Calibrator Observation",
+        "short_description": "c17 oOOO.O 3Cabc",
         "specifications_doc": {
           "average": {
             "frequency_steps": 8,
@@ -241,7 +429,7 @@
             "frequency_steps": 64,
             "ignore_target": false,
             "sources": [],
-            "time_steps": 12
+            "time_steps": 8
           },
           "flag": {
             "autocorrelations": true,
@@ -251,13 +439,35 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
+      },
+      "Cleanup": {
+        "description": "Clean up all dataproducts from disk after ingest",
+        "specifications_doc": {},
+        "specifications_template": {
+          "name": "cleanup",
+          "version": 2
         }
       },
       "Combined Observation": {
-        "description": "Combined parallel Calibrator & Target Observation for UC1 LBA scheduling unit",
+        "description": "Combined parallel Calibrator & Target Observation for LBA with 3 target beams",
+        "short_description": "OOO.O Paaa+01 Paaa+02 Paaa+03",
         "specifications_doc": {
-          "duration": 120,
+          "QA": {
+            "file_conversion": {
+              "enabled": true,
+              "nr_of_subbands": -1,
+              "nr_of_timestamps": 256
+            },
+            "inspection_plots": "msplots",
+            "plots": {
+              "autocorrelation": true,
+              "crosscorrelation": true,
+              "enabled": true
+            }
+          },
           "calibrator": {
             "autoselect": false,
             "name": "calibrator",
@@ -265,9 +475,15 @@
               "angle1": 0.6624317181687094,
               "angle2": 1.5579526427549426,
               "direction_type": "J2000",
-              "target": "calibrator"
+              "target": "3Cabc"
             }
           },
+          "correlator": {
+            "channels_per_subband": 64,
+            "integration_time": 1,
+            "storage_cluster": "CEP4"
+          },
+          "duration": 120,
           "station_configuration": {
             "SAPs": [
               {
@@ -275,7 +491,7 @@
                   "angle1": 0.6624317181687094,
                   "angle2": 1.5579526427549426,
                   "direction_type": "J2000",
-                  "target": "target1"
+                  "target": "Paaa+01"
                 },
                 "name": "target1",
                 "subbands": [
@@ -408,7 +624,7 @@
                   "angle1": 0.6624317181687094,
                   "angle2": 1.5579526427549426,
                   "direction_type": "J2000",
-                  "target": "target2"
+                  "target": "Paaa+02"
                 },
                 "name": "target2",
                 "subbands": [
@@ -541,7 +757,7 @@
                   "angle1": 0.6624317181687094,
                   "angle2": 1.5579526427549426,
                   "direction_type": "J2000",
-                  "target": "target3"
+                  "target": "Paaa+03"
                 },
                 "name": "target3",
                 "subbands": [
@@ -731,39 +947,24 @@
                 ]
               }
             ]
-          },
-          "QA": {
-              "file_conversion": {
-                "enabled": true,
-                "nr_of_subbands": -1,
-                "nr_of_timestamps": 256
-              },
-              "inspection_plots": "msplots",
-              "plots": {
-                "autocorrelation": true,
-                "crosscorrelation": true,
-                "enabled": true
-              }
-            },
-          "correlator": {
-              "channels_per_subband": 64,
-              "integration_time": 1,
-              "storage_cluster": "CEP4"
-            }
+          }
         },
         "specifications_template": {
-          "name": "parallel calibrator target observation"
+          "name": "parallel calibrator target observation",
+          "version": 2
         }
       },
       "Ingest": {
         "description": "Ingest all preprocessed dataproducts",
         "specifications_doc": {},
         "specifications_template": {
-          "name": "ingest"
+          "name": "ingest",
+          "version": 2
         }
       },
       "Pipeline target1": {
         "description": "Preprocessing Pipeline for Target Observation target1",
+        "short_description": "c17 oOOO.O Paaa+01",
         "specifications_doc": {
           "average": {
             "frequency_steps": 8,
@@ -773,7 +974,7 @@
             "frequency_steps": 64,
             "ignore_target": false,
             "sources": [],
-            "time_steps": 12
+            "time_steps": 8
           },
           "flag": {
             "autocorrelations": true,
@@ -783,11 +984,13 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
+          "name": "preprocessing pipeline",
+          "version": 2
         }
       },
       "Pipeline target2": {
         "description": "Preprocessing Pipeline for Target Observation target2",
+        "short_description": "c17 oOOO.O Paaa+02",
         "specifications_doc": {
           "average": {
             "frequency_steps": 8,
@@ -797,7 +1000,7 @@
             "frequency_steps": 64,
             "ignore_target": false,
             "sources": [],
-            "time_steps": 12
+            "time_steps": 8
           },
           "flag": {
             "autocorrelations": true,
@@ -807,11 +1010,13 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
+          "name": "preprocessing pipeline",
+          "version": 2
         }
       },
       "Pipeline target3": {
         "description": "Preprocessing Pipeline for Target Observation target3",
+        "short_description": "c17 oOOO.O Paaa+03",
         "specifications_doc": {
           "average": {
             "frequency_steps": 8,
@@ -821,7 +1026,7 @@
             "frequency_steps": 64,
             "ignore_target": false,
             "sources": [],
-            "time_steps": 12
+            "time_steps": 8
           },
           "flag": {
             "autocorrelations": true,
@@ -831,10 +1036,11 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
+          "name": "preprocessing pipeline",
+          "version": 2
         }
       }
     }
   },
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Responsive_Telescope_HBA_LoTSS-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_RT_HBA_LoTSS-2.json
similarity index 92%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Responsive_Telescope_HBA_LoTSS-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_RT_HBA_LoTSS-2.json
index 78d4ed2ba68b8bae85d56a7ffbe9ab912d529a3b..d4c95a9615364abf688ed0a55ca18c122016a2a0 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Responsive_Telescope_HBA_LoTSS-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_RT_HBA_LoTSS-2.json
@@ -1,12 +1,12 @@
 {
   "description": "This observation strategy template defines a similar observation strategy as for LoTSS, but then with a single Calibrator at the end so that the Target Observation can start immediately once the trigger is submitted.",
-  "name": "Responsive Telescope HBA LoTSS",
+  "name": "IM RT HBA LoTSS",
   "purpose": "technical_commissioning",
   "scheduling_unit_template": {
     "name": "scheduling unit",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "parameters": [
       {
@@ -48,19 +48,19 @@
       {
         "name": "Calibrator Name",
         "refs": [
-          "#/tasks/Calibrator Observation/specifications_doc/calibrator/name"
+          "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/name"
         ]
       },
       {
         "name": "Calibrator Pointing",
         "refs": [
-          "#/tasks/Calibrator Observation/specifications_doc/calibrator/pointing"
+          "#/tasks/Calibrator Observation 2/specifications_doc/calibrator/pointing"
         ]
       },
       {
         "name": "Calibrator Duration",
         "refs": [
-          "#/tasks/Calibrator Observation/specifications_doc/duration"
+          "#/tasks/Calibrator Observation 2/specifications_doc/duration"
         ]
       }
     ],
@@ -93,8 +93,10 @@
         },
         "producer": "Calibrator Observation",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Target Pipeline",
@@ -114,8 +116,10 @@
             "target1"
           ]
         },
-        "selection_template": "SAP",
-        "tags": []
+        "selection_template": {
+          "name": "SAP",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -131,8 +135,10 @@
         },
         "producer": "Calibrator Pipeline",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       },
       {
         "consumer": "Ingest",
@@ -148,8 +154,10 @@
         },
         "producer": "Target Pipeline",
         "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
+        "selection_template": {
+          "name": "all",
+          "version": 2
+        }
       }
     ],
     "task_scheduling_relations": [
@@ -164,7 +172,6 @@
       "Calibrator Observation": {
         "description": "Calibrator Observation after Target Observation",
         "specifications_doc": {
-          "duration": 600,
           "calibrator": {
             "autoselect": false,
             "name": "calibrator",
@@ -174,12 +181,13 @@
               "direction_type": "J2000",
               "target": "PXXX+YY"
             }
-          }
+          },
+          "duration": 600
         },
         "specifications_template": {
-          "name": "calibrator observation"
-        },
-        "tags": []
+          "name": "calibrator observation",
+          "version": 2
+        }
       },
       "Calibrator Pipeline": {
         "description": "Preprocessing Pipeline for Calibrator Observation",
@@ -202,17 +210,17 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
       },
       "Ingest": {
         "description": "Ingest all preprocessed dataproducts",
         "specifications_doc": {},
         "specifications_template": {
-          "name": "ingest"
-        },
-        "tags": []
+          "name": "ingest",
+          "version": 2
+        }
       },
       "Target Observation": {
         "description": "Target Observation",
@@ -230,6 +238,12 @@
               "enabled": true
             }
           },
+          "correlator": {
+            "channels_per_subband": 64,
+            "integration_time": 1,
+            "storage_cluster": "CEP4"
+          },
+          "duration": 7200,
           "station_configuration": {
             "SAPs": [
               {
@@ -541,18 +555,12 @@
               "direction_type": "J2000",
               "target": "PXXX+YY"
             }
-          },
-          "duration": 7200,
-          "correlator": {
-            "channels_per_subband": 64,
-            "integration_time": 1,
-            "storage_cluster": "CEP4"
           }
         },
         "specifications_template": {
-          "name": "target observation"
-        },
-        "tags": []
+          "name": "target observation",
+          "version": 2
+        }
       },
       "Target Pipeline": {
         "description": "Preprocessing Pipeline for Target Observation",
@@ -575,11 +583,11 @@
           "storagemanager": "dysco"
         },
         "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
+          "name": "preprocessing pipeline",
+          "version": 2
+        }
       }
     }
   },
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Observation_-_Pipeline_-_Ingest-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Observation_-_Pipeline_-_Ingest-1.json
deleted file mode 100644
index bd08a208e19bda3b198d64c256299475657f4110..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Observation_-_Pipeline_-_Ingest-1.json
+++ /dev/null
@@ -1,481 +0,0 @@
-{
-  "description": "This observation strategy template defines a short imaging Target Observation, Preprocessing Pipeline and Ingest.",
-  "name": "Short Test Observation - Pipeline - Ingest",
-  "purpose": "technical_commissioning",
-  "scheduling_unit_template": {
-    "name": "scheduling unit",
-    "version": 1
-  },
-  "state": "active",
-  "template": {
-    "parameters": [
-      {
-        "name": "Scheduling Constraints",
-        "refs": [
-          "#/scheduling_constraints_doc"
-        ]
-      },
-      {
-        "name": "Duration",
-        "refs": [
-          "#/tasks/Observation/specifications_doc/duration"
-        ]
-      },
-      {
-        "name": "Target Pointing",
-        "refs": [
-          "#/tasks/Observation/specifications_doc/station_configuration/SAPs/0/digital_pointing"
-        ]
-      },
-      {
-        "name": "Tile Beam",
-        "refs": [
-          "#/tasks/Observation/specifications_doc/station_configuration/tile_beam"
-        ]
-      }
-    ],
-    "scheduling_constraints_doc": {
-      "sky": {
-        "min_distance": {
-          "jupiter": 0,
-          "moon": 0,
-          "sun": 0
-        },
-        "min_elevation": {
-          "calibrator": 0.5,
-          "target": 0.1
-        },
-        "transit_offset": {
-          "from": -86400,
-          "to": 86400
-        }
-      }
-    },
-    "scheduling_constraints_template": {
-      "name": "constraints"
-    },
-    "task_relations": [
-      {
-        "consumer": "Pipeline",
-        "input": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "any"
-        },
-        "output": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "correlator"
-        },
-        "producer": "Observation",
-        "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
-      },
-      {
-        "consumer": "Ingest",
-        "input": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "any"
-        },
-        "output": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "any"
-        },
-        "producer": "Pipeline",
-        "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
-      },
-      {
-        "consumer": "Cleanup",
-        "input": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "any"
-        },
-        "output": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "correlator"
-        },
-        "producer": "Observation",
-        "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
-      },
-      {
-        "consumer": "Cleanup",
-        "input": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "any"
-        },
-        "output": {
-          "dataformat": "MeasurementSet",
-          "datatype": "visibilities",
-          "role": "any"
-        },
-        "producer": "Pipeline",
-        "selection_doc": {},
-        "selection_template": "all",
-        "tags": []
-      }
-    ],
-    "task_scheduling_relations": [],
-    "tasks": {
-      "Cleanup": {
-        "description": "Cleanup all dataproducts from disk",
-        "specifications_doc": {},
-        "specifications_template": {
-          "name": "cleanup"
-        },
-        "tags": []
-      },
-      "Ingest": {
-        "description": "Ingest the pipeline outputs dataproducts",
-        "specifications_doc": {},
-        "specifications_template": {
-          "name": "ingest"
-        },
-        "tags": []
-      },
-      "Observation": {
-        "description": "A simple short test observation",
-        "specifications_doc": {
-          "QA": {
-            "file_conversion": {
-              "enabled": true,
-              "nr_of_subbands": -1,
-              "nr_of_timestamps": 256
-            },
-            "inspection_plots": "msplots",
-            "plots": {
-              "autocorrelation": true,
-              "crosscorrelation": true,
-              "enabled": true
-            }
-          },
-          "station_configuration": {
-            "SAPs": [
-              {
-                "digital_pointing": {
-                  "angle1": 0.6624317181687094,
-                  "angle2": 1.5579526427549426,
-                  "direction_type": "J2000",
-                  "target": "target1"
-                },
-                "name": "Polaris",
-                "subbands": [
-                  0,
-                  1,
-                  2,
-                  3,
-                  4,
-                  5,
-                  6,
-                  7,
-                  8,
-                  9,
-                  10,
-                  11,
-                  12,
-                  13,
-                  14,
-                  15,
-                  16,
-                  17,
-                  18,
-                  19,
-                  20,
-                  21,
-                  22,
-                  23,
-                  24,
-                  25,
-                  26,
-                  27,
-                  28,
-                  29,
-                  30,
-                  31,
-                  32,
-                  33,
-                  34,
-                  35,
-                  36,
-                  37,
-                  38,
-                  39,
-                  40,
-                  41,
-                  42,
-                  43,
-                  44,
-                  45,
-                  46,
-                  47,
-                  48,
-                  49,
-                  50,
-                  51,
-                  52,
-                  53,
-                  54,
-                  55,
-                  56,
-                  57,
-                  58,
-                  59,
-                  60,
-                  61,
-                  62,
-                  63,
-                  64,
-                  65,
-                  66,
-                  67,
-                  68,
-                  69,
-                  70,
-                  71,
-                  72,
-                  73,
-                  74,
-                  75,
-                  76,
-                  77,
-                  78,
-                  79,
-                  80,
-                  81,
-                  82,
-                  83,
-                  84,
-                  85,
-                  86,
-                  87,
-                  88,
-                  89,
-                  90,
-                  91,
-                  92,
-                  93,
-                  94,
-                  95,
-                  96,
-                  97,
-                  98,
-                  99,
-                  100,
-                  101,
-                  102,
-                  103,
-                  104,
-                  105,
-                  106,
-                  107,
-                  108,
-                  109,
-                  110,
-                  111,
-                  112,
-                  113,
-                  114,
-                  115,
-                  116,
-                  117,
-                  118,
-                  119,
-                  120,
-                  121,
-                  122,
-                  123,
-                  124,
-                  125,
-                  126,
-                  127,
-                  128,
-                  129,
-                  130,
-                  131,
-                  132,
-                  133,
-                  134,
-                  135,
-                  136,
-                  137,
-                  138,
-                  139,
-                  140,
-                  141,
-                  142,
-                  143,
-                  144,
-                  145,
-                  146,
-                  147,
-                  148,
-                  149,
-                  150,
-                  151,
-                  152,
-                  153,
-                  154,
-                  155,
-                  156,
-                  157,
-                  158,
-                  159,
-                  160,
-                  161,
-                  162,
-                  163,
-                  164,
-                  165,
-                  166,
-                  167,
-                  168,
-                  169,
-                  170,
-                  171,
-                  172,
-                  173,
-                  174,
-                  175,
-                  176,
-                  177,
-                  178,
-                  179,
-                  180,
-                  181,
-                  182,
-                  183,
-                  184,
-                  185,
-                  186,
-                  187,
-                  188,
-                  189,
-                  190,
-                  191,
-                  192,
-                  193,
-                  194,
-                  195,
-                  196,
-                  197,
-                  198,
-                  199,
-                  200,
-                  201,
-                  202,
-                  203,
-                  204,
-                  205,
-                  206,
-                  207,
-                  208,
-                  209,
-                  210,
-                  211,
-                  212,
-                  213,
-                  214,
-                  215,
-                  216,
-                  217,
-                  218,
-                  219,
-                  220,
-                  221,
-                  222,
-                  223,
-                  224,
-                  225,
-                  226,
-                  227,
-                  228,
-                  229,
-                  230,
-                  231,
-                  232,
-                  233,
-                  234,
-                  235,
-                  236,
-                  237,
-                  238,
-                  239,
-                  240,
-                  241,
-                  242,
-                  243
-                ]
-              }
-            ],
-            "antenna_set": "HBA_DUAL_INNER",
-            "filter": "HBA_110_190",
-            "station_groups": [
-              {
-                "max_nr_missing": 1,
-                "stations": [
-                  "CS002",
-                  "CS003",
-                  "CS004",
-                  "CS005",
-                  "CS006",
-                  "CS007"
-                ]
-              }
-            ],
-            "tile_beam": {
-              "angle1": 0.6624317181687094,
-              "angle2": 1.5579526427549426,
-              "direction_type": "J2000",
-              "target": "target1"
-            }
-          },
-          "duration": 120,
-          "correlator": {
-              "channels_per_subband": 64,
-              "integration_time": 1,
-              "storage_cluster": "CEP4"
-            }
-        },
-        "specifications_template": {
-          "name": "target observation"
-        },
-        "tags": []
-      },
-      "Pipeline": {
-        "description": "Preprocessing Pipeline for the test observation",
-        "specifications_doc": {
-          "average": {
-            "frequency_steps": 4,
-            "time_steps": 1
-          },
-          "demix": {
-            "frequency_steps": 64,
-            "ignore_target": false,
-            "sources": [],
-            "time_steps": 10
-          },
-          "flag": {
-            "autocorrelations": true,
-            "outerchannels": true,
-            "rfi_strategy": "HBAdefault"
-          },
-          "storagemanager": "dysco"
-        },
-        "specifications_template": {
-          "name": "preprocessing pipeline"
-        },
-        "tags": []
-      }
-    }
-  },
-  "version": 1
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Beamforming_Observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Beamforming_Observation-2.json
similarity index 99%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Beamforming_Observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Beamforming_Observation-2.json
index f6e90d92d2d0b366724237d0f8f965c772468a7d..e718533548abeaf133a4d6ae0643e0adafd4081b 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Beamforming_Observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Beamforming_Observation-2.json
@@ -4,9 +4,9 @@
   "purpose": "technical_commissioning",
   "scheduling_unit_template": {
     "name": "scheduling unit",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "parameters": [
       {
@@ -57,7 +57,8 @@
       }
     },
     "scheduling_constraints_template": {
-      "name": "constraints"
+      "name": "constraints",
+      "version": 1
     },
     "task_relations": [],
     "task_scheduling_relations": [],
@@ -65,287 +66,6 @@
       "Observation": {
         "description": "A simple short test beamforming observation",
         "specifications_doc": {
-          "station_configuration": {
-            "SAPs": [
-              {
-                "digital_pointing": {
-                  "angle1": 0.92934186635,
-                  "angle2": 0.952579228492,
-                  "direction_type": "J2000",
-                  "target": "target1"
-                },
-                "name": "B0329+54",
-                "subbands": [
-                  0,
-                  1,
-                  2,
-                  3,
-                  4,
-                  5,
-                  6,
-                  7,
-                  8,
-                  9,
-                  10,
-                  11,
-                  12,
-                  13,
-                  14,
-                  15,
-                  16,
-                  17,
-                  18,
-                  19,
-                  20,
-                  21,
-                  22,
-                  23,
-                  24,
-                  25,
-                  26,
-                  27,
-                  28,
-                  29,
-                  30,
-                  31,
-                  32,
-                  33,
-                  34,
-                  35,
-                  36,
-                  37,
-                  38,
-                  39,
-                  40,
-                  41,
-                  42,
-                  43,
-                  44,
-                  45,
-                  46,
-                  47,
-                  48,
-                  49,
-                  50,
-                  51,
-                  52,
-                  53,
-                  54,
-                  55,
-                  56,
-                  57,
-                  58,
-                  59,
-                  60,
-                  61,
-                  62,
-                  63,
-                  64,
-                  65,
-                  66,
-                  67,
-                  68,
-                  69,
-                  70,
-                  71,
-                  72,
-                  73,
-                  74,
-                  75,
-                  76,
-                  77,
-                  78,
-                  79,
-                  80,
-                  81,
-                  82,
-                  83,
-                  84,
-                  85,
-                  86,
-                  87,
-                  88,
-                  89,
-                  90,
-                  91,
-                  92,
-                  93,
-                  94,
-                  95,
-                  96,
-                  97,
-                  98,
-                  99,
-                  100,
-                  101,
-                  102,
-                  103,
-                  104,
-                  105,
-                  106,
-                  107,
-                  108,
-                  109,
-                  110,
-                  111,
-                  112,
-                  113,
-                  114,
-                  115,
-                  116,
-                  117,
-                  118,
-                  119,
-                  120,
-                  121,
-                  122,
-                  123,
-                  124,
-                  125,
-                  126,
-                  127,
-                  128,
-                  129,
-                  130,
-                  131,
-                  132,
-                  133,
-                  134,
-                  135,
-                  136,
-                  137,
-                  138,
-                  139,
-                  140,
-                  141,
-                  142,
-                  143,
-                  144,
-                  145,
-                  146,
-                  147,
-                  148,
-                  149,
-                  150,
-                  151,
-                  152,
-                  153,
-                  154,
-                  155,
-                  156,
-                  157,
-                  158,
-                  159,
-                  160,
-                  161,
-                  162,
-                  163,
-                  164,
-                  165,
-                  166,
-                  167,
-                  168,
-                  169,
-                  170,
-                  171,
-                  172,
-                  173,
-                  174,
-                  175,
-                  176,
-                  177,
-                  178,
-                  179,
-                  180,
-                  181,
-                  182,
-                  183,
-                  184,
-                  185,
-                  186,
-                  187,
-                  188,
-                  189,
-                  190,
-                  191,
-                  192,
-                  193,
-                  194,
-                  195,
-                  196,
-                  197,
-                  198,
-                  199,
-                  200,
-                  201,
-                  202,
-                  203,
-                  204,
-                  205,
-                  206,
-                  207,
-                  208,
-                  209,
-                  210,
-                  211,
-                  212,
-                  213,
-                  214,
-                  215,
-                  216,
-                  217,
-                  218,
-                  219,
-                  220,
-                  221,
-                  222,
-                  223,
-                  224,
-                  225,
-                  226,
-                  227,
-                  228,
-                  229,
-                  230,
-                  231,
-                  232,
-                  233,
-                  234,
-                  235,
-                  236,
-                  237,
-                  238,
-                  239,
-                  240,
-                  241,
-                  242,
-                  243
-                ]
-              }
-            ],
-            "antenna_set": "HBA_DUAL_INNER",
-            "filter": "HBA_110_190",
-            "station_groups": [
-              {
-                "max_nr_missing": 1,
-                "stations": [
-                  "CS002",
-                  "CS003",
-                  "CS004",
-                  "CS005",
-                  "CS006",
-                  "CS007"
-                ]
-              }
-            ],
-            "tile_beam": {
-              "angle1": 0.92934186635,
-              "angle2": 0.952579228492,
-              "direction_type": "J2000",
-              "target": "target1"
-            }
-          },
-          "duration": 120,
           "beamformer": {
             "pipelines": [
               {
@@ -678,15 +398,296 @@
                 ]
               }
             ],
-            "ppf": false
+            "ppf": false
+          },
+          "duration": 120,
+          "station_configuration": {
+            "SAPs": [
+              {
+                "digital_pointing": {
+                  "angle1": 0.92934186635,
+                  "angle2": 0.952579228492,
+                  "direction_type": "J2000",
+                  "target": "target1"
+                },
+                "name": "B0329+54",
+                "subbands": [
+                  0,
+                  1,
+                  2,
+                  3,
+                  4,
+                  5,
+                  6,
+                  7,
+                  8,
+                  9,
+                  10,
+                  11,
+                  12,
+                  13,
+                  14,
+                  15,
+                  16,
+                  17,
+                  18,
+                  19,
+                  20,
+                  21,
+                  22,
+                  23,
+                  24,
+                  25,
+                  26,
+                  27,
+                  28,
+                  29,
+                  30,
+                  31,
+                  32,
+                  33,
+                  34,
+                  35,
+                  36,
+                  37,
+                  38,
+                  39,
+                  40,
+                  41,
+                  42,
+                  43,
+                  44,
+                  45,
+                  46,
+                  47,
+                  48,
+                  49,
+                  50,
+                  51,
+                  52,
+                  53,
+                  54,
+                  55,
+                  56,
+                  57,
+                  58,
+                  59,
+                  60,
+                  61,
+                  62,
+                  63,
+                  64,
+                  65,
+                  66,
+                  67,
+                  68,
+                  69,
+                  70,
+                  71,
+                  72,
+                  73,
+                  74,
+                  75,
+                  76,
+                  77,
+                  78,
+                  79,
+                  80,
+                  81,
+                  82,
+                  83,
+                  84,
+                  85,
+                  86,
+                  87,
+                  88,
+                  89,
+                  90,
+                  91,
+                  92,
+                  93,
+                  94,
+                  95,
+                  96,
+                  97,
+                  98,
+                  99,
+                  100,
+                  101,
+                  102,
+                  103,
+                  104,
+                  105,
+                  106,
+                  107,
+                  108,
+                  109,
+                  110,
+                  111,
+                  112,
+                  113,
+                  114,
+                  115,
+                  116,
+                  117,
+                  118,
+                  119,
+                  120,
+                  121,
+                  122,
+                  123,
+                  124,
+                  125,
+                  126,
+                  127,
+                  128,
+                  129,
+                  130,
+                  131,
+                  132,
+                  133,
+                  134,
+                  135,
+                  136,
+                  137,
+                  138,
+                  139,
+                  140,
+                  141,
+                  142,
+                  143,
+                  144,
+                  145,
+                  146,
+                  147,
+                  148,
+                  149,
+                  150,
+                  151,
+                  152,
+                  153,
+                  154,
+                  155,
+                  156,
+                  157,
+                  158,
+                  159,
+                  160,
+                  161,
+                  162,
+                  163,
+                  164,
+                  165,
+                  166,
+                  167,
+                  168,
+                  169,
+                  170,
+                  171,
+                  172,
+                  173,
+                  174,
+                  175,
+                  176,
+                  177,
+                  178,
+                  179,
+                  180,
+                  181,
+                  182,
+                  183,
+                  184,
+                  185,
+                  186,
+                  187,
+                  188,
+                  189,
+                  190,
+                  191,
+                  192,
+                  193,
+                  194,
+                  195,
+                  196,
+                  197,
+                  198,
+                  199,
+                  200,
+                  201,
+                  202,
+                  203,
+                  204,
+                  205,
+                  206,
+                  207,
+                  208,
+                  209,
+                  210,
+                  211,
+                  212,
+                  213,
+                  214,
+                  215,
+                  216,
+                  217,
+                  218,
+                  219,
+                  220,
+                  221,
+                  222,
+                  223,
+                  224,
+                  225,
+                  226,
+                  227,
+                  228,
+                  229,
+                  230,
+                  231,
+                  232,
+                  233,
+                  234,
+                  235,
+                  236,
+                  237,
+                  238,
+                  239,
+                  240,
+                  241,
+                  242,
+                  243
+                ]
+              }
+            ],
+            "antenna_set": "HBA_DUAL_INNER",
+            "filter": "HBA_110_190",
+            "station_groups": [
+              {
+                "max_nr_missing": 1,
+                "stations": [
+                  "CS002",
+                  "CS003",
+                  "CS004",
+                  "CS005",
+                  "CS006",
+                  "CS007"
+                ]
+              }
+            ],
+            "tile_beam": {
+              "angle1": 0.92934186635,
+              "angle2": 0.952579228492,
+              "direction_type": "J2000",
+              "target": "target1"
+            }
           }
         },
         "specifications_template": {
-          "name": "beamforming observation"
-        },
-        "tags": []
+          "name": "beamforming observation",
+          "version": 2
+        }
       }
     }
   },
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Observation-2.json
similarity index 98%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Observation-2.json
index fc7afe8e72ffdb00cc8870b3ef419808996a4a9f..d085563d0b8bfbc0bfdc34a8a68ac365bdc2151e 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Observation-2.json
@@ -4,9 +4,9 @@
   "purpose": "technical_commissioning",
   "scheduling_unit_template": {
     "name": "scheduling unit",
-    "version": 1
+    "version": 2
   },
-  "state": "active",
+  "state": "development",
   "template": {
     "parameters": [
       {
@@ -73,6 +73,12 @@
               "enabled": true
             }
           },
+          "correlator": {
+            "channels_per_subband": 64,
+            "integration_time": 1,
+            "storage_cluster": "CEP4"
+          },
+          "duration": 120,
           "station_configuration": {
             "SAPs": [
               {
@@ -352,20 +358,14 @@
               "direction_type": "J2000",
               "target": "target1"
             }
-          },
-          "duration": 120,
-          "correlator": {
-            "channels_per_subband": 64,
-            "integration_time": 1,
-            "storage_cluster": "CEP4"
           }
         },
         "specifications_template": {
-          "name": "target observation"
-        },
-        "tags": []
+          "name": "target observation",
+          "version": 2
+        }
       }
     }
   },
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template/scheduling_unit-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template/scheduling_unit-2.json
similarity index 78%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template/scheduling_unit-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template/scheduling_unit-2.json
index a33531f4e35cd142b33fe52ff68925194d528622..f9561029ad4c3ea352f5eb69d8bbaef4a76e7d23 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template/scheduling_unit-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template/scheduling_unit-2.json
@@ -3,9 +3,29 @@
   "name": "scheduling unit",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/schedulingunittemplate/scheduling%20unit/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/schedulingunittemplate/scheduling%20unit/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
+    "definitions": {
+      "template_reference": {
+        "description": "Name and version of a referenced template",
+        "properties": {
+          "name": {
+            "minLength": 1,
+            "type": "string"
+          },
+          "version": {
+            "default": 1,
+            "minimum": 1,
+            "type": "integer"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "type": "object"
+      }
+    },
     "description": "This schema defines the structure of all tasks in a scheduling unit",
     "patternProperties": {
       "^[$]schema$": {}
@@ -60,25 +80,13 @@
         "type": "object"
       },
       "scheduling_constraints_template": {
-        "default": {},
-        "description": "Name and version of Scheduling Constraints Template which defines the json schema for the scheduling_constraints_doc",
-        "properties": {
-          "name": {
-            "default": "constraints",
-            "minLength": 1,
-            "type": "string"
-          },
-          "version": {
-            "default": 1,
-            "minimum": 1,
-            "type": "integer"
-          }
+        "$ref": "#/definitions/template_reference",
+        "default": {
+          "name": "constraints",
+          "version": 1
         },
-        "required": [
-          "name"
-        ],
-        "title": "Scheduling Constraints Template",
-        "type": "object"
+        "description": "Name and version of Scheduling Constraints Template which defines the json schema for the scheduling_constraints_doc",
+        "title": "Scheduling Constraints Template"
       },
       "task_relations": {
         "additionalItems": false,
@@ -94,12 +102,12 @@
               "type": "string"
             },
             "input": {
-              "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/tasks/1/#/definitions/task_connector",
+              "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/tasks/2/#/definitions/task_connector",
               "default": {},
               "title": "Input I/O Connector"
             },
             "output": {
-              "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/tasks/1/#/definitions/task_connector",
+              "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/tasks/2/#/definitions/task_connector",
               "default": {},
               "title": "Output I/O Connector"
             },
@@ -115,18 +123,12 @@
               "type": "object"
             },
             "selection_template": {
-              "title": "URI of Template for Selection",
-              "type": "string"
-            },
-            "tags": {
-              "addtionalItems": false,
-              "default": [],
-              "items": {
-                "title": "Tag",
-                "type": "string"
+              "$ref": "#/definitions/template_reference",
+              "default": {
+                "name": "constraints",
+                "version": 1
               },
-              "type": "array",
-              "uniqueItems": true
+              "title": "Selection Template"
             }
           },
           "required": [
@@ -169,7 +171,7 @@
               "type": "string"
             },
             "time_offset": {
-              "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+              "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
               "default": 60,
               "description": "Distance between first and second task (in seconds)",
               "minimum": 60,
@@ -212,35 +214,13 @@
               "type": "object"
             },
             "specifications_template": {
-              "default": {},
-              "description": "The task specifications template used for the specifications_doc",
-              "properties": {
-                "name": {
-                  "default": "_specifications_template_URL_",
-                  "minLength": 1,
-                  "type": "string"
-                },
-                "version": {
-                  "default": 1,
-                  "minimum": 1,
-                  "type": "integer"
-                }
-              },
-              "required": [
-                "name"
-              ],
-              "title": "Task Specifications Template",
-              "type": "object"
-            },
-            "tags": {
-              "addtionalItems": false,
-              "default": [],
-              "items": {
-                "title": "Tag",
-                "type": "string"
+              "$ref": "#/definitions/template_reference",
+              "default": {
+                "name": "_task_template_name",
+                "version": 1
               },
-              "type": "array",
-              "uniqueItems": true
+              "description": "The task specifications template used for the specifications_doc",
+              "title": "Task Specifications Template"
             }
           },
           "required": [
@@ -258,8 +238,8 @@
     },
     "title": "scheduling unit",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/empty-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/empty-2.json
similarity index 76%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/empty-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/empty-2.json
index d0fa675c52a16cf3fc601b0f445f9492058c1449..96628e65622e35f4662ea41b872009a0759b4526 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/empty-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/empty-2.json
@@ -3,7 +3,7 @@
   "name": "empty",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/subtaskfeedbacktemplate/empty/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/subtaskfeedbacktemplate/empty/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "empty",
@@ -13,8 +13,8 @@
     "properties": {},
     "title": "empty",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/observation-2.json
similarity index 64%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/observation-2.json
index bd7ba06ad0c3e37a948aba076ad3245f1efc8210..dc10adbe9a9378b532d7f4f6811ce6e9d8b7d32b 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_feedback_template/observation-2.json
@@ -3,7 +3,7 @@
   "name": "observation",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/subtaskfeedbacktemplate/observation/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/subtaskfeedbacktemplate/observation/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -14,14 +14,16 @@
     "properties": {
       "on_sky": {
         "additionalProperties": false,
-        "default": [],
+        "default": {},
         "description": "When the observation was observing.",
         "properties": {
           "start_time": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp"
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timestamp",
+            "default": "1970-01-01T00:00:00Z"
           },
           "stop_time": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp"
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timestamp",
+            "default": "1970-01-01T00:00:00Z"
           }
         },
         "required": [
@@ -37,8 +39,8 @@
     ],
     "title": "observation",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/cleanup/cleanup-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/cleanup/cleanup-2.json
similarity index 83%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/cleanup/cleanup-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/cleanup/cleanup-2.json
index a2cdb1172d64fb6cba8286631e7bd566a4f38965..69b881d59903b6e4bad6f995172435beaa064149 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/cleanup/cleanup-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/cleanup/cleanup-2.json
@@ -3,7 +3,7 @@
   "name": "cleanup",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/cleanup/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/subtasktemplate/cleanup/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters to setup and control a dataproducts cleanup subtask.",
@@ -14,8 +14,8 @@
     "required": [],
     "title": "cleanup",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/ingest/ingest_control-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/ingest/ingest_control-2.json
similarity index 82%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/ingest/ingest_control-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/ingest/ingest_control-2.json
index e91cf9239c26db51d6257e62f765dbe150a11289..952d8698effeaf95fc2a5b5d06a617176d9d7c6a 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/ingest/ingest_control-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/ingest/ingest_control-2.json
@@ -3,7 +3,7 @@
   "name": "ingest control",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/ingest%20control/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/subtasktemplate/ingest%20control/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters to setup and control an ingest subtask.",
@@ -14,8 +14,8 @@
     "required": [],
     "title": "ingest control",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/observation/observation_control-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/observation/observation_control-2.json
similarity index 92%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/observation/observation_control-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/observation/observation_control-2.json
index 3f5b022f70007821f5a7dcb3dee09cef0965b5a9..0d27b92400fd59004921f5f98a74da36fd2c9d31 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/observation/observation_control-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/observation/observation_control-2.json
@@ -3,7 +3,7 @@
   "name": "observation control",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/observation%20control/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/subtasktemplate/observation%20control/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -34,12 +34,12 @@
                   "headerTemplate": "Pipeline {{ self.index }}",
                   "properties": {
                     "coherent": {
-                      "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
+                      "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/beamforming/2#/definitions/stokes_settings",
                       "default": {},
                       "title": "Coherent Stokes Settings"
                     },
                     "stations": {
-                      "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/station_list",
+                      "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/station_list",
                       "default": [],
                       "description": "Stations to (flys eye) beam form. This can be a subset of the obervation stations."
                     }
@@ -111,7 +111,7 @@
                                   "type": "boolean"
                                 },
                                 "pointing": {
-                                  "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+                                  "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pointing/2/#/definitions/pointing",
                                   "description": "Pointing for coherent beam",
                                   "title": "Pointing"
                                 }
@@ -137,15 +137,15 @@
                       "type": "array"
                     },
                     "coherent": {
-                      "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
+                      "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/beamforming/2#/definitions/stokes_settings",
                       "title": "Coherent Stokes Settings"
                     },
                     "incoherent": {
-                      "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
+                      "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/beamforming/2#/definitions/stokes_settings",
                       "title": "Incoherent Stokes Settings"
                     },
                     "stations": {
-                      "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/station_list",
+                      "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/station_list",
                       "default": [],
                       "description": "Stations to beam form. This can be a subset of the obervation stations.",
                       "minItems": 0
@@ -443,7 +443,7 @@
         "default": {},
         "properties": {
           "inspection_plots": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/inspection_plots",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/QA/2#/definitions/inspection_plots",
             "default": "msplots"
           }
         },
@@ -455,13 +455,13 @@
         "default": {},
         "properties": {
           "analog_pointing": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pointing/2/#/definitions/pointing",
             "default": {},
             "description": "HBA only",
             "title": "Analog pointing"
           },
           "antenna_set": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/antenna_set",
             "default": "HBA_DUAL"
           },
           "digital_pointings": {
@@ -481,7 +481,7 @@
                   "type": "string"
                 },
                 "pointing": {
-                  "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+                  "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pointing/2/#/definitions/pointing",
                   "default": {},
                   "title": "Digital pointing"
                 },
@@ -512,11 +512,11 @@
             "type": "array"
           },
           "filter": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/filter",
             "default": "HBA_110_190"
           },
           "station_list": {
-            "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/station_list",
+            "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2/#/definitions/station_list",
             "default": [
               "CS001"
             ]
@@ -536,8 +536,8 @@
     ],
     "title": "observation control",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/preprocessing_pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/preprocessing_pipeline-2.json
similarity index 95%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/preprocessing_pipeline-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/preprocessing_pipeline-2.json
index 6157c304978ceb8a76dfde1874136c711226d437..f7176766b53e6f66307ccba23fdf4ba9cdbb1140 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/preprocessing_pipeline-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/preprocessing_pipeline-2.json
@@ -3,7 +3,7 @@
   "name": "preprocessing pipeline",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/preprocessing%20pipeline/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/subtasktemplate/preprocessing%20pipeline/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters to setup and control a preprocessing pipeline subtask.",
@@ -38,7 +38,7 @@
         "type": "object"
       },
       "cluster_resources": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pipeline/1#/definitions/cluster_resources",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pipeline/2#/definitions/cluster_resources",
         "default": {}
       },
       "demixer": {
@@ -188,8 +188,8 @@
     "required": [],
     "title": "preprocessing pipeline",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/pulsar_pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/pulsar_pipeline-2.json
similarity index 95%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/pulsar_pipeline-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/pulsar_pipeline-2.json
index 2eb12888765fceab265376d476019f83cd00ca46..f2110a5b72fc52c0393e04b4883129958fcbbea9 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/pulsar_pipeline-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/pulsar_pipeline-2.json
@@ -3,7 +3,7 @@
   "name": "pulsar pipeline",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/pulsar%20pipeline/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/subtasktemplate/pulsar%20pipeline/2#",
     "$schema": "http://json-schema.org/draft-07/schema#",
     "additionalProperties": false,
     "description": "<no description>",
@@ -12,7 +12,7 @@
     },
     "properties": {
       "cluster_resources": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pipeline/1#/definitions/cluster_resources",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pipeline/2#/definitions/cluster_resources",
         "default": {}
       },
       "dspsr": {
@@ -189,8 +189,8 @@
     ],
     "title": "pulsar pipeline",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_files/QA_file_conversion-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_files/QA_file_conversion-2.json
similarity index 72%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_files/QA_file_conversion-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_files/QA_file_conversion-2.json
index 8001aaed0ff08045704708a3727b1c52db5b6382..954d1148a52303c9844c435221461638cf8e88c7 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_files/QA_file_conversion-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_files/QA_file_conversion-2.json
@@ -3,7 +3,7 @@
   "name": "QA file conversion",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/QA%20file%20conversion/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/subtasktemplate/QA%20file%20conversion/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters to setup and control the QA file creation subtask.",
@@ -12,14 +12,14 @@
     },
     "properties": {
       "file_conversion": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1/#/definitions/file_conversion",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/QA/2/#/definitions/file_conversion",
         "default": {}
       }
     },
     "title": "QA file conversion",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_plots/QA_plots-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_plots/QA_plots-2.json
similarity index 73%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_plots/QA_plots-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_plots/QA_plots-2.json
index ef394602d1a14e14196740b1952685311b52c75d..f5f72fbd50f7130115bbbcecd87d5ee69b8ff2a3 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_plots/QA_plots-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_plots/QA_plots-2.json
@@ -3,7 +3,7 @@
   "name": "QA plots",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/QA%20plots/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/subtasktemplate/QA%20plots/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters to setup and control the QA plotting subtask.",
@@ -12,14 +12,14 @@
     },
     "properties": {
       "plots": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1/#/definitions/plots",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/QA/2/#/definitions/plots",
         "default": {}
       }
     },
     "title": "QA plots",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/system_event_template/affectedhardware-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/system_event_template/affectedhardware-2.json
similarity index 82%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/system_event_template/affectedhardware-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/system_event_template/affectedhardware-2.json
index bf64f3a6955c390454893bef3057e8f216ca967a..a3e631d265f3b70bbea676748b8f7e8088ee1afa 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/system_event_template/affectedhardware-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/system_event_template/affectedhardware-2.json
@@ -3,7 +3,7 @@
   "name": "affectedhardware",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/systemeventtemplate/affectedhardware/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/systemeventtemplate/affectedhardware/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the hardware that was affected by a system event.",
@@ -30,7 +30,7 @@
         "uniqueItems": true
       },
       "stations": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/stations/2#/definitions/station_list",
         "default": [],
         "description": "List of stations",
         "title": "Stations"
@@ -39,8 +39,8 @@
     "required": [],
     "title": "affectedhardware",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/SAP-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/SAP-2.json
similarity index 85%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/SAP-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/SAP-2.json
index 906c073fee0b0797a15ac780a45f0a9cf77ed48a..8372ef9253c9a98db3ca2af751a0a812197641a3 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/SAP-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/SAP-2.json
@@ -3,7 +3,7 @@
   "name": "SAP",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/taskrelationselectiontemplate/SAP/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/taskrelationselectiontemplate/SAP/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This task relation selection schema defines the select by SAP parameter.",
@@ -24,8 +24,8 @@
     },
     "title": "SAP",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/all-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/all-2.json
similarity index 81%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/all-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/all-2.json
index 656d78f12ecccd1dd86d99e971c0d216575b0ffd..365659993438ca7b4da0736479becfe73f884382 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/all-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/all-2.json
@@ -3,7 +3,7 @@
   "name": "all",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/taskrelationselectiontemplate/all/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/taskrelationselectiontemplate/all/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This task relation selection schema defines no restrictions, and hence selects 'all'.",
@@ -13,8 +13,8 @@
     "properties": {},
     "title": "all",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/cleanup/cleanup-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/cleanup/cleanup-2.json
similarity index 83%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/cleanup/cleanup-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/cleanup/cleanup-2.json
index f41077eb66d24df20d66e85653e4ca98ebbc5876..9c5be2719e0715d02c1bac63c02558e543e85920 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/cleanup/cleanup-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/cleanup/cleanup-2.json
@@ -3,7 +3,7 @@
   "name": "cleanup",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/cleanup/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/tasktemplate/cleanup/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters to setup a dataproduct(s) cleanup task.",
@@ -14,8 +14,8 @@
     "required": [],
     "title": "cleanup",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/ingest/ingest-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/ingest/ingest-2.json
similarity index 82%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/ingest/ingest-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/ingest/ingest-2.json
index 239adb6e689493127364f07f4be7fcc8cf7e97f8..292068070ed6c3930f79c764e43e1fa2b0b05afd 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/ingest/ingest-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/ingest/ingest-2.json
@@ -3,7 +3,7 @@
   "name": "ingest",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/ingest/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/tasktemplate/ingest/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters to setup an ingest task.",
@@ -14,8 +14,8 @@
     "required": [],
     "title": "ingest",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/beamforming_observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/beamforming_observation-2.json
similarity index 72%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/beamforming_observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/beamforming_observation-2.json
index 4e302d68a1cc1930a93cd74290dd4503236f64d1..05c99b98762af1f3bf752ffa40146721e2269154 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/beamforming_observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/beamforming_observation-2.json
@@ -3,7 +3,7 @@
   "name": "beamforming observation",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/beamforming%20observation/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/tasktemplate/beamforming%20observation/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -13,19 +13,19 @@
     },
     "properties": {
       "beamformer": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/beamformer",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/beamforming/2#/definitions/beamformer",
         "default": {}
       },
       "duration": {
         "$id": "#duration",
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
         "default": 300,
         "description": "Duration of this observation (seconds)",
         "minimum": 1,
         "title": "Duration"
       },
       "station_configuration": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/station_configuration/1#/definitions/station_configuration",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/station_configuration/1#/definitions/station_configuration",
         "default": {}
       }
     },
@@ -36,8 +36,8 @@
     ],
     "title": "beamforming observation",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/calibrator_observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/calibrator_observation-2.json
similarity index 79%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/calibrator_observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/calibrator_observation-2.json
index 86a4b5739401b29fbab6355ac5e9b159f3eb8948..7342e555f16a55186432072fafb42e6b2e0ea70f 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/calibrator_observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/calibrator_observation-2.json
@@ -3,7 +3,7 @@
   "name": "calibrator observation",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/calibrator%20observation/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/tasktemplate/calibrator%20observation/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "default": {},
@@ -13,12 +13,12 @@
     },
     "properties": {
       "calibrator": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/calibrator/1#/definitions/calibrator",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/calibrator/1#/definitions/calibrator",
         "default": {}
       },
       "duration": {
         "$id": "#duration",
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
         "default": 600,
         "description": "Duration of this observation (seconds)",
         "minimum": 1,
@@ -30,8 +30,8 @@
       "duration"
     ],
     "title": "calibrator observation",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_and_beamforming_observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_and_beamforming_observation-2.json
similarity index 68%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_and_beamforming_observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_and_beamforming_observation-2.json
index 547723593401bec49c1123b7692f7feb511f59bf..3a4cfab43e42be40091c13d75df5c93505e3e105 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_and_beamforming_observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_and_beamforming_observation-2.json
@@ -3,7 +3,7 @@
   "name": "parallel calibrator target and beamforming observation",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/parallel%20calibrator%20target%20and%20beamforming%20observation/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/tasktemplate/parallel%20calibrator%20target%20and%20beamforming%20observation/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema combines the calibrator, target and beamformer observation task schema's for parallel observing.",
@@ -12,31 +12,31 @@
     },
     "properties": {
       "QA": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/QA",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/QA/2#/definitions/QA",
         "default": {}
       },
       "beamformer": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/beamformer",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/beamforming/2#/definitions/beamformer",
         "default": {}
       },
       "calibrator": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/calibrator/1#/definitions/calibrator",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/calibrator/1#/definitions/calibrator",
         "default": {}
       },
       "correlator": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/correlator/1#/definitions/correlator",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/correlator/1#/definitions/correlator",
         "default": {}
       },
       "duration": {
         "$id": "#duration",
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
         "default": 600,
         "description": "Duration of this observation (seconds)",
         "minimum": 1,
         "title": "Duration"
       },
       "station_configuration": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/station_configuration/1#/definitions/station_configuration",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/station_configuration/1#/definitions/station_configuration",
         "default": {}
       }
     },
@@ -49,8 +49,8 @@
     ],
     "title": "parallel calibrator target and beamforming observation",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_observation-2.json
similarity index 70%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_observation-2.json
index 9571c611452ef11e0e76d1d9284c4de8bc624cae..cb61ffb93822c6cabedad681677f5623faf6779b 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_observation-2.json
@@ -3,7 +3,7 @@
   "name": "parallel calibrator target observation",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/parallel%20calibrator%20target%20observation/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/tasktemplate/parallel%20calibrator%20target%20observation/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema combines the calibrator and target observation task schema's for parallel observing.",
@@ -12,27 +12,27 @@
     },
     "properties": {
       "QA": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/QA",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/QA/2#/definitions/QA",
         "default": {}
       },
       "calibrator": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/calibrator/1#/definitions/calibrator",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/calibrator/1#/definitions/calibrator",
         "default": {}
       },
       "correlator": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/correlator/1#/definitions/correlator",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/correlator/1#/definitions/correlator",
         "default": {}
       },
       "duration": {
         "$id": "#duration",
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
         "default": 600,
         "description": "Duration of this observation (seconds)",
         "minimum": 1,
         "title": "Duration"
       },
       "station_configuration": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/station_configuration/1#/definitions/station_configuration",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/station_configuration/1#/definitions/station_configuration",
         "default": {}
       }
     },
@@ -44,8 +44,8 @@
     ],
     "title": "parallel calibrator target observation",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_target_and_beamforming_observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_target_and_beamforming_observation-2.json
similarity index 68%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_target_and_beamforming_observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_target_and_beamforming_observation-2.json
index a7c78788aba1b49d357ada422119c7337a2a79be..852e493fb3de9b4e314b33343bbeda212797c2c4 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_target_and_beamforming_observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_target_and_beamforming_observation-2.json
@@ -3,7 +3,7 @@
   "name": "parallel target and beamforming observation",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/parallel%20target%20and%20beamforming%20observation/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/tasktemplate/parallel%20target%20and%20beamforming%20observation/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema combines the target and beamformer observation task schema's for parallel observing.",
@@ -12,27 +12,27 @@
     },
     "properties": {
       "QA": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/QA",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/QA/2#/definitions/QA",
         "default": {}
       },
       "beamformer": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/beamformer",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/beamforming/2#/definitions/beamformer",
         "default": {}
       },
       "correlator": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/correlator/1#/definitions/correlator",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/correlator/1#/definitions/correlator",
         "default": {}
       },
       "duration": {
         "$id": "#duration",
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
         "default": 600,
         "description": "Duration of this observation (seconds)",
         "minimum": 1,
         "title": "Duration"
       },
       "station_configuration": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/station_configuration/1#/definitions/station_configuration",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/station_configuration/1#/definitions/station_configuration",
         "default": {}
       }
     },
@@ -44,8 +44,8 @@
     ],
     "title": "parallel target and beamforming observation",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/target_observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/target_observation-2.json
similarity index 70%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/target_observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/target_observation-2.json
index 1d88329244d02c389df365918b8adc6cf2367719..a50be0b182e41ad15be1d423344ec12a229024eb 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/target_observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/target_observation-2.json
@@ -3,7 +3,7 @@
   "name": "target observation",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/target%20observation/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/tasktemplate/target%20observation/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters to setup a target observation task.",
@@ -12,23 +12,23 @@
     },
     "properties": {
       "QA": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/QA",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/QA/2#/definitions/QA",
         "default": {}
       },
       "correlator": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/correlator/1#/definitions/correlator",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/correlator/1#/definitions/correlator",
         "default": {}
       },
       "duration": {
         "$id": "#duration",
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/datetime/2/#/definitions/timedelta",
         "default": 600,
         "description": "Duration of this observation (seconds)",
         "minimum": 1,
         "title": "Duration"
       },
       "station_configuration": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/station_configuration/1#/definitions/station_configuration",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/station_configuration/1#/definitions/station_configuration",
         "default": {}
       }
     },
@@ -38,8 +38,8 @@
       "station_configuration"
     ],
     "title": "target observation",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/preprocessing_pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/preprocessing_pipeline-2.json
similarity index 93%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/preprocessing_pipeline-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/preprocessing_pipeline-2.json
index 2dbc6ad79b9028931597e5f26af41591ee6ff9ce..bd4a448a99782700622c260e204bf5a7be3dd51a 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/preprocessing_pipeline-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/preprocessing_pipeline-2.json
@@ -3,7 +3,7 @@
   "name": "preprocessing pipeline",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/preprocessing%20pipeline/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/tasktemplate/preprocessing%20pipeline/2#",
     "$schema": "http://json-schema.org/draft-06/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters for a preprocessing pipeline.",
@@ -36,7 +36,7 @@
         "type": "object"
       },
       "cluster_resources": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pipeline/1#/definitions/cluster_resources",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pipeline/2#/definitions/cluster_resources",
         "default": {}
       },
       "demix": {
@@ -134,8 +134,8 @@
     ],
     "title": "preprocessing pipeline",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/pulsar_pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/pulsar_pipeline-2.json
similarity index 97%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/pulsar_pipeline-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/pulsar_pipeline-2.json
index 948f0be951831b19636ff70170f1781252df410b..b306a54cb8df2302efa410333e102d33f0905610 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/pulsar_pipeline-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/pulsar_pipeline-2.json
@@ -3,7 +3,7 @@
   "name": "pulsar pipeline",
   "purpose": "technical_commissioning",
   "schema": {
-    "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/pulsar%20pipeline/1#",
+    "$id": "https://tmss.lofar.eu/api/schemas/tasktemplate/pulsar%20pipeline/2#",
     "$schema": "http://json-schema.org/draft-07/schema#",
     "additionalProperties": false,
     "description": "This schema defines the parameters for a pulsar pipeline.",
@@ -12,7 +12,7 @@
     },
     "properties": {
       "cluster_resources": {
-        "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pipeline/1#/definitions/cluster_resources",
+        "$ref": "https://tmss.lofar.eu/api/schemas/commonschematemplate/pipeline/2#/definitions/cluster_resources",
         "default": {}
       },
       "dspsr": {
@@ -305,8 +305,8 @@
     ],
     "title": "pulsar pipeline",
     "type": "object",
-    "version": 1
+    "version": 2
   },
   "state": "active",
-  "version": 1
-}
\ No newline at end of file
+  "version": 2
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/common.py b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/common.py
index 9ee381a68c090b6892c5f4d2e9efffdf3d34ccfd..4d8d1005281dbfbf0491f4414589f81c3fab27b1 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/common.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/common.py
@@ -97,12 +97,21 @@ class DynamicRelationalHyperlinkedModelSerializer(FlexFieldsSerializerMixin, Rel
 
 
 class AbstractTemplateSerializer(DynamicRelationalHyperlinkedModelSerializer):
-    schema = JSONEditorField(schema_source=None)
-    ref_resolved_schema = JSONEditorField(schema_source=None, read_only=True, help_text="This is a read-only view on the schema with all references resolved.")
-
     class Meta:
         abstract = True
 
+    def create(self, validated_data):
+        try:
+            # 'version' is a non-editable field for normal users in forms, but we need to accept it when uploaded from a client when populating
+            validated_data['version'] = self.context.get('request').data['version']
+        finally:
+            return super().create(validated_data)
+
+
+class AbstractSchemaTemplateSerializer(AbstractTemplateSerializer):
+    schema = JSONEditorField(schema_source=None)
+    ref_resolved_schema = JSONEditorField(schema_source=None, read_only=True, help_text="This is a read-only view on the schema with all references resolved.")
+
 
 class TaskConnectorTypeSerializer(DynamicRelationalHyperlinkedModelSerializer):
     class Meta:
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py
index 88c0c9435e33df96af134a81e45c1d0297c1a8c7..cd7a324455dcc6026191b10990aa4526e226cfde 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py
@@ -9,7 +9,7 @@ from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 from .. import models
 from .widgets import JSONEditorField
-from .common import FloatDurationField, RelationalHyperlinkedModelSerializer, AbstractTemplateSerializer, DynamicRelationalHyperlinkedModelSerializer, TaskConnectorTypeSerializer
+from .common import FloatDurationField, RelationalHyperlinkedModelSerializer, AbstractSchemaTemplateSerializer, DynamicRelationalHyperlinkedModelSerializer, TaskConnectorTypeSerializer
 
 class SubtaskStateSerializer(DynamicRelationalHyperlinkedModelSerializer):
     class Meta:
@@ -47,25 +47,25 @@ class HashAlgorithmSerializer(DynamicRelationalHyperlinkedModelSerializer):
         fields = '__all__'
 
 
-class SubtaskTemplateSerializer(AbstractTemplateSerializer):
+class SubtaskTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.SubtaskTemplate
         fields = '__all__'
 
 
-class DataproductSpecificationsTemplateSerializer(AbstractTemplateSerializer):
+class DataproductSpecificationsTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.DataproductSpecificationsTemplate
         fields = '__all__'
 
 
-class DataproductFeedbackTemplateSerializer(AbstractTemplateSerializer):
+class DataproductFeedbackTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.DataproductFeedbackTemplate
         fields = '__all__'
 
 
-class SubtaskFeedbackTemplateSerializer(AbstractTemplateSerializer):
+class SubtaskFeedbackTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.SubtaskFeedbackTemplate
         fields = '__all__'
@@ -180,7 +180,7 @@ class SAPSerializer(DynamicRelationalHyperlinkedModelSerializer):
         fields = '__all__'
 
 
-class SAPTemplateSerializer(AbstractTemplateSerializer):
+class SAPTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.SAPTemplate
         fields = '__all__'
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py
index 08f1c011febb65d20e3e1267d9f506a24acb86bd..a8cc104ae328b0d3ec0a0d70d605aa2a270be63e 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py
@@ -5,7 +5,7 @@ This file contains the serializers (for the elsewhere defined data models)
 from rest_framework import serializers
 from .. import models
 from .scheduling import SubtaskSerializer, SubtaskExtendedSerializer
-from .common import FloatDurationField, RelationalHyperlinkedModelSerializer, AbstractTemplateSerializer, DynamicRelationalHyperlinkedModelSerializer, TaskConnectorTypeSerializer
+from .common import FloatDurationField, RelationalHyperlinkedModelSerializer, AbstractTemplateSerializer, AbstractSchemaTemplateSerializer, DynamicRelationalHyperlinkedModelSerializer, TaskConnectorTypeSerializer
 from .widgets import JSONEditorField
 from ..models import TMSSUser as User
 
@@ -35,13 +35,13 @@ class TagsSerializer(DynamicRelationalHyperlinkedModelSerializer):
         fields = '__all__'
 
 
-class CommonSchemaTemplateSerializer(AbstractTemplateSerializer):
+class CommonSchemaTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.CommonSchemaTemplate
         fields = '__all__'
 
 
-class SchedulingUnitObservingStrategyTemplateSerializer(DynamicRelationalHyperlinkedModelSerializer):
+class SchedulingUnitObservingStrategyTemplateSerializer(AbstractTemplateSerializer):
     template = JSONEditorField(schema_source="scheduling_unit_template.schema")
 
     class Meta:
@@ -49,7 +49,7 @@ class SchedulingUnitObservingStrategyTemplateSerializer(DynamicRelationalHyperli
         fields = '__all__'
 
 
-class SchedulingSetStrategyTemplateSerializer(DynamicRelationalHyperlinkedModelSerializer):
+class SchedulingSetStrategyTemplateSerializer(AbstractTemplateSerializer):
     template = JSONEditorField(schema_source="scheduling_set_template.schema")
 
     class Meta:
@@ -57,19 +57,19 @@ class SchedulingSetStrategyTemplateSerializer(DynamicRelationalHyperlinkedModelS
         fields = '__all__'
 
 
-class SchedulingSetTemplateSerializer(AbstractTemplateSerializer):
+class SchedulingSetTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.SchedulingSetTemplate
         fields = '__all__'
 
 
-class SchedulingUnitTemplateSerializer(AbstractTemplateSerializer):
+class SchedulingUnitTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.SchedulingUnitTemplate
         fields = '__all__'
 
 
-class SchedulingConstraintsTemplateSerializer(AbstractTemplateSerializer):
+class SchedulingConstraintsTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.SchedulingConstraintsTemplate
         fields = '__all__'
@@ -81,7 +81,7 @@ class SchedulingConstraintsWeightFactorSerializer(RelationalHyperlinkedModelSeri
         fields = '__all__'
 
 
-class TaskTemplateSerializer(AbstractTemplateSerializer):
+class TaskTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.TaskTemplate
         fields = '__all__'
@@ -91,7 +91,7 @@ class TaskTemplateExtendedSerializer(TaskTemplateSerializer):
     connector_types = TaskConnectorTypeSerializer(many=True, read_only=True, help_text='The connector types which define what kind of data this task template consumes/produces.')
 
 
-class TaskRelationSelectionTemplateSerializer(AbstractTemplateSerializer):
+class TaskRelationSelectionTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.TaskRelationSelectionTemplate
         fields = '__all__'
@@ -381,7 +381,7 @@ class PriorityQueueTypeSerializer(DynamicRelationalHyperlinkedModelSerializer):
         fields = '__all__'
 
 
-class ReservationStrategyTemplateSerializer(DynamicRelationalHyperlinkedModelSerializer):
+class ReservationStrategyTemplateSerializer(AbstractTemplateSerializer):
     template = JSONEditorField(schema_source="reservation_template.schema")
 
     class Meta:
@@ -389,7 +389,7 @@ class ReservationStrategyTemplateSerializer(DynamicRelationalHyperlinkedModelSer
         fields = '__all__'
 
 
-class ReservationTemplateSerializer(AbstractTemplateSerializer):
+class ReservationTemplateSerializer(AbstractSchemaTemplateSerializer):
     class Meta:
         model = models.ReservationTemplate
         fields = '__all__'
@@ -472,7 +472,7 @@ class SystemEventStatusSerializer(DynamicRelationalHyperlinkedModelSerializer):
         fields = '__all__'
 
 
-class SystemEventTemplateSerializer(AbstractTemplateSerializer):
+class SystemEventTemplateSerializer(AbstractSchemaTemplateSerializer):
 
     class Meta:
         model = models.SystemEventTemplate
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py b/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
index c51c63ee48b01859025f5224e576051282099bae..bfa35d8aa443f35c706c5367dfa3811d381b1d1b 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
@@ -323,7 +323,7 @@ def create_observation_subtask_specifications_from_observation_task_blueprint(ta
 
 
     # start with an observation subtask specification with all the defaults and the right structure according to the schema
-    subtask_template = SubtaskTemplate.objects.get(name='observation control')
+    subtask_template = SubtaskTemplate.get_version_or_latest(name='observation control')
     subtask_spec = subtask_template.get_default_json_document_for_schema()
 
 
@@ -464,7 +464,7 @@ def create_observation_subtask_specifications_from_observation_task_blueprint(ta
         if (len(subtask_spec['COBALT']['beamformer']['tab_pipelines']) + len(subtask_spec['COBALT']['beamformer']['flyseye_pipelines'])) > 1:
             min_COBALT_version = max(min_COBALT_version, 2)
 
-    if station_config_task_spec and 'calibrator' not in task_blueprint.specifications_template.name.lower():
+    if station_config_task_spec and 'calibrator observation' != task_blueprint.specifications_template.name.lower():
         # copy/convert the analoge/digital_pointings only for non-calibrator observations (the calibrator has its own pointing)
         # for parallel calibrator&target observations the calibrator pointing is added later as a final sap.
         for sap in station_config_task_spec.get("SAPs", []):
@@ -477,12 +477,12 @@ def create_observation_subtask_specifications_from_observation_task_blueprint(ta
                  "subbands": sap["subbands"]
                  })
 
-        # only add an analog_pointing for HBA observations
-        if "tile_beam" in station_config_task_spec and 'HBA' in station_config_task_spec.get('antenna_set', ''):
-            subtask_spec['stations']['analog_pointing'] = { "direction_type": station_config_task_spec["tile_beam"]["direction_type"],
-                                                            "angle1": station_config_task_spec["tile_beam"]["angle1"],
-                                                            "angle2": station_config_task_spec["tile_beam"]["angle2"],
-                                                            "target": station_config_task_spec["tile_beam"]["target"]}
+    # only add an analog_pointing for HBA observations
+    if station_config_task_spec is not None and "tile_beam" in station_config_task_spec and 'HBA' in station_config_task_spec.get('antenna_set', ''):
+        subtask_spec['stations']['analog_pointing'] = { "direction_type": station_config_task_spec["tile_beam"]["direction_type"],
+                                                        "angle1": station_config_task_spec["tile_beam"]["angle1"],
+                                                        "angle2": station_config_task_spec["tile_beam"]["angle2"],
+                                                        "target": station_config_task_spec["tile_beam"]["target"]}
 
 
 
@@ -686,7 +686,7 @@ def create_qafile_subtask_from_observation_subtask(observation_subtask: Subtask)
         return None
 
     # step 1: create subtask in defining state, with filled-in subtask_template
-    qafile_subtask_template = SubtaskTemplate.objects.get(name="QA file conversion")
+    qafile_subtask_template = SubtaskTemplate.get_version_or_latest(name="QA file conversion")
     qafile_subtask_spec = qafile_subtask_template.get_default_json_document_for_schema()
     qafile_subtask_spec['file_conversion']['nr_of_subbands'] = obs_task_qafile_spec.get("nr_of_subbands")
     qafile_subtask_spec['file_conversion']['nr_of_timestamps'] = obs_task_qafile_spec.get("nr_of_timestamps")
@@ -703,7 +703,7 @@ def create_qafile_subtask_from_observation_subtask(observation_subtask: Subtask)
     qafile_subtask = Subtask.objects.create(**qafile_subtask_data)
 
     # step 2: create and link subtask input/output
-    selection_template = TaskRelationSelectionTemplate.objects.get(name="all")
+    selection_template = TaskRelationSelectionTemplate.get_version_or_latest(name="all")
     selection_doc = selection_template.get_default_json_document_for_schema()
 
     for obs_out in observation_subtask.outputs.all():
@@ -766,7 +766,7 @@ def create_qaplots_subtask_from_qafile_subtask(qafile_subtask: Subtask) -> Subta
         return None
 
     # step 1: create subtask in defining state, with filled-in subtask_template
-    qaplots_subtask_template = SubtaskTemplate.objects.get(name="QA plots")
+    qaplots_subtask_template = SubtaskTemplate.get_version_or_latest(name="QA plots")
     qaplots_subtask_spec_doc = qaplots_subtask_template.get_default_json_document_for_schema()
     qaplots_subtask_spec_doc['plots']['autocorrelation'] = obs_task_qaplots_spec.get("autocorrelation")
     qaplots_subtask_spec_doc['plots']['crosscorrelation'] = obs_task_qaplots_spec.get("crosscorrelation")
@@ -783,7 +783,7 @@ def create_qaplots_subtask_from_qafile_subtask(qafile_subtask: Subtask) -> Subta
     qaplots_subtask = Subtask.objects.create(**qaplots_subtask_data)
 
     # step 2: create and link subtask input/output
-    selection_template = TaskRelationSelectionTemplate.objects.get(name="all")
+    selection_template = TaskRelationSelectionTemplate.get_version_or_latest(name="all")
     selection_doc = selection_template.get_default_json_document_for_schema()
     qaplots_subtask_input = SubtaskInput.objects.create(subtask=qaplots_subtask,
                                                         producer=qafile_subtask.outputs.first(),
@@ -840,7 +840,7 @@ def create_pipeline_subtask_from_task_blueprint(task_blueprint: TaskBlueprint, s
                                        "to an observation predecessor (sub)task." % task_blueprint.pk)
 
     # step 1: create subtask in defining state, with filled-in subtask_template
-    subtask_template = SubtaskTemplate.objects.get(name=subtask_template_name)
+    subtask_template = SubtaskTemplate.get_version_or_latest(name=subtask_template_name)
     default_subtask_specs = subtask_template.get_default_json_document_for_schema()
     task_specs_with_defaults = task_blueprint.specifications_template.add_defaults_to_json_object_for_schema(task_blueprint.specifications_doc)
     subtask_specs = generate_subtask_specs_from_task_spec_func(task_specs_with_defaults, default_subtask_specs)
@@ -888,7 +888,7 @@ def create_ingest_subtask_from_task_blueprint(task_blueprint: TaskBlueprint) ->
     check_prerequities_for_subtask_creation(task_blueprint)
 
     # step 1: create subtask in defining state, with filled-in subtask_template
-    subtask_template = SubtaskTemplate.objects.get(name='ingest control')
+    subtask_template = SubtaskTemplate.get_version_or_latest(name='ingest control')
     default_subtask_specs = subtask_template.get_default_json_document_for_schema()
     subtask_specs = default_subtask_specs  # todo: translate specs from task to subtask once we have non-empty templates
     cluster_name = task_blueprint.specifications_doc.get("storage_cluster", "CEP4")
@@ -922,7 +922,7 @@ def create_cleanup_subtask_from_task_blueprint(task_blueprint: TaskBlueprint) ->
     check_prerequities_for_subtask_creation(task_blueprint)
 
     # step 1: create subtask in defining state, with filled-in subtask_template
-    subtask_template = SubtaskTemplate.objects.get(name='cleanup')
+    subtask_template = SubtaskTemplate.get_version_or_latest(name='cleanup')
     subtask_specs = subtask_template.get_default_json_document_for_schema()
 
     try:
@@ -1258,8 +1258,8 @@ def schedule_qafile_subtask(qafile_subtask: Subtask):
     # step 4: create output dataproducts, and link these to the output
     # TODO: Should the output and/or dataproduct be determined by the specification in task_relation_blueprint?
     if qafile_subtask.outputs.first():
-        dp_spec_template = DataproductSpecificationsTemplate.objects.get(name="empty")
-        dp_feedvack_template = DataproductFeedbackTemplate.objects.get(name="empty")
+        dp_spec_template = DataproductSpecificationsTemplate.get_version_or_latest(name="empty")
+        dp_feedvack_template = DataproductFeedbackTemplate.get_version_or_latest(name="empty")
         qafile_subtask_dataproduct = Dataproduct.objects.create(filename="L%s_QA.h5" % (qa_input.producer.subtask_id, ),
                                                                 directory="/data/qa/qa_files",
                                                                 dataformat=Dataformat.objects.get(value=Dataformat.Choices.QA_HDF5.value),
@@ -1314,8 +1314,8 @@ def schedule_qaplots_subtask(qaplots_subtask: Subtask):
     # TODO: Should the output and/or dataproduct be determined by the specification in task_relation_blueprint?
     qafile_subtask = qaplots_subtask.predecessors.first()
     obs_subtask = qafile_subtask.predecessors.first()
-    dp_spec_template = DataproductSpecificationsTemplate.objects.get(name="empty")
-    dp_feedvack_template = DataproductFeedbackTemplate.objects.get(name="empty")
+    dp_spec_template = DataproductSpecificationsTemplate.get_version_or_latest(name="empty")
+    dp_feedvack_template = DataproductFeedbackTemplate.get_version_or_latest(name="empty")
 
     qaplots_subtask_dataproduct = Dataproduct.objects.create(directory="/data/qa/plots/L%s" % (obs_subtask.id, ),
                                                              dataformat=Dataformat.objects.get(value=Dataformat.Choices.QA_PLOTS.value),
@@ -1432,8 +1432,8 @@ def schedule_observation_subtask(observation_subtask: Subtask):
     # step 3: create output dataproducts, and link these to the output
     dataproducts = []
     specifications_doc = observation_subtask.specifications_doc
-    dataproduct_specifications_template = DataproductSpecificationsTemplate.objects.get(name="SAP")
-    dataproduct_feedback_template = DataproductFeedbackTemplate.objects.get(name="empty")
+    dataproduct_specifications_template = DataproductSpecificationsTemplate.get_version_or_latest(name="SAP")
+    dataproduct_feedback_template = DataproductFeedbackTemplate.get_version_or_latest(name="empty")
     dataproduct_feedback_doc = dataproduct_feedback_template.get_default_json_document_for_schema()
 
 
@@ -1502,7 +1502,7 @@ def schedule_observation_subtask(observation_subtask: Subtask):
                                                       "fields": antennafields
                                                     }
                                                   },
-                               specifications_template=SAPTemplate.objects.get(name="SAP")) for sap_nr, pointing in enumerate(specifications_doc['stations']['digital_pointings'])]
+                               specifications_template=SAPTemplate.get_version_or_latest(name="SAP")) for sap_nr, pointing in enumerate(specifications_doc['stations']['digital_pointings'])]
 
     # store everything below this directory
     directory = _output_root_directory(observation_subtask)
@@ -1511,7 +1511,7 @@ def schedule_observation_subtask(observation_subtask: Subtask):
     if specifications_doc['COBALT']['correlator']['enabled']:
         dataformat = Dataformat.objects.get(value=Dataformat.Choices.MEASUREMENTSET.value)
         datatype = Datatype.objects.get(value=Datatype.Choices.VISIBILITIES.value)
-        dataproduct_specifications_template = DataproductSpecificationsTemplate.objects.get(name="visibilities")
+        dataproduct_specifications_template = DataproductSpecificationsTemplate.get_version_or_latest(name="visibilities")
         sb_nr_offset = 0 # subband numbers run from 0 to (nr_subbands-1), increasing across SAPs
 
         for sap_nr, pointing in enumerate(specifications_doc['stations']['digital_pointings']):
@@ -1538,7 +1538,7 @@ def schedule_observation_subtask(observation_subtask: Subtask):
 
 
     # create beamformer dataproducts
-    dataproduct_specifications_template_timeseries = DataproductSpecificationsTemplate.objects.get(name="time series")
+    dataproduct_specifications_template_timeseries = DataproductSpecificationsTemplate.get_version_or_latest(name="time series")
 
     def _sap_index(saps: dict, sap_name: str) -> int:
         """ Return the SAP index in the observation given a certain SAP name. """
@@ -1715,8 +1715,8 @@ def _create_preprocessing_output_dataproducts_and_transforms(pipeline_subtask: S
     datatype = Datatype.objects.get(value="visibilities")
 
     # TODO: use existing and reasonable selection and specification templates for output when we have those, for now, use "empty"
-    dataproduct_specifications_template = DataproductSpecificationsTemplate.objects.get(name="visibilities")
-    dataproduct_feedback_template = DataproductFeedbackTemplate.objects.get(name="empty")
+    dataproduct_specifications_template = DataproductSpecificationsTemplate.get_version_or_latest(name="visibilities")
+    dataproduct_feedback_template = DataproductFeedbackTemplate.get_version_or_latest(name="empty")
     directory = os.path.join(_output_root_directory(pipeline_subtask), "uv")
 
     # input:output mapping is 1:1
@@ -1749,7 +1749,7 @@ def _create_preprocessing_output_dataproducts_and_transforms(pipeline_subtask: S
     return output_dataproducts
 
 def _create_pulsar_pipeline_output_dataproducts_and_transforms(pipeline_subtask: Subtask, input_dataproducts: list):
-    dataproduct_feedback_template = DataproductFeedbackTemplate.objects.get(name="empty")
+    dataproduct_feedback_template = DataproductFeedbackTemplate.get_version_or_latest(name="empty")
     directory = os.path.join(_output_root_directory(pipeline_subtask), "pulp")
 
     # ----- output tarball per input dataproduct
@@ -1791,7 +1791,7 @@ def _create_pulsar_pipeline_output_dataproducts_and_transforms(pipeline_subtask:
 
         dataformat = Dataformat.objects.get(value="pulp analysis")
         datatype = Datatype.objects.get(value="pulsar profile")
-        dataproduct_specifications_template = DataproductSpecificationsTemplate.objects.get(name="time series")
+        dataproduct_specifications_template = DataproductSpecificationsTemplate.get_version_or_latest(name="time series")
 
         # select subtask output the new dataproducts will be linked to
         pipeline_subtask_output = pipeline_subtask.outputs.filter(output_role__dataformat=dataformat, output_role__datatype=datatype).first()
@@ -1865,7 +1865,7 @@ def _create_pulsar_pipeline_output_dataproducts_and_transforms(pipeline_subtask:
 
         dataformat = Dataformat.objects.get(value="pulp summary")
         datatype = Datatype.objects.get(value="quality")
-        dataproduct_specifications_template = DataproductSpecificationsTemplate.objects.get(name="pulp summary")
+        dataproduct_specifications_template = DataproductSpecificationsTemplate.get_version_or_latest(name="pulp summary")
 
         # select subtask output the new dataproducts will be linked to
         pipeline_subtask_output = pipeline_subtask.outputs.filter(output_role__dataformat=dataformat, output_role__datatype=datatype).first()
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/tasks.py b/SAS/TMSS/backend/src/tmss/tmssapp/tasks.py
index 41a2b54c23f8cfe7ea03bf586d0a6afe5a2d1de3..faa73c26452ced8621e8674552275cfeac9cfc0a 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/tasks.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/tasks.py
@@ -38,7 +38,7 @@ def create_scheduling_unit_draft_from_observing_strategy_template(strategy_templ
 
     if 'scheduling_constraints_template' in specifications_doc:
         scheduling_constraints_template_name_version = specifications_doc.pop('scheduling_constraints_template')
-        scheduling_constraints_template = models.SchedulingConstraintsTemplate.objects.get(name=scheduling_constraints_template_name_version['name'],
+        scheduling_constraints_template = models.SchedulingConstraintsTemplate.get_version_or_latest(name=scheduling_constraints_template_name_version['name'],
                                                                                            version=scheduling_constraints_template_name_version.get('version',1))
     else:
         # use the latest scheduling_constraints_template (can be None, which is acceptable)
@@ -272,8 +272,8 @@ def update_task_graph_from_specifications_doc(scheduling_unit_draft: models.Sche
             task_definition = tasks[task_name]
 
             task_template_name = task_definition["specifications_template"]["name"]
-            task_template_version = task_definition["specifications_template"].get("version", 1)
-            task_template = models.TaskTemplate.objects.get(name=task_template_name, version=task_template_version)
+            task_template_version = task_definition["specifications_template"].get("version")
+            task_template = models.TaskTemplate.get_version_or_latest(name=task_template_name, version=task_template_version)
 
             task_specifications_doc = task_definition.get("specifications_doc", {})
             task_specifications_doc = task_template.add_defaults_to_json_object_for_schema(task_specifications_doc)
@@ -317,7 +317,10 @@ def update_task_graph_from_specifications_doc(scheduling_unit_draft: models.Sche
                                                                    datatype=task_relation_definition["output"]["datatype"],
                                                                    dataformat=task_relation_definition["output"]["dataformat"],
                                                                    iotype=models.IOType.Choices.OUTPUT.value)
-                selection_template = models.TaskRelationSelectionTemplate.objects.get(name=task_relation_definition["selection_template"])
+
+                selection_template_name = task_relation_definition["selection_template"]["name"]
+                selection_template_version = task_relation_definition["selection_template"].get("version")
+                selection_template = models.TaskRelationSelectionTemplate.get_version_or_latest(name=selection_template_name, version=selection_template_version)
                 selection_doc = task_relation_definition.get("selection_doc", selection_template.get_default_json_document_for_schema())
             except Exception as e:
                 logger.error("Could not determine Task Relations for %s. Error: %s", task_relation_definition, e)
@@ -653,7 +656,7 @@ def create_cleanuptask_for_scheduling_unit_blueprint(scheduling_unit_blueprint:
 
     with transaction.atomic():
         # create a cleanup task draft and blueprint....
-        cleanup_template = models.TaskTemplate.objects.get(name="cleanup")
+        cleanup_template = models.TaskTemplate.get_version_or_latest(name="cleanup")
         cleanup_spec_doc = cleanup_template.get_default_json_document_for_schema()
 
         cleanup_task_blueprint = TaskBlueprint.objects.create(
@@ -668,7 +671,7 @@ def create_cleanuptask_for_scheduling_unit_blueprint(scheduling_unit_blueprint:
         logger.info("Created Cleanup Task id=%d for scheduling_unit id=%s, adding the outputs of all producing tasks in the scheduling unit to the cleanup...", cleanup_task_blueprint.id, scheduling_unit_blueprint.id)
 
         # ... and connect the outputs of the producing tasks to the cleanup, so the cleanup task knows what to remove.
-        selection_template = TaskRelationSelectionTemplate.objects.get(name="all")
+        selection_template = TaskRelationSelectionTemplate.get_version_or_latest(name="all")
         selection_doc = selection_template.get_default_json_document_for_schema()
 
         task_relation_blueprints = []
@@ -724,7 +727,7 @@ def create_cleanuptask_for_scheduling_unit_draft(scheduling_unit_draft: Scheduli
 
     with transaction.atomic():
         # create a cleanup task draft....
-        cleanup_template = models.TaskTemplate.objects.get(name="cleanup")
+        cleanup_template = models.TaskTemplate.get_version_or_latest(name="cleanup")
         cleanup_spec_doc = cleanup_template.get_default_json_document_for_schema()
 
         cleanup_task_draft = models.TaskDraft.objects.create(
@@ -737,7 +740,7 @@ def create_cleanuptask_for_scheduling_unit_draft(scheduling_unit_draft: Scheduli
         logger.info("Created Cleanup Task id=%d for scheduling_unit id=%s, adding the outputs of all producing tasks in the scheduling unit to the cleanup...", cleanup_task_draft.id, scheduling_unit_draft.id)
 
         # ... and connect the outputs of the producing tasks to the cleanup, so the cleanup task knows what to remove.
-        selection_template = TaskRelationSelectionTemplate.objects.get(name="all")
+        selection_template = TaskRelationSelectionTemplate.get_version_or_latest(name="all")
         selection_doc = selection_template.get_default_json_document_for_schema()
 
         for producer_task_draft in scheduling_unit_draft.task_drafts.exclude(specifications_template__type=TaskType.Choices.CLEANUP).exclude(specifications_template__type=TaskType.Choices.INGEST).all():
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/views.py b/SAS/TMSS/backend/src/tmss/tmssapp/views.py
index 9f4afc3a00ac43428e41585707b7c323ff50a982..bc8179b6ce301e14f56ec7fc176576dbccde29dd 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/views.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/views.py
@@ -81,11 +81,11 @@ def authentication_state(request):
                                 404: 'the schema with requested <template>, <name> and <version> is not available'},
                      operation_description="Get the JSON schema for the given <template> with the given <name> and <version> as application/json content response.")
 #@api_view(['GET'])   # todo: !! decorating this as api_view somehow breaks json ref resolution !! fix this and double url issue in urls.py, then use decorator here to include in Swagger
-def get_template_json_schema(request, template:str, name:str, version:str):
+def get_template_json_schema(request, template:str, name:str, version:str=None):
     template_model = apps.get_model("tmssapp", template)
-    template_instance = get_object_or_404(template_model, name=name, version=version)
+    template_instance = template_model.get_version_or_latest(name=name, version=version)
     schema = template_instance.schema
-    response = JsonResponse(schema, json_dumps_params={"indent":2})
+    response = JsonResponse(schema, json_dumps_params={"indent":2, "sort_keys": True})
 
     # config Access-Control. Our schemas use $ref url's to other schemas, mainly pointing to our own common schemas with base definitions.
     # We instruct the client to allow fetching those.
@@ -102,11 +102,11 @@ def get_template_json_schema(request, template:str, name:str, version:str):
                                 404: 'the schema with requested <template>, <name> and <version> is not available'},
                      operation_description="Get a JSON document filled with all defaults compliant with the schema for the given <template> with the given <name> and <version> as application/json content response.")
 #@api_view(['GET'])   # todo: !! decorating this as api_view somehow breaks json ref resolution !! fix this and double url issue in urls.py, then use decorator here to include in Swagger
-def get_template_json_schema_default_doc(request, template:str, name:str, version:str):
+def get_template_json_schema_default_doc(request, template:str, name:str, version:str=None):
     template_model = apps.get_model("tmssapp", template)
-    template_instance = get_object_or_404(template_model, name=name, version=version)
+    template_instance = template_model.get_version_or_latest(name=name, version=version)
     default_json_doc = template_instance.get_default_json_document_for_schema()
-    response = JsonResponse(default_json_doc, json_dumps_params={"indent":2})
+    response = JsonResponse(default_json_doc, json_dumps_params={"indent":2, "sort_keys": True})
 
     # config Access-Control. Our schemas use $ref url's to other schemas, mainly pointing to our own common schemas with base definitions.
     # We instruct the client to allow fetching those.
@@ -123,10 +123,10 @@ def get_template_json_schema_default_doc(request, template:str, name:str, versio
                                 404: 'the schema with requested <template>, <name> and <version> is not available'},
                      operation_description="Get a JSON document filled with all defaults compliant with the schema for the given <template> with the given <name> and <version> as application/json content response.")
 #@api_view(['GET'])   # todo: !! decorating this as api_view somehow breaks json ref resolution !! fix this and double url issue in urls.py, then use decorator here to include in Swagger
-def get_template_json_ref_resolved_schema(request, template:str, name:str, version:str):
+def get_template_json_ref_resolved_schema(request, template:str, name:str, version:str=None):
     template_model = apps.get_model("tmssapp", template)
-    template_instance = get_object_or_404(template_model, name=name, version=version)
-    response = JsonResponse(template_instance.ref_resolved_schema, json_dumps_params={'indent': 2})
+    template_instance = template_model.get_version_or_latest(name=name, version=version)
+    response = JsonResponse(template_instance.ref_resolved_schema, json_dumps_params={'indent': 2, "sort_keys": True})
 
     # config Access-Control. Our schemas use $ref url's to other schemas, mainly pointing to our own common schemas with base definitions.
     # We instruct the client to allow fetching those.
@@ -473,7 +473,7 @@ def get_templates_as_zipfile(request):
                                 content[refereced_template_field] = {'name': refereced_template.name,
                                                                      'version': refereced_template.version}
 
-                    file.write(json.dumps(content, indent=2, sort_keys=True).encode('utf-8'))
+                    file.write((json.dumps(content, indent=2, sort_keys=True)+"\n").encode('utf-8'))
 
         # add a nice Readme
         with zip_archive.open('readme.txt', 'w') as file:
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/lofar_viewset.py b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/lofar_viewset.py
index a763f2d0dd9280abb832ff6007fc57819304ad9d..2eb4aa09f2594d5e780bf207e14af135836950f6 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/lofar_viewset.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/lofar_viewset.py
@@ -172,7 +172,7 @@ class AbstractTemplateViewSet(LOFARViewSet):
     @action(methods=['get'], detail=True)
     def schema(self, request, pk=None):
         template = get_object_or_404(self.queryset.model, pk=pk)
-        return JsonResponse(template.schema, json_dumps_params={'indent': 2})
+        return JsonResponse(template.schema, json_dumps_params={'indent': 2, 'sort_keys': True})
 
     @swagger_auto_schema(responses={200: 'The schema as a JSON object',
                                     403: 'forbidden'},
@@ -180,7 +180,7 @@ class AbstractTemplateViewSet(LOFARViewSet):
     @action(methods=['get'], detail=True)
     def ref_resolved_schema(self, request, pk=None):
         template = get_object_or_404(self.queryset.model, pk=pk)
-        return JsonResponse(template.ref_resolved_schema, json_dumps_params={'indent': 2})
+        return JsonResponse(template.ref_resolved_schema, json_dumps_params={'indent': 2, 'sort_keys': True})
 
     @swagger_auto_schema(responses={200: 'JSON object with all the defaults from the schema filled in',
                                     403: 'forbidden'},
@@ -189,6 +189,6 @@ class AbstractTemplateViewSet(LOFARViewSet):
     def default(self, request, pk=None):
         template = get_object_or_404(self.queryset.model, pk=pk)
         spec = template.get_default_json_document_for_schema()
-        return JsonResponse(spec, json_dumps_params={'indent': 2})
+        return JsonResponse(spec, json_dumps_params={'indent': 2, 'sort_keys': True})
 
 
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
index a5583d925de321686c8befeb5aef4aae97ab9c3d..aaaf2e2e9e7af27ad25e314d5b2246ebdd532ed8 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
@@ -487,7 +487,7 @@ class DataproductViewSet(LOFARViewSet):
                                                       hash=json_doc['adler32_checksum'])
 
             # create empty feedback. Apart from the archive info above, ingest does not create feedback like observations/pipelines do.
-            dataproduct.feedback_template = models.DataproductFeedbackTemplate.objects.get(name="empty")
+            dataproduct.feedback_template = models.DataproductFeedbackTemplate.get_version_or_latest(name="empty")
             dataproduct.feedback_doc = dataproduct.feedback_template.get_default_json_document_for_schema()
             dataproduct.save()
 
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
index 5e644418c23a795957a344692eb190b2bb15764a..6e074f536e33089f4143d35aa893423f8d3b36bd 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
@@ -121,7 +121,7 @@ class SchedulingUnitObservingStrategyTemplateViewSet(LOFARViewSet):
     @action(methods=['get'], detail=True)
     def template_doc_complete_with_defaults(self, request, pk=None):
         strategy_template = get_object_or_404(models.SchedulingUnitObservingStrategyTemplate, pk=pk)
-        return JsonResponse(strategy_template.template_doc_complete_with_defaults, json_dumps_params={'indent': 2})
+        return JsonResponse(strategy_template.template_doc_complete_with_defaults, json_dumps_params={'indent': 2, 'sort_keys': True})
 
 
     @swagger_auto_schema(responses={200: 'The template document as JSON object with just the items that are in the parameters list.',
@@ -130,7 +130,7 @@ class SchedulingUnitObservingStrategyTemplateViewSet(LOFARViewSet):
     @action(methods=['get'], detail=True)
     def template_doc_with_just_the_parameters(self, request, pk=None):
         strategy_template = get_object_or_404(models.SchedulingUnitObservingStrategyTemplate, pk=pk)
-        return JsonResponse(strategy_template.template_doc_with_just_the_parameters, json_dumps_params={'indent': 2})
+        return JsonResponse(strategy_template.template_doc_with_just_the_parameters, json_dumps_params={'indent': 2, 'sort_keys': True})
 
 
     @swagger_auto_schema(responses={200: 'Get a trigger JSON document ready to be used for trigger submission',
@@ -811,7 +811,7 @@ class SchedulingUnitDraftViewSet(LOFARViewSet):
     @action(methods=['get'], detail=True, url_name="specifications_doc", name="Get a json specifications_doc reflecting the current scheduling unit draft's task graph and settings.")
     def specifications_doc(self, request, pk=None):
         scheduling_unit_draft = get_object_or_404(models.SchedulingUnitDraft, pk=pk)
-        return JsonResponse(scheduling_unit_draft.specifications_doc, json_dumps_params={'indent': 2})
+        return JsonResponse(scheduling_unit_draft.specifications_doc, json_dumps_params={'indent': 2, 'sort_keys': True})
 
 
     @swagger_auto_schema(responses={201: "Create a new Observation Strategy Template based on the specifications_doc of this scheduling_unit",
@@ -998,7 +998,7 @@ class SchedulingUnitBlueprintViewSet(LOFARViewSet):
     @action(methods=['get'], detail=True, url_name="specifications_doc", name="Get a json specifications_doc reflecting the current scheduling unit blueprint's task graph and settings.")
     def specifications_doc(self, request, pk=None):
         scheduling_unit_blueprint = get_object_or_404(models.SchedulingUnitBlueprint, pk=pk)
-        return JsonResponse(scheduling_unit_blueprint.specifications_doc, json_dumps_params={'indent': 2})
+        return JsonResponse(scheduling_unit_blueprint.specifications_doc, json_dumps_params={'indent': 2, 'sort_keys': True})
 
 
     @swagger_auto_schema(responses={201: "A JSON document reflecting the current scheduling unit blueprint's task graph and settings, including copies of tasks and relations for failed tasks, intended to be used to update the draft and (re)create the copies the failed tasks for a 'rerun'",
@@ -1007,7 +1007,7 @@ class SchedulingUnitBlueprintViewSet(LOFARViewSet):
     @action(methods=['get'], detail=True, url_name="specifications_doc_including_copies_for_failed_tasks", name="Get a json specifications_doc reflecting the current scheduling unit blueprint's task graph and settings, including copies of tasks and relations for failed tasks, intended to be used to update the draft and (re)create the copies the failed tasks for a 'rerun'")
     def specifications_doc_including_copies_for_failed_tasks(self, request, pk=None):
         scheduling_unit_blueprint = get_object_or_404(models.SchedulingUnitBlueprint, pk=pk)
-        return JsonResponse(scheduling_unit_blueprint.specifications_doc_including_copies_for_failed_tasks, json_dumps_params={'indent': 2})
+        return JsonResponse(scheduling_unit_blueprint.specifications_doc_including_copies_for_failed_tasks, json_dumps_params={'indent': 2, 'sort_keys': True})
 
 
     @swagger_auto_schema(responses={201: "This SchedulingUnitBlueprint",
diff --git a/SAS/TMSS/backend/src/tmss/urls.py b/SAS/TMSS/backend/src/tmss/urls.py
index e95df458b330489057f52eaccfb63def9518e396..434f37955dce689d5977c69cf818368a58072fc4 100644
--- a/SAS/TMSS/backend/src/tmss/urls.py
+++ b/SAS/TMSS/backend/src/tmss/urls.py
@@ -66,6 +66,8 @@ urlpatterns = [
     path('swagger/', swagger_schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
     path('redoc/', swagger_schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
     #re_path('schemas/<str:template>/<str:name>/<str:version>', views.get_template_json_schema, name='get_template_json_schema'),  # !! use of regex here breaks reverse url lookup
+    path('schemas/<str:template>/<str:name>', views.get_template_json_schema, name='get_template_json_schema'),   # !! two urls for same view break Swagger, one url break json ref resolution !!
+    path('schemas/<str:template>/<str:name>/', views.get_template_json_schema, name='get_template_json_schema'),   # !! two urls for same view break Swagger, one url break json ref resolution !!
     path('schemas/<str:template>/<str:name>/<str:version>', views.get_template_json_schema, name='get_template_json_schema'),   # !! two urls for same view break Swagger, one url break json ref resolution !!
     path('schemas/<str:template>/<str:name>/<str:version>/', views.get_template_json_schema, name='get_template_json_schema'),  # !! two urls for same view break Swagger, one url break json ref resolution !!
     path('schemas/<str:template>/<str:name>/<str:version>/default', views.get_template_json_schema_default_doc, name='get_template_json_schema_default_doc'),  # !! two urls for same view break Swagger, one url break json ref resolution !!
diff --git a/SAS/TMSS/backend/test/t_adapter.py b/SAS/TMSS/backend/test/t_adapter.py
index 99ce6cb7c5e55a22bdfef61b46c45a25a658dd91..82a44513c6856bbb73ae195eaf1703d6682e3e0e 100755
--- a/SAS/TMSS/backend/test/t_adapter.py
+++ b/SAS/TMSS/backend/test/t_adapter.py
@@ -74,12 +74,12 @@ class ObservationParsetAdapterTest(unittest.TestCase):
 
     @staticmethod
     def get_default_specifications():
-        subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+        subtask_template = models.SubtaskTemplate.get_latest(name='observation control')
         return get_default_json_object_for_schema(subtask_template.schema)
 
     @staticmethod
     def create_subtask(specifications_doc):
-        subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+        subtask_template = models.SubtaskTemplate.get_latest(name='observation control')
         subtask_data = Subtask_test_data(subtask_template=subtask_template, specifications_doc=specifications_doc, task_blueprint=models.TaskBlueprint.objects.create(**TaskBlueprint_test_data()))
         subtask:models.Subtask = models.Subtask.objects.create(**subtask_data)
         subtask_output = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=subtask))
@@ -281,7 +281,7 @@ class ObservationParsetAdapterTest(unittest.TestCase):
         ]
 
         # Add any missing defaults
-        subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+        subtask_template = models.SubtaskTemplate.get_latest(name='observation control')
         specifications_doc = add_defaults_to_json_object_for_schema(specifications_doc, resolved_remote_refs(subtask_template.schema))
 
         # associated dataproducts
@@ -349,7 +349,7 @@ class ObservationParsetAdapterTest(unittest.TestCase):
 
 class PulsarPipelineParsetAdapterTest(unittest.TestCase):
     def create_subtask(self, specifications_doc={}):
-        subtask_template = models.SubtaskTemplate.objects.get(name='pulsar pipeline')
+        subtask_template = models.SubtaskTemplate.get_latest(name='pulsar pipeline')
         specifications_doc = add_defaults_to_json_object_for_schema(specifications_doc, subtask_template.schema)
 
         subtask_data = Subtask_test_data(subtask_template=subtask_template, specifications_doc=specifications_doc, task_blueprint=models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(short_description="Test pipeline task_blueprint")))
@@ -397,10 +397,10 @@ class SIPadapterTest(unittest.TestCase):
         Check the number of SIP identifiers are increased with 3
         Check that all SIP identifiers are unique
         """
-        subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+        subtask_template = models.SubtaskTemplate.get_latest(name='observation control')
         specifications_doc = get_default_json_object_for_schema(subtask_template.schema)
         specifications_doc['stations']['filter'] = "HBA_210_250"
-        feedback_template = models.DataproductFeedbackTemplate.objects.get(name='feedback')
+        feedback_template = models.DataproductFeedbackTemplate.get_latest(name='feedback')
         feedback_doc = {'percentage_written': 100, 'frequency': {'subbands': [156], 'station_subbands': [42], 'central_frequencies': [33593750.0], 'channel_width': 6103.515625, 'channels_per_subband': 32}, 'time': {'start_time': '2013-02-16T17:00:00', 'duration': 5.02732992172, 'sample_width': 2.00278016}, 'antennas': {'set': 'HBA_DUAL', 'fields': [{'type': 'HBA', 'field': 'HBA0', 'station': 'CS001'}, {'type': 'HBA', 'field': 'HBA1', 'station': 'CS001'}]}, 'target': {'pointing': {'angle1': 0, 'angle2': 0, 'direction_type': 'J2000', "target": "target1"}}, 'samples': {'polarisations': ['XX', 'XY', 'YX', 'YY'], 'type': 'float', 'bits': 32, 'writer': 'standard', 'writer_version': '2.2.0', 'complex': True}}
         feedback_doc = feedback_template.add_defaults_to_json_object_for_schema(feedback_doc)
         for dp in specifications_doc['stations']['digital_pointings']:
@@ -415,7 +415,7 @@ class SIPadapterTest(unittest.TestCase):
                                                                                                     producer=subtask_output))
 
         # Create SAP
-        sap_template = models.SAPTemplate.objects.get(name="SAP")
+        sap_template = models.SAPTemplate.get_latest(name="SAP")
         specifications_doc = get_default_json_object_for_schema(sap_template.schema)
         sap = models.SAP.objects.create(specifications_doc=specifications_doc, specifications_template=sap_template)
         sap.save()
@@ -447,10 +447,10 @@ class SIPadapterTest(unittest.TestCase):
         Check the number of SIP identifiers are increased with 3
         Check that all SIP identifiers are unique
         """
-        subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+        subtask_template = models.SubtaskTemplate.get_latest(name='observation control')
         specifications_doc = get_default_json_object_for_schema(subtask_template.schema)
         specifications_doc['stations']['filter'] = "HBA_210_250"
-        feedback_template = models.DataproductFeedbackTemplate.objects.get(name='feedback')
+        feedback_template = models.DataproductFeedbackTemplate.get_latest(name='feedback')
         feedback_doc = {'percentage_written': 100, 'frequency': {'subbands': [156], 'central_frequencies': [33593750.0], 'channel_width': 6103.515625, 'channels_per_subband': 32}, 'time': {'start_time': '2013-02-16T17:00:00', 'duration': 5.02732992172, 'sample_width': 2.00278016}, 'antennas': {'set': 'HBA_DUAL', 'fields': [{'type': 'HBA', 'field': 'HBA0', 'station': 'CS001'}, {'type': 'HBA', 'field': 'HBA1', 'station': 'CS001'}]}, 'target': {'pointing': {'angle1': 0, 'angle2': 0, 'direction_type': 'J2000', "target": "target1"}}, 'samples': {'polarisations': ['XX', 'XY', 'YX', 'YY'], 'type': 'float', 'bits': 32, 'writer': 'standard', 'writer_version': '2.2.0', 'complex': True}}
         feedback_doc = feedback_template.add_defaults_to_json_object_for_schema(feedback_doc)
         for dp in specifications_doc['stations']['digital_pointings']:
@@ -461,7 +461,7 @@ class SIPadapterTest(unittest.TestCase):
         subtask_output = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=subtask))
 
         # Create SAP
-        sap_template = models.SAPTemplate.objects.get(name="SAP")
+        sap_template = models.SAPTemplate.get_latest(name="SAP")
         specifications_doc = get_default_json_object_for_schema(sap_template.schema)
         sap = models.SAP.objects.create(specifications_doc=specifications_doc, specifications_template=sap_template)
 
@@ -497,7 +497,7 @@ class SIPadapterTest(unittest.TestCase):
         # assert we get a coherent stokes beam by default
         self.assertIn(str('CoherentStokesBeam'), sip.get_prettyxml())
 
-        dp_spec_template = models.DataproductSpecificationsTemplate.objects.get(name='time series', version=1)
+        dp_spec_template = models.DataproductSpecificationsTemplate.get_latest(name='time series')
 
         # alternative dataproduct, create sip
         dataproduct_data = Dataproduct_test_data(feedback_doc=feedback_doc,
@@ -543,10 +543,10 @@ class SIPadapterTest(unittest.TestCase):
         Check the number of SIP identifiers are increased with 3
         Check that all SIP identifiers are unique
         """
-        subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+        subtask_template = models.SubtaskTemplate.get_latest(name='observation control')
         specifications_doc = get_default_json_object_for_schema(subtask_template.schema)
         specifications_doc['stations']['filter'] = "HBA_110_190"
-        feedback_template = models.DataproductFeedbackTemplate.objects.get(name='feedback')
+        feedback_template = models.DataproductFeedbackTemplate.get_latest(name='feedback')
         feedback_doc = {'percentage_written': 100, 'frequency': {'subbands': [152], 'central_frequencies': [33593750.0], 'channel_width': 3051.7578125, 'channels_per_subband': 64}, 'time': {'start_time': '2013-02-16T17:00:00', 'duration': 5.02732992172, 'sample_width': 2.00278016}, 'antennas': {'set': 'HBA_DUAL', 'fields': [{'type': 'HBA', 'field': 'HBA0', 'station': 'CS001'}, {'type': 'HBA', 'field': 'HBA1', 'station': 'CS001'}]}, 'target': {'pointing': {'angle1': 0, 'angle2': 0, 'direction_type': 'J2000', "target": "target1"}, 'coherent': True}, 'samples': {'polarisations': ['XX', 'XY', 'YX', 'YY'], 'type': 'float', 'bits': 32, 'writer': 'standard', 'writer_version': '2.2.0', 'complex': True}, 'files': ['stokes/SAP0/CS003HBA1/L773569_SAP000_B005_S0_P000_bf.h5', 'stokes/SAP0/RS106HBA/L773569_SAP000_B046_S0_P000_bf.h5']}
         feedback_doc = feedback_template.add_defaults_to_json_object_for_schema(feedback_doc)
 
@@ -558,7 +558,7 @@ class SIPadapterTest(unittest.TestCase):
         subtask_output = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=subtask))
 
         # Create SAP
-        sap_template = models.SAPTemplate.objects.get(name="SAP")
+        sap_template = models.SAPTemplate.get_latest(name="SAP")
         specifications_doc = get_default_json_object_for_schema(sap_template.schema)
         sap = models.SAP.objects.create(specifications_doc=specifications_doc, specifications_template=sap_template)
         sap.save()
@@ -641,7 +641,7 @@ class SIPadapterTest(unittest.TestCase):
 
     def test_pulp_dataproduct_from_pulsar_timing_strategy(self):
         '''Check the pulp dataproducts generated by a Pulsar Timing stategy.'''
-        strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name='Pulsar timing', version=1)
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_latest(name='BF Pulsar Timing')
         scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(name="Pulsar timing",
                                                                           specifications_template=strategy_template.scheduling_unit_template,
                                                                           observation_strategy_template=strategy_template,
@@ -657,7 +657,7 @@ class SIPadapterTest(unittest.TestCase):
             subtask = schedule_subtask(subtask)
             set_subtask_state_following_allowed_transitions(subtask, 'finishing')
 
-            feedback_template = models.DataproductFeedbackTemplate.objects.get(name='feedback')
+            feedback_template = models.DataproductFeedbackTemplate.get_latest(name='feedback')
             feedback_doc = {'percentage_written': 100, 'frequency': {'subbands': [152], 'central_frequencies': [33593750.0], 'channel_width': 3051.7578125, 'channels_per_subband': 64}, 'time': {'start_time': '2013-02-16T17:00:00', 'duration': 5.02732992172, 'sample_width': 2.00278016}, 'antennas': {'set': 'HBA_DUAL', 'fields': [{'type': 'HBA', 'field': 'HBA0', 'station': 'CS001'}, {'type': 'HBA', 'field': 'HBA1', 'station': 'CS001'}]}, 'target': {'pointing': {'angle1': 0, 'angle2': 0, 'direction_type': 'J2000', "target": "target1"}, 'coherent': True}, 'samples': {'polarisations': ['XX', 'XY', 'YX', 'YY'], 'type': 'float', 'bits': 32, 'writer': 'standard', 'writer_version': '2.2.0', 'complex': True}, 'files': ['stokes/SAP0/CS003HBA1/L773569_SAP000_B005_S0_P000_bf.h5', 'stokes/SAP0/RS106HBA/L773569_SAP000_B046_S0_P000_bf.h5']}
             feedback_doc = feedback_template.add_defaults_to_json_object_for_schema(feedback_doc)
 
@@ -688,10 +688,10 @@ class SIPadapterTest(unittest.TestCase):
         """
 
         # create obs subtask
-        subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+        subtask_template = models.SubtaskTemplate.get_latest(name='observation control')
         specifications_doc = get_default_json_object_for_schema(subtask_template.schema)
         specifications_doc['stations']['filter'] = "HBA_210_250"
-        feedback_template = models.DataproductFeedbackTemplate.objects.get(name='feedback')
+        feedback_template = models.DataproductFeedbackTemplate.get_latest(name='feedback')
         feedback_doc = {'percentage_written': 100, 'frequency': {'subbands': [156], 'central_frequencies': [33593750.0], 'channel_width': 6103.515625, 'channels_per_subband': 32}, 'time': {'start_time': '2013-02-16T17:00:00', 'duration': 5.02732992172, 'sample_width': 2.00278016}, 'antennas': {'set': 'HBA_DUAL', 'fields': [{'type': 'HBA', 'field': 'HBA0', 'station': 'CS001'}, {'type': 'HBA', 'field': 'HBA1', 'station': 'CS001'}]}, 'target': {'pointing': {'angle1': 0, 'angle2': 0, 'direction_type': 'J2000', "target": "target1"}}, 'samples': {'polarisations': ['XX', 'XY', 'YX', 'YY'], 'type': 'float', 'bits': 32, 'writer': 'standard', 'writer_version': '2.2.0', 'complex': True}, '$schema': 'http://127.0.0.1:8001/api/schemas/dataproductfeedbacktemplate/feedback/1#'}
         feedback_doc = feedback_template.add_defaults_to_json_object_for_schema(feedback_doc)
         for dp in specifications_doc['stations']['digital_pointings']:
@@ -702,12 +702,12 @@ class SIPadapterTest(unittest.TestCase):
         subtask_output = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=subtask))
 
         # Create SAP
-        sap_template = models.SAPTemplate.objects.get(name="SAP")
+        sap_template = models.SAPTemplate.get_latest(name="SAP")
         specifications_doc = get_default_json_object_for_schema(sap_template.schema)
         sap = models.SAP.objects.create(specifications_doc=specifications_doc, specifications_template=sap_template)
         sap.save()
 
-        dp_spec_template = models.DataproductSpecificationsTemplate.objects.get(name='visibilities', version=1)
+        dp_spec_template = models.DataproductSpecificationsTemplate.get_latest(name='visibilities')
 
         # Create a bunch of related Dataproducts (observation output, pipeline input)
         related_dataproducts = []
@@ -728,9 +728,9 @@ class SIPadapterTest(unittest.TestCase):
         set_subtask_state_following_allowed_transitions(subtask, 'finished')
 
         # create pipeline subtask
-        subtask_template = models.SubtaskTemplate.objects.get(name='preprocessing pipeline')
+        subtask_template = models.SubtaskTemplate.get_latest(name='preprocessing pipeline')
         specifications_doc = get_default_json_object_for_schema(subtask_template.schema)
-        feedback_template = models.DataproductFeedbackTemplate.objects.get(name='feedback')
+        feedback_template = models.DataproductFeedbackTemplate.get_latest(name='feedback')
         feedback_doc = {'percentage_written': 100, 'frequency': {'subbands': [156], 'central_frequencies': [33593750.0], 'channel_width': 6103.515625, 'channels_per_subband': 32}, 'time': {'start_time': '2013-02-16T17:00:00', 'duration': 5.02732992172, 'sample_width': 2.00278016}, 'antennas': {'set': 'HBA_DUAL', 'fields': [{'type': 'HBA', 'field': 'HBA0', 'station': 'CS001'}, {'type': 'HBA', 'field': 'HBA1', 'station': 'CS001'}]}, 'target': {'pointing': {'angle1': 0, 'angle2': 0, 'direction_type': 'J2000', "target": "target1"}}, 'samples': {'polarisations': ['XX', 'XY', 'YX', 'YY'], 'type': 'float', 'bits': 32, 'writer': 'standard', 'writer_version': '2.2.0', 'complex': True} }
         feedback_doc = feedback_template.add_defaults_to_json_object_for_schema(feedback_doc)
 
diff --git a/SAS/TMSS/backend/test/t_feedback.py b/SAS/TMSS/backend/test/t_feedback.py
index a5186b0dbb6dec549764dc0675dbc2c3c99f928f..15e36b577953d6777aaae14a8aad7c8d8a5c4fbb 100755
--- a/SAS/TMSS/backend/test/t_feedback.py
+++ b/SAS/TMSS/backend/test/t_feedback.py
@@ -496,18 +496,18 @@ feedback_version=03.01.00
 
 
     def test_generate_dataproduct_feedback_from_subtask_feedback_and_set_finished_fails_on_incomplete_feedback(self):
-        subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.objects.get(name='observation control'))
+        subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.get_version_or_latest(name='observation control'))
         subtask_obs:models.Subtask = models.Subtask.objects.create(**subtask_data)
         set_subtask_state_following_allowed_transitions(subtask_obs, 'finishing')
         subtask_obs_output = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=subtask_obs))
 
-        subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.objects.get(name='preprocessing pipeline'))
+        subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.get_version_or_latest(name='preprocessing pipeline'))
         subtask_pipe: models.Subtask = models.Subtask.objects.create(**subtask_data)
         set_subtask_state_following_allowed_transitions(subtask_pipe, 'finishing')
         subtask_pipe_output = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=subtask_pipe))
 
         test_dir = "/tmp/test/data/%s" % uuid.uuid4()
-        empty_feedback_template = models.DataproductFeedbackTemplate.objects.get(name='empty')
+        empty_feedback_template = models.DataproductFeedbackTemplate.get_version_or_latest(name='empty')
         dataproduct_obs_out1:models.Dataproduct = models.Dataproduct.objects.create(**Dataproduct_test_data(filename='L220133_SAP000_SB000_uv.MS', directory=test_dir, producer=subtask_obs_output, feedback_template=empty_feedback_template))
         dataproduct_obs_out2: models.Dataproduct = models.Dataproduct.objects.create(**Dataproduct_test_data(filename='L220133_SAP000_SB001_uv.MS', directory=test_dir, producer=subtask_obs_output, feedback_template=empty_feedback_template))
         dataproduct_pipe_out1: models.Dataproduct = models.Dataproduct.objects.create(**Dataproduct_test_data(filename='L99307_SB000_uv.dppp.MS', directory=test_dir, producer=subtask_pipe_output, feedback_template=empty_feedback_template))
@@ -529,17 +529,17 @@ feedback_version=03.01.00
         self.assertFalse(subtask_pipe.is_feedback_complete)
 
     def test_generate_dataproduct_feedback_from_subtask_feedback_and_set_finished(self):
-        subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.objects.get(name='observation control'))
+        subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.get_version_or_latest(name='observation control'))
         subtask_obs:models.Subtask = models.Subtask.objects.create(**subtask_data)
         set_subtask_state_following_allowed_transitions(subtask_obs, 'finishing')
         subtask_obs_output = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=subtask_obs))
 
-        subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.objects.get(name='preprocessing pipeline'))
+        subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.get_version_or_latest(name='preprocessing pipeline'))
         subtask_pipe: models.Subtask = models.Subtask.objects.create(**subtask_data)
         set_subtask_state_following_allowed_transitions(subtask_pipe, 'finishing')
         subtask_pipe_output = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=subtask_pipe))
 
-        empty_feedback_template = models.DataproductFeedbackTemplate.objects.get(name='empty')
+        empty_feedback_template = models.DataproductFeedbackTemplate.get_version_or_latest(name='empty')
         dataproduct_obs_out1:models.Dataproduct = models.Dataproduct.objects.create(**Dataproduct_test_data(filename='L220133_SAP000_SB000_uv.MS', producer=subtask_obs_output, feedback_template=empty_feedback_template))
         dataproduct_obs_out2: models.Dataproduct = models.Dataproduct.objects.create(**Dataproduct_test_data(filename='L220133_SAP000_SB001_uv.MS', producer=subtask_obs_output, feedback_template=empty_feedback_template))
         dataproduct_pipe_out1: models.Dataproduct = models.Dataproduct.objects.create(**Dataproduct_test_data(filename='L99307_SB000_uv.dppp.MS', producer=subtask_pipe_output, feedback_template=empty_feedback_template))
diff --git a/SAS/TMSS/backend/test/t_observation_strategies_specification_and_scheduling_test.py b/SAS/TMSS/backend/test/t_observation_strategies_specification_and_scheduling_test.py
index 0abf95145411a696533039f17e55befe4ed4b793..3580dd22af33e0822fc7bb9215d11cfb1596e4e7 100755
--- a/SAS/TMSS/backend/test/t_observation_strategies_specification_and_scheduling_test.py
+++ b/SAS/TMSS/backend/test/t_observation_strategies_specification_and_scheduling_test.py
@@ -109,7 +109,7 @@ class TestObservationStrategiesSpecificationAndScheduling(unittest.TestCase):
         observing_strategy_templates = self.tmss_client.get_path_as_json_object('scheduling_unit_observing_strategy_template')
         self.assertGreater(len(observing_strategy_templates), 0)
 
-        uc1_strategy_template = next(ost for ost in observing_strategy_templates if ost['name']=='LoTSS Observing strategy')
+        uc1_strategy_template = next(ost for ost in observing_strategy_templates if ost['name']=='IM HBA LoTSS - 2 Beams')
         self.assertIsNotNone(uc1_strategy_template)
 
         scheduling_unit_draft = self.tmss_client.create_scheduling_unit_draft_from_strategy_template(uc1_strategy_template['id'], self.scheduling_set['id'])
@@ -396,7 +396,7 @@ class TestObservationStrategiesSpecificationAndScheduling(unittest.TestCase):
             set_subtask_state_following_allowed_transitions(subtask['id'], 'finished')
         self.check_statuses(obs_subtask['id'], "finished", "finished", "finished")
 
-    @unittest.skip("TODO: fix test once the 'IM LBA Survey Strategy - 3 Beams' strategy is fully approved and checked")
+    @unittest.skip("TODO: fix test once the 'IM LBA Survey - 3 Beams' strategy is fully approved and checked")
     def test_lba_survey(self):
         def check_parset(obs_subtask):
             # todo: check that these values make sense!
@@ -431,7 +431,7 @@ class TestObservationStrategiesSpecificationAndScheduling(unittest.TestCase):
         observing_strategy_templates = self.tmss_client.get_path_as_json_object('scheduling_unit_observing_strategy_template')
         self.assertGreater(len(observing_strategy_templates), 0)
 
-        uc1_strategy_template = next(ost for ost in observing_strategy_templates if ost['name'] == 'IM LBA Survey Strategy - 3 Beams')
+        uc1_strategy_template = next(ost for ost in observing_strategy_templates if ost['name'] == 'IM LBA Survey - 3 Beams')
         self.assertIsNotNone(uc1_strategy_template)
 
         scheduling_unit_draft = self.tmss_client.create_scheduling_unit_draft_from_strategy_template(
diff --git a/SAS/TMSS/backend/test/t_reports.py b/SAS/TMSS/backend/test/t_reports.py
index ce2e8ab1a0c8e2b2eced6449210773e9da6e9bcd..259a3e36f5b1ad3dd2b36f7bdefefed0334729a8 100755
--- a/SAS/TMSS/backend/test/t_reports.py
+++ b/SAS/TMSS/backend/test/t_reports.py
@@ -116,7 +116,7 @@ class ReportTest(unittest.TestCase):
         Help method to add reservations for testing.
         """
         # Create generic and 'stand-alone' reservations
-        reservation_template = models.ReservationTemplate.objects.get(name="reservation", version=1)
+        reservation_template = models.ReservationTemplate.get_version_or_latest(name="reservation", version=1)
         reservation_template_spec = get_default_json_object_for_schema(reservation_template.schema)
 
         # reservation_template_spec['activity']['type'] is set to 'maintanance' by default
@@ -185,11 +185,11 @@ class ReportTest(unittest.TestCase):
         Help method to create a SUB with an observation with a default duration of 600s set to finished.
         """
         scheduling_set = models.SchedulingSet.objects.create(**SchedulingSet_test_data(project=project))
-        su_spec_template = models.SchedulingUnitTemplate.objects.get(name='scheduling unit', version=1)
+        su_spec_template = models.SchedulingUnitTemplate.get_version_or_latest(name='scheduling unit', version=1)
         su_draft = models.SchedulingUnitDraft.objects.create(scheduling_set=scheduling_set,
                                                              specifications_template=su_spec_template,
                                                              ingest_permission_required=False)
-        obs_task_template = models.TaskTemplate.objects.get(name='target observation', version=1)
+        obs_task_template = models.TaskTemplate.get_version_or_latest(name='target observation', version=1)
         obs_specifications_doc = obs_task_template.get_default_json_document_for_schema()
         obs_specifications_doc['duration'] = duration
         obs_specifications_doc['station_configuration']['SAPs'][0]['subbands'] = [0, 1]
@@ -234,8 +234,8 @@ class ReportTest(unittest.TestCase):
 
         # Create four SUBs and respectively set their states to: 'finished' x2 (so we can create dataproducts, compare
         # their sizes, and have a successful and a failed SUBs), 'cancelled' and 'defined' (which means not cancelled).
-        su_spec_template = models.SchedulingUnitTemplate.objects.get(name='scheduling unit', version=1)
-        obs_task_template = models.TaskTemplate.objects.get(name='target observation', version=1)
+        su_spec_template = models.SchedulingUnitTemplate.get_version_or_latest(name='scheduling unit', version=1)
+        obs_task_template = models.TaskTemplate.get_version_or_latest(name='target observation', version=1)
         obs_specifications_doc = obs_task_template.get_default_json_document_for_schema()
         obs_specifications_doc['duration'] = 600
         obs_specifications_doc['station_configuration']['SAPs'][0]['subbands'] = [0, 1]
@@ -247,8 +247,8 @@ class ReportTest(unittest.TestCase):
         if project.name == 'commissioning':
             obs_specifications_doc['station_configuration']['station_groups'][0]['stations'] = ['CS011', 'CS013', 'CS017']
 
-        ingest_task_template = models.TaskTemplate.objects.get(name='ingest', version=1)
-        pipeline_task_template = models.TaskTemplate.objects.get(name='preprocessing pipeline', version=1)
+        ingest_task_template = models.TaskTemplate.get_version_or_latest(name='ingest', version=1)
+        pipeline_task_template = models.TaskTemplate.get_version_or_latest(name='preprocessing pipeline', version=1)
 
         for i in range(5):  # Create five SUBs and set them to be respectively: successful, failed, cancelled, not cancelled and unschedulable.
             # Create an obs-ingest pair for each of the five SUBs
@@ -265,7 +265,7 @@ class ReportTest(unittest.TestCase):
                                                                 specifications_doc=ingest_task_template.get_default_json_document_for_schema(),
                                                                 specifications_template=ingest_task_template)
 
-            task_rel_sel_template = models.TaskRelationSelectionTemplate.objects.get(name='all', version=1)
+            task_rel_sel_template = models.TaskRelationSelectionTemplate.get_version_or_latest(name='all', version=1)
             models.TaskRelationDraft.objects.create(producer=obs_task_draft,
                                                     consumer=ingest_task_draft,
                                                     output_role=obs_task_template.connector_types.first(),
@@ -284,7 +284,7 @@ class ReportTest(unittest.TestCase):
                                                                       scheduling_unit_draft=su_draft,
                                                                       specifications_doc=pipeline_task_template.get_default_json_document_for_schema(),
                                                                       specifications_template=pipeline_task_template)
-                task_rel_sel_template = models.TaskRelationSelectionTemplate.objects.get(name='all', version=1)
+                task_rel_sel_template = models.TaskRelationSelectionTemplate.get_version_or_latest(name='all', version=1)
                 models.TaskRelationDraft.objects.create(producer=obs_task_draft,
                                                         consumer=pipeline_task_draft,
                                                         output_role=obs_task_template.connector_types.first(),
diff --git a/SAS/TMSS/backend/test/t_reservations.py b/SAS/TMSS/backend/test/t_reservations.py
index a46edffb7c090e2773b6f9181f2852d2b8ab2f84..97da8f1e845a7acbfd03443790882f24e1a6b466 100755
--- a/SAS/TMSS/backend/test/t_reservations.py
+++ b/SAS/TMSS/backend/test/t_reservations.py
@@ -68,7 +68,7 @@ class TestStationReservations(unittest.TestCase):
         """
         Create a station reservation with given list of stations, start_time and stop_time
         """
-        reservation_template = models.ReservationTemplate.objects.get(name="reservation")
+        reservation_template = models.ReservationTemplate.get_version_or_latest(name="reservation")
         reservation_template_spec = get_default_json_object_for_schema(reservation_template.schema)
         reservation_template_spec["resources"] = {"stations": lst_stations }
         res = models.Reservation.objects.create(name="Station Reservation %s" % additional_name,
@@ -83,7 +83,7 @@ class TestStationReservations(unittest.TestCase):
         Check that creating 'default' reservation with no additional station reservation added, we still can
         call 'get_reserved_stations_in_timewindow' and it will return an empty list
         """
-        reservation_template = models.ReservationTemplate.objects.get(name="reservation")
+        reservation_template = models.ReservationTemplate.get_version_or_latest(name="reservation")
         reservation_template_spec = get_default_json_object_for_schema(reservation_template.schema)
         res = models.Reservation.objects.create(name="AnyReservation",
                                    description="Reservation of something else",
@@ -248,13 +248,13 @@ class TestStationReservations(unittest.TestCase):
     def test_reservation_is_blocked_by_active_observation_using_same_station(self):
 
         # create observation subtask in started state
-        subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+        subtask_template = models.SubtaskTemplate.get_version_or_latest(name='observation control')
         spec = get_default_json_object_for_schema(subtask_template.schema)
         spec['stations']['station_list'] = ['CS001', 'RS205']
-        task_template = models.TaskTemplate.objects.get(name='target observation')
+        task_template = models.TaskTemplate.get_version_or_latest(name='target observation')
         task_spec = get_default_json_object_for_schema(task_template.schema)
         task_spec['station_groups'] = [{'stations': ['CS001', 'RS205'], 'max_nr_missing': 0}]
-        scheduling_unit_blueprint = models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprint_test_data(specifications_template=models.SchedulingUnitTemplate.objects.get(name='scheduling unit')))
+        scheduling_unit_blueprint = models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprint_test_data(specifications_template=models.SchedulingUnitTemplate.get_version_or_latest(name='scheduling unit')))
         task_blueprint = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(specifications_template=task_template, scheduling_unit_blueprint=scheduling_unit_blueprint, specifications_doc=task_spec))
         subtask = models.Subtask.objects.create(**Subtask_test_data(subtask_template=subtask_template, specifications_doc=spec, task_blueprint=task_blueprint,
                                                                     scheduled_start_time=datetime(2020, 1, 1, 10, 0, 0), scheduled_stop_time=datetime(2020, 1, 1, 14, 0, 0)))
@@ -311,7 +311,7 @@ class CreationFromReservationStrategyTemplate(unittest.TestCase):
         """
         Check that reservations from the reservation strategy can be created with api
         """
-        strategy_template = models.ReservationStrategyTemplate.objects.get(name="Regular station maintenance")
+        strategy_template = models.ReservationStrategyTemplate.get_version_or_latest(name="Regular station maintenance")
 
         reservation_spec = add_defaults_to_json_object_for_schema(strategy_template.template,
                                                                   strategy_template.reservation_template.schema)
@@ -342,7 +342,7 @@ class CreationFromReservationStrategyTemplate(unittest.TestCase):
         Check that reservations from the reservation strategy results in an Exception due to wrong
         station assignment
         """
-        strategy_template = models.ReservationStrategyTemplate.objects.get(name="Regular station maintenance")
+        strategy_template = models.ReservationStrategyTemplate.get_version_or_latest(name="Regular station maintenance")
         strategy_template.template['resources']['stations'] = ['CS999']
         # using ValidationError seem not  to work?
         with self.assertRaises(Exception) as context:
@@ -361,7 +361,7 @@ class ReservationTest(unittest.TestCase):
         """
         Check that creating reservation with results in SchemaValidationException due to wrong station assignment
         """
-        reservation_template = models.ReservationTemplate.objects.get(pk=1)
+        reservation_template = models.ReservationTemplate.get_version_or_latest('reservation')
         reservation_spec = get_default_json_object_for_schema(reservation_template.schema)
         reservation_spec['resources']['stations'] = ['CS999']
         with self.assertRaises(SchemaValidationException) as context:
diff --git a/SAS/TMSS/backend/test/t_scheduling.py b/SAS/TMSS/backend/test/t_scheduling.py
index 28c09859997f2b81a4905d79a609a86f728f08ff..7ab5bf976afbfcdfb903504d3746de8a5e3c8d4e 100755
--- a/SAS/TMSS/backend/test/t_scheduling.py
+++ b/SAS/TMSS/backend/test/t_scheduling.py
@@ -88,8 +88,8 @@ def create_subtask_object_for_testing(subtask_type_value, subtask_state_value):
     as string (no object)
     For these testcases 'preprocessing pipeline' and 'observation control' is relevant
     """
-    task_blueprint = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(specifications_template=models.TaskTemplate.objects.get(name='target observation' if subtask_type_value=='observation' else 'preprocessing pipeline')))
-    subtask_template_obj = models.SubtaskTemplate.objects.get(name='observation control' if subtask_type_value=='observation' else 'preprocessing pipeline')
+    task_blueprint = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(specifications_template=models.TaskTemplate.get_version_or_latest(name='target observation' if subtask_type_value=='observation' else 'preprocessing pipeline')))
+    subtask_template_obj = models.SubtaskTemplate.get_version_or_latest(name='observation control' if subtask_type_value=='observation' else 'preprocessing pipeline')
     subtask_data = Subtask_test_data(subtask_template=subtask_template_obj, task_blueprint=task_blueprint)
     subtask = models.Subtask.objects.create(**subtask_data)
     if subtask.state.value != subtask_state_value:
@@ -450,7 +450,7 @@ class SchedulingTest(unittest.TestCase):
             obs_subtask = test_data_creator.post_data_and_get_response_as_json_object(obs_subtask_data, '/subtask/')
             obs_subtask_output_url = test_data_creator.post_data_and_get_url(test_data_creator.SubtaskOutput(subtask_url=obs_subtask['url']), '/subtask_output/')
 
-            dp_spec_template = client.get_dataproduct_specifications_template("visibilities", 1)
+            dp_spec_template = client.get_dataproduct_specifications_template("visibilities")
             test_data_creator.post_data_and_get_url(test_data_creator.Dataproduct(**dataproduct_properties,
                                                                                   specifications_template_url=dp_spec_template['url'],
                                                                                   subtask_output_url=obs_subtask_output_url), '/dataproduct/')
@@ -471,7 +471,7 @@ class SchedulingTest(unittest.TestCase):
             pipe_subtask = test_data_creator.post_data_and_get_response_as_json_object(pipe_subtask_data, '/subtask/')
 
             # ...and connect it to the observation
-            task_relation_selection_template_url = client.get_path_as_json_object('/task_relation_selection_template?name=all&version=1')[0]['url']
+            task_relation_selection_template_url = client.get_path_as_json_object('/task_relation_selection_template?name=all')[0]['url']
             test_data_creator.post_data_and_get_url(test_data_creator.SubtaskInput(subtask_url=pipe_subtask['url'], subtask_output_url=obs_subtask_output_url, task_relation_selection_template_url=task_relation_selection_template_url), '/subtask_input/')
             test_data_creator.post_data_and_get_url(test_data_creator.SubtaskOutput(subtask_url=pipe_subtask['url']), '/subtask_output/')
 
@@ -600,7 +600,7 @@ class SchedulingTest(unittest.TestCase):
             obs_subtask_id = obs_subtask['id']
             obs_subtask_output_url = client.get_path_as_json_object('/subtask_output?subtask=%s'%obs_subtask_id)[0]['url']
 
-            dp_spec_template_url = client.get_path_as_json_object('/dataproduct_specifications_template?name=visibilities&version=1')[0]['url']
+            dp_spec_template_url = client.get_path_as_json_object('/dataproduct_specifications_template?name=visibilities')[0]['url']
             test_data_creator.post_data_and_get_url(test_data_creator.Dataproduct(filename="L%s_SB000.MS"%obs_subtask['id'],
                                                                                   specifications_template_url=dp_spec_template_url,
                                                                                   specifications_doc={"sap": "target0", "subband": 0},
@@ -618,7 +618,7 @@ class SchedulingTest(unittest.TestCase):
             ingest_subtask = test_data_creator.post_data_and_get_response_as_json_object(ingest_subtask_data, '/subtask/')
 
             # ...and connect it to the observation
-            task_relation_selection_template_url = client.get_path_as_json_object('/task_relation_selection_template?name=all&version=1')[0]['url']
+            task_relation_selection_template_url = client.get_path_as_json_object('/task_relation_selection_template?name=all')[0]['url']
             test_data_creator.post_data_and_get_url(test_data_creator.SubtaskInput(subtask_url=ingest_subtask['url'], subtask_output_url=obs_subtask_output_url, task_relation_selection_template_url=task_relation_selection_template_url), '/subtask_input/')
             test_data_creator.post_data_and_get_url(test_data_creator.SubtaskOutput(subtask_url=ingest_subtask['url']), '/subtask_output/')  # our subtask here has only one known related task
 
@@ -674,7 +674,7 @@ class SchedulingTest(unittest.TestCase):
                                                           "input": { "role": "any", "datatype": "visibilities", "dataformat": "MeasurementSet"},
                                                           "output": { "role": "correlator", "datatype": "visibilities", "dataformat": "MeasurementSet"},
                                                           "selection_doc": {},
-                                                          "selection_template": "all" })
+                                                          "selection_template": {"name": "all"} })
 
             # submit
             scheduling_unit_draft_data = test_data_creator.SchedulingUnitDraft(template_url=scheduling_unit_template['url'],
@@ -737,14 +737,14 @@ class SubtaskInputOutputTest(unittest.TestCase):
         obs_out2 = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=obs_st))
 
         #   create connected pipeline subtask and inputs, specify input filtering
-        trelsel_template = models.TaskRelationSelectionTemplate.objects.get(name='SAP', version=1)
+        trelsel_template = models.TaskRelationSelectionTemplate.get_version_or_latest(name='SAP', version=1)
         pipe_st = create_subtask_object_for_testing('pipeline', 'defined')
         pipe_out = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=pipe_st)) # required by scheduling function
         pipe_in1 = models.SubtaskInput.objects.create(**SubtaskInput_test_data(subtask=pipe_st, producer=obs_out1, selection_template=trelsel_template,  selection_doc={'sap': ['target0']}))
         pipe_in2 = models.SubtaskInput.objects.create(**SubtaskInput_test_data(subtask=pipe_st, producer=obs_out2, selection_template=trelsel_template, selection_doc={'sap': ['target1']}))
 
         #   create obs output dataproducts with specs we can filter on
-        dp_spec_template = models.DataproductSpecificationsTemplate.objects.get(name='visibilities', version=1)
+        dp_spec_template = models.DataproductSpecificationsTemplate.get_version_or_latest(name='visibilities')
         dp1_1 = models.Dataproduct.objects.create(**Dataproduct_test_data(producer=obs_out1, specifications_template=dp_spec_template, specifications_doc={'sap': 'target0', 'subband': 0}))
         dp1_2 = models.Dataproduct.objects.create(**Dataproduct_test_data(producer=obs_out1, specifications_template=dp_spec_template, specifications_doc={'sap': 'target1', 'subband': 0}))
         dp1_3 = models.Dataproduct.objects.create(**Dataproduct_test_data(producer=obs_out1, specifications_template=dp_spec_template, specifications_doc={'sap': 'target0', 'subband': 1}))
@@ -772,9 +772,9 @@ class SubtaskInputOutputTest(unittest.TestCase):
         # Setup: create a SchedulingUnitDraft/Blueprint with a BF Obs, Pulp, and Ingest
         parent_set = models.SchedulingSet.objects.create(**SchedulingSet_test_data())
         su_draft = models.SchedulingUnitDraft.objects.create(scheduling_set=parent_set,
-                                                             specifications_template=models.SchedulingUnitTemplate.objects.get(name='scheduling unit', version=1))
+                                                             specifications_template=models.SchedulingUnitTemplate.get_version_or_latest(name='scheduling unit', version=1))
 
-        obs_task_template = models.TaskTemplate.objects.get(name='beamforming observation', version=1)
+        obs_task_template = models.TaskTemplate.get_version_or_latest(name='beamforming observation', version=1)
         obs_specifications_doc = obs_task_template.get_default_json_document_for_schema()
         obs_specifications_doc['station_configuration']['SAPs'][0]['subbands'] = [0,1,2,3]
         obs_specifications_doc['beamformer']['pipelines'][0]['flys eye']['enabled']= True
@@ -783,7 +783,7 @@ class SubtaskInputOutputTest(unittest.TestCase):
                                                          specifications_template=obs_task_template,
                                                          specifications_doc=obs_specifications_doc)
 
-        pulp_task_template = models.TaskTemplate.objects.get(name='pulsar pipeline', version=1)
+        pulp_task_template = models.TaskTemplate.get_version_or_latest(name='pulsar pipeline', version=1)
         pulp_task_draft = models.TaskDraft.objects.create(name='pulp',
                                                           scheduling_unit_draft=su_draft,
                                                           specifications_template=pulp_task_template,
@@ -791,7 +791,7 @@ class SubtaskInputOutputTest(unittest.TestCase):
 
         # connect the obs and the pulp pipeline
         # it's a single relation of beamformed timeseries data
-        trsel_template = models.TaskRelationSelectionTemplate.objects.get(name='all', version=1)
+        trsel_template = models.TaskRelationSelectionTemplate.get_version_or_latest(name='all', version=1)
         trsel_obs_pulp_draft = models.TaskRelationDraft.objects.create(producer=obs_task_draft,
                                                                        consumer=pulp_task_draft,
                                                                        output_role=obs_task_template.connector_types.get(iotype__value=models.IOType.Choices.OUTPUT.value,
@@ -805,7 +805,7 @@ class SubtaskInputOutputTest(unittest.TestCase):
                                                                        selection_template=trsel_template,
                                                                        selection_doc=trsel_template.get_default_json_document_for_schema())
 
-        ingest_task_template = models.TaskTemplate.objects.get(name='ingest', version=1)
+        ingest_task_template = models.TaskTemplate.get_version_or_latest(name='ingest', version=1)
         ingest_task_draft = models.TaskDraft.objects.create(name='ingest',
                                                             scheduling_unit_draft=su_draft,
                                                             specifications_template=ingest_task_template,
@@ -978,7 +978,7 @@ class TestWithUC1Specifications(unittest.TestCase):
         models.Reservation.objects.all().delete()
         test_data_creator.wipe_cache()
 
-        strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
 
         scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(
                                    name="Test Scheduling Unit UC1",
@@ -1058,7 +1058,8 @@ class TestWithUC1Specifications(unittest.TestCase):
             "Pipeline target1":         ["2020-11-01 18:30:00", "2020-11-01 18:35:00"],
             "Pipeline target2":         ["2020-11-01 18:40:00", "2020-11-01 18:45:00"],
             "Calibrator Observation 2": ["2020-11-01 19:00:00", "2020-11-01 19:20:00"],
-            "Calibrator Pipeline 2":    ["2020-11-01 19:30:00", "2020-11-01 19:40:00"]
+            "Calibrator Pipeline 1":    ["2020-11-01 19:30:00", "2020-11-01 19:40:00"],
+            "Ingest":                   ["2020-11-01 19:45:00", "2020-11-01 19:50:00"]
         }
         # Set time_schedule,
         for name, times in test_timeschedule.items():
diff --git a/SAS/TMSS/backend/test/t_scheduling_units.py b/SAS/TMSS/backend/test/t_scheduling_units.py
index 156e902b5d0292f37bde4e3559d78e184c2fcc1a..fa2758972dcba2ed2b711dc923e76bec1301b61f 100644
--- a/SAS/TMSS/backend/test/t_scheduling_units.py
+++ b/SAS/TMSS/backend/test/t_scheduling_units.py
@@ -30,7 +30,7 @@ logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=loggin
 from lofar.common.test_utils import exit_with_skipped_code_if_skip_integration_tests
 exit_with_skipped_code_if_skip_integration_tests()
 
-from lofar.common.json_utils import get_default_json_object_for_schema, add_defaults_to_json_object_for_schema
+from lofar.common.json_utils import get_default_json_object_for_schema, add_defaults_to_json_object_for_schema, without_schema_property
 
 
 # Do Mandatory setup step:
@@ -58,7 +58,7 @@ from lofar.sas.tmss.tmss.exceptions import SchemaValidationException
 
 import requests
 
-from lofar.sas.tmss.tmss.tmssapp.tasks import create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft, create_scheduling_unit_blueprint_from_scheduling_unit_draft, update_task_blueprint_graph_from_draft, update_task_graph_from_specifications_doc
+from lofar.sas.tmss.tmss.tmssapp.tasks import create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft, create_scheduling_unit_blueprint_from_scheduling_unit_draft, update_task_blueprint_graph_from_draft, update_task_graph_from_specifications_doc, create_scheduling_unit_draft_from_observing_strategy_template, mark_task_blueprint_as_obsolete
 from lofar.sas.tmss.test.test_utils import set_subtask_state_following_allowed_transitions
 
 
@@ -82,7 +82,7 @@ class SchedulingUnitBlueprintStateTest(unittest.TestCase):
         task_data = TaskBlueprint_test_data(name="Task Observation "+str(uuid.uuid4()), scheduling_unit_blueprint=schedulingunit_blueprint)
         task_obs = models.TaskBlueprint.objects.create(**task_data)
         subtask_data = Subtask_test_data(state=models.SubtaskState.objects.get(value="defining"),
-                                         subtask_template=models.SubtaskTemplate.objects.get(name='observation control'),
+                                         subtask_template=models.SubtaskTemplate.get_version_or_latest(name='observation control'),
                                          task_blueprint=task_obs)
         subtask_obs = models.Subtask.objects.create(**subtask_data)
         subtask_obs.state = models.SubtaskState.objects.get(value="defined")
@@ -93,7 +93,7 @@ class SchedulingUnitBlueprintStateTest(unittest.TestCase):
                                             specifications_template=models.TaskTemplate.objects.filter(type=models.TaskType.Choices.PIPELINE.value).first())
         task_pipe = models.TaskBlueprint.objects.create(**task_data)
         subtask_data = Subtask_test_data(state=models.SubtaskState.objects.get(value="defining"),
-                                         subtask_template=models.SubtaskTemplate.objects.get(name='preprocessing pipeline'),
+                                         subtask_template=models.SubtaskTemplate.get_version_or_latest(name='preprocessing pipeline'),
                                          task_blueprint=task_pipe)
         subtask_pipe = models.Subtask.objects.create(**subtask_data)
         subtask_pipe.state = models.SubtaskState.objects.get(value="defined")
@@ -106,7 +106,7 @@ class SchedulingUnitBlueprintStateTest(unittest.TestCase):
         # There is no template defined for ingest yet ...but I can use preprocessing pipeline, only the template type matters
         # ....should become other thing in future but for this test does not matter
         subtask_data = Subtask_test_data(state=models.SubtaskState.objects.get(value="defining"),
-                                         subtask_template=models.SubtaskTemplate.objects.get(name='preprocessing pipeline'),
+                                         subtask_template=models.SubtaskTemplate.get_version_or_latest(name='preprocessing pipeline'),
                                          task_blueprint=task_ingest)
 
         subtask_ingest = models.Subtask.objects.create(**subtask_data)
@@ -229,6 +229,47 @@ class SchedulingUnitBlueprintStateTest(unittest.TestCase):
             # Check result
             self.assertEqual(expected_schedulingunit_status, schedulingunit_blueprint.status.value, info_msg)
 
+    def test_TMSS_1635_bugfix(self):
+        '''See https://support.astron.nl/jira/browse/TMSS-1635
+        In this test I replicate the bug by creating a schedunit from the 'IM LBA Strategy - 3 Beams', make the pipeline go to error, and check for expected state'''
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM LBA Survey - 3 Beams")
+        sudraft = create_scheduling_unit_draft_from_observing_strategy_template(strategy_template, scheduling_set=models.SchedulingSet.objects.create(**SchedulingSet_test_data()))
+        sublueprint = create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft(sudraft)
+
+        # run the observation
+        obs_task = sublueprint.task_blueprints.filter(specifications_template__type__value=models.TaskType.Choices.OBSERVATION.value).first()
+        for subtask in obs_task.subtasks.order_by('id').all():
+            set_subtask_state_following_allowed_transitions(subtask,  'finished')
+        obs_task.refresh_from_db()
+        self.assertEqual(models.TaskStatus.Choices.FINISHED.value, obs_task.status.value)
+        sublueprint.refresh_from_db()
+        self.assertEqual(models.SchedulingUnitStatus.Choices.OBSERVED.value, sublueprint.status.value)
+
+        # run all pipelines except 'Pipeline target2' (which should fail, see below)
+        pipelines = sublueprint.task_blueprints.filter(specifications_template__type__value=models.TaskType.Choices.PIPELINE.value).all()
+        pipelines_wo_tgt2 = pipelines.exclude(name='Pipeline target2').all()
+        for pipeline in pipelines_wo_tgt2:
+            subtask = pipeline.subtasks.first()
+            set_subtask_state_following_allowed_transitions(subtask,  'finished')
+            pipeline.refresh_from_db()
+            self.assertEqual(models.TaskStatus.Choices.FINISHED.value, pipeline.status.value)
+        sublueprint.refresh_from_db()
+        self.assertEqual(models.SchedulingUnitStatus.Choices.PROCESSING.value, sublueprint.status.value)
+
+        # make 'Pipeline target2' fail
+        pipeline_tgt2 = pipelines.get(name='Pipeline target2')
+        set_subtask_state_following_allowed_transitions(pipeline_tgt2.subtasks.first(), 'error')
+        pipeline_tgt2.refresh_from_db()
+        self.assertEqual(models.TaskStatus.Choices.ERROR.value, pipeline_tgt2.status.value)
+        sublueprint.refresh_from_db()
+        self.assertEqual(models.SchedulingUnitStatus.Choices.ERROR.value, sublueprint.status.value)
+
+        # now mark the ERROR 'Pipeline target2' as obsolete
+        mark_task_blueprint_as_obsolete(pipeline_tgt2)
+        pipeline_tgt2.refresh_from_db()
+        self.assertEqual(models.TaskStatus.Choices.ERROR.value, pipeline_tgt2.status.value)
+        sublueprint.refresh_from_db()
+        self.assertEqual(models.SchedulingUnitStatus.Choices.PROCESSED.value, sublueprint.status.value)
 
 
 class TestFlatStations(unittest.TestCase):
@@ -237,10 +278,10 @@ class TestFlatStations(unittest.TestCase):
     """
     def create_UC1_observation_scheduling_unit(self, name, scheduling_set):
 
-        constraints_template = models.SchedulingConstraintsTemplate.objects.get(name="constraints")
+        constraints_template = models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints")
         constraints = add_defaults_to_json_object_for_schema({}, constraints_template.schema)
 
-        uc1_strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+        uc1_strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
         scheduling_unit_spec = add_defaults_to_json_object_for_schema(uc1_strategy_template.template,
                                                                       uc1_strategy_template.scheduling_unit_template.schema)
         # limit target obs duration for demo data
@@ -323,7 +364,7 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
             selection_template = [template for template in client.get_path_as_json_object('task_relation_selection_template') if template['name']=='all'][0]
             base_specifications_doc = client.get_schedulingunit_template_default_specification(scheduling_unit_template['name'], scheduling_unit_template['version'])
             if 'scheduling_constraints_template' in base_specifications_doc:
-                base_specifications_doc['scheduling_constraints_doc'] = client.get_url_as_json_object(scheduling_constraints_template['url']+'/default')
+                base_specifications_doc['scheduling_constraints_doc'] = without_schema_property(client.get_url_as_json_object(scheduling_constraints_template['url']+'/default'))
             scheduling_unit_draft_test_data = rest_data_creator.SchedulingUnitDraft(specifications_doc=base_specifications_doc,
                                                                                     template_url=scheduling_unit_template['url'],
                                                                                     scheduling_constraints_doc=base_specifications_doc.get('scheduling_constraints_doc',{}),
@@ -340,8 +381,8 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
 
             # import a specifications_doc with a single task
             single_task_specifications_doc = copy.deepcopy(base_specifications_doc)
-            single_task_specifications_doc['tasks'] = {'Task_A': {'specifications_doc': client.get_task_template_default_specification('target observation'),
-                                                                  'specifications_template': {"name": 'target observation', "version": 1},
+            single_task_specifications_doc['tasks'] = {'Task_A': {'specifications_doc': without_schema_property(client.get_task_template_default_specification('target observation')),
+                                                                  'specifications_template': {"name": 'target observation', "version": 2},
                                                                   'description': "my task A"} }
 
             scheduling_unit_draft = client.update_task_graph_from_specifications_doc(scheduling_unit_draft['id'],
@@ -372,11 +413,11 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
 
             # import a specifications_doc with a dual task and relation
             dual_task_specifications_doc = copy.deepcopy(base_specifications_doc)
-            dual_task_specifications_doc['tasks'] = {'Task_A': {'specifications_doc': client.get_task_template_default_specification('target observation'),
-                                                                'specifications_template': {"name": 'target observation', "version": 1},
+            dual_task_specifications_doc['tasks'] = {'Task_A': {'specifications_doc': without_schema_property(client.get_task_template_default_specification('target observation')),
+                                                                'specifications_template': {"name": 'target observation', "version": 2},
                                                                 'description': "my task A"},
-                                                     'Task_B': {'specifications_doc': client.get_task_template_default_specification('ingest'),
-                                                                'specifications_template': {"name": 'ingest', "version": 1},
+                                                     'Task_B': {'specifications_doc': without_schema_property(client.get_task_template_default_specification('ingest')),
+                                                                'specifications_template': {"name": 'ingest', "version": 2},
                                                                 'description': "my task B"} }
             dual_task_specifications_doc['task_relations'] = [{ "input": { "role": "any",
                                                                            "datatype": "visibilities",
@@ -386,8 +427,8 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
                                                                             "dataformat": "MeasurementSet" },
                                                                 "producer": "Task_A",
                                                                 "consumer": "Task_B",
-                                                                "selection_doc": client.get_url_as_json_object(selection_template['url']+'/default'),
-                                                                "selection_template": "all" }]
+                                                                "selection_doc": without_schema_property(client.get_url_as_json_object(selection_template['url']+'/default')),
+                                                                "selection_template": {"name": "all", "version": 2 } }]
             scheduling_unit_draft = client.update_task_graph_from_specifications_doc(scheduling_unit_draft['id'],
                                                                                         specifications_doc=dual_task_specifications_doc)
             self.assertEqual(2, len(scheduling_unit_draft['task_drafts']))
@@ -403,8 +444,8 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
             self.assertEqual(updated_dual_task_specifications_doc, client.get_schedulingunit_draft_specifications_doc(scheduling_unit_draft_id))
 
             # check updates on task graph
-            updated_dual_task_specifications_doc['tasks']['Task_C'] = {'specifications_doc': client.get_task_template_default_specification('cleanup'),
-                                                                       'specifications_template': {"name": 'cleanup', "version": 1},
+            updated_dual_task_specifications_doc['tasks']['Task_C'] = {'specifications_doc': without_schema_property(client.get_task_template_default_specification('cleanup')),
+                                                                       'specifications_template': {"name": 'cleanup', "version": 2},
                                                                        'description': "my task C"}
             updated_dual_task_specifications_doc['task_relations'].append({ "input": { "role": "any",
                                                                                        "datatype": "visibilities",
@@ -414,8 +455,8 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
                                                                                         "dataformat": "MeasurementSet" },
                                                                             "producer": "Task_A",
                                                                             "consumer": "Task_C",
-                                                                            "selection_doc": client.get_url_as_json_object(selection_template['url']+'/default'),
-                                                                            "selection_template": "all" })
+                                                                            "selection_doc": without_schema_property(client.get_url_as_json_object(selection_template['url']+'/default')),
+                                                                            "selection_template": {"name": "all", "version": 2 } })
 
             scheduling_unit_draft = client.update_task_graph_from_specifications_doc(scheduling_unit_draft['id'],
                                                                                         specifications_doc=updated_dual_task_specifications_doc)
@@ -437,7 +478,7 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
             project = rest_data_creator.post_data_and_get_response_as_json_object(rest_data_creator.Project(auto_ingest=True), '/project/')
             scheduling_set = rest_data_creator.post_data_and_get_response_as_json_object(rest_data_creator.SchedulingSet(project_url=project['url']), '/scheduling_set/')
             strategy_templates = client.get_path_as_json_object('scheduling_unit_observing_strategy_template')
-            strategy_template = next(ost for ost in strategy_templates if ost['name'] == 'HBA single beam imaging')
+            strategy_template = next(ost for ost in strategy_templates if ost['name'] == 'IM HBA - 1 Beam')
             self.assertIsNotNone(strategy_template)
 
             # create a scheduling_unit_draft from the template...
@@ -532,10 +573,10 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
 
             specifications_doc = {
                 "tasks": { "observation": { "specifications_doc": obs_specifications_doc,
-                                            "specifications_template": {"name": "target observation", "version": 1 }},
+                                            "specifications_template": {"name": "target observation", "version": 2 }},
                            "pipeline": { "description": "my description",
                                          "specifications_doc": {},
-                                         "specifications_template": {"name": "preprocessing pipeline", "version": 1 }},
+                                         "specifications_template": {"name": "preprocessing pipeline", "version": 2 }},
                 },
                 "task_relations": [ { "input": { "role": "any",
                                                  "datatype": "visibilities",
@@ -546,7 +587,7 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
                                       "consumer": "pipeline",
                                       "producer": "observation",
                                       "selection_doc": {},
-                                      "selection_template": "all" }
+                                      "selection_template": {"name": "all", "version": 2 } }
                 ],
                 "task_scheduling_relations": []
             }
@@ -633,10 +674,10 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
 
             specifications_doc = {
                 "tasks": { "observation": { "specifications_doc": obs_specifications_doc,
-                                            "specifications_template": {"name": "target observation", "version": 1 }},
+                                            "specifications_template": {"name": "target observation", "version": 2 }},
                            "pipeline": { "description": "my description",
                                          "specifications_doc": {},
-                                         "specifications_template": {"name": "preprocessing pipeline", "version": 1 }},
+                                         "specifications_template": {"name": "preprocessing pipeline", "version": 2 }},
                 },
                 "task_relations": [ { "input": { "role": "any",
                                                  "datatype": "visibilities",
@@ -647,7 +688,7 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
                                       "consumer": "pipeline",
                                       "producer": "observation",
                                       "selection_doc": {},
-                                      "selection_template": "all" }
+                                      "selection_template": {"name": "all", "version": 2 } }
                 ],
                 "task_scheduling_relations": []
             }
@@ -701,10 +742,10 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
 
             specifications_doc = {
                 "tasks": { "observation": { "specifications_doc": obs_specifications_doc,
-                                            "specifications_template": {"name": "target observation", "version": 1 }},
+                                            "specifications_template": {"name": "target observation", "version": 2 }},
                            "pipeline": { "description": "my description",
                                          "specifications_doc": pipe_specifications_doc,
-                                         "specifications_template": {"name": "preprocessing pipeline", "version": 1}},
+                                         "specifications_template": {"name": "preprocessing pipeline", "version": 2}},
                 },
                 "task_relations": [ { "input": { "role": "any",
                                                  "datatype": "visibilities",
@@ -715,7 +756,7 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
                                       "consumer": "pipeline",
                                       "producer": "observation",
                                       "selection_doc": {},
-                                      "selection_template": "all" }
+                                      "selection_template": {"name": "all", "version": 2 } }
                 ],
                 "task_scheduling_relations": []
             }
@@ -769,9 +810,9 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
             project = rest_data_creator.post_data_and_get_response_as_json_object(rest_data_creator.Project(auto_ingest=True), '/project/')
             scheduling_set = rest_data_creator.post_data_and_get_response_as_json_object(rest_data_creator.SchedulingSet(project_url=project['url']), '/scheduling_set/')
 
-            # create IM LBA Survey Strategy - 3 Beams scheduling unit draft in the scheduling set
+            # create 'Simple Observation' scheduling unit draft in the scheduling set
             observing_strategy_templates = client.get_path_as_json_object('scheduling_unit_observing_strategy_template')
-            strategy_template = next(ost for ost in observing_strategy_templates if ost['name']=='IM LBA Survey Strategy - 3 Beams')
+            strategy_template = next(ost for ost in observing_strategy_templates if ost['name']=='Simple Observation')
             self.assertIsNotNone(strategy_template)
             scheduling_unit_draft = client.create_scheduling_unit_draft_from_strategy_template(strategy_template['id'], scheduling_set['id'])
             num_task_drafts_before = len(scheduling_unit_draft['task_drafts'])
@@ -791,8 +832,8 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
             self.assertIn("Cleanup", [task['name'] for task in scheduling_unit_blueprint['task_blueprints']])
             for task in scheduling_unit_blueprint['task_blueprints']:
                 if task['name'] == "Cleanup":
-                    self.assertEqual(len(task['produced_by']), 5)
-            self.assertEqual(num_task_relation_blueprints_before + 5, len(client.get_path_as_json_object('task_relation_blueprint')))
+                    self.assertEqual(len(task['produced_by']), 1)
+            self.assertEqual(num_task_relation_blueprints_before + 1, len(client.get_path_as_json_object('task_relation_blueprint')))
 
             # check the draft graph
             scheduling_unit_draft = client.get_schedulingunit_draft(scheduling_unit_draft['id'])
@@ -800,8 +841,8 @@ class SchedulingUnitBlueprintIndirectModificationsTestCase(unittest.TestCase):
             self.assertIn("Cleanup (Copy)", [task['name'] for task in scheduling_unit_draft['task_drafts']])
             for task in scheduling_unit_draft['task_drafts']:
                 if task['name'] == "Cleanup (Copy)":
-                    self.assertEqual(len(task['produced_by']), 5)
-            self.assertEqual(num_task_relation_drafts_before + 5, len(client.get_path_as_json_object('task_relation_draft')))
+                    self.assertEqual(len(task['produced_by']), 1)
+            self.assertEqual(num_task_relation_drafts_before + 1, len(client.get_path_as_json_object('task_relation_draft')))
 
 
 if __name__ == "__main__":
diff --git a/SAS/TMSS/backend/test/t_schemas.py b/SAS/TMSS/backend/test/t_schemas.py
index 0d1383d4899df44c7d43479d34436865781133c9..5aaa018268c5a22ab0f6f2d0e8eda60dced19b96 100755
--- a/SAS/TMSS/backend/test/t_schemas.py
+++ b/SAS/TMSS/backend/test/t_schemas.py
@@ -68,8 +68,15 @@ class TestSchemas(unittest.TestCase):
             except Exception as e:
                 raise Exception("Error while checking schema for %s name='%s' version=%s: %s" % (template.__class__.__name__, template.name, template.version, e)) from e
 
+    def test_commonschemas(self):
+        self.check_template_table(models.CommonSchemaTemplate)
+
+    def test_systemevent(self):
+        self.check_template_table(models.SystemEventTemplate)
+
     def test_subtasks(self):
         self.check_template_table(models.SubtaskTemplate)
+        self.check_template_table(models.SubtaskFeedbackTemplate)
 
     def test_dataproducts(self):
         self.check_template_table(models.DataproductSpecificationsTemplate)
diff --git a/SAS/TMSS/backend/test/t_subtask_validation.py b/SAS/TMSS/backend/test/t_subtask_validation.py
index fb3f4c5c3e858d397090b33a8c7b910d46806cc6..652fc2cc69de2393466b48f627f3853c213d2928 100755
--- a/SAS/TMSS/backend/test/t_subtask_validation.py
+++ b/SAS/TMSS/backend/test/t_subtask_validation.py
@@ -77,7 +77,7 @@ class SubtaskValidationTest(unittest.TestCase):
 
     def test_validate_correlator_schema_with_valid_specification(self):
         # fetch correlator_schema for Dupplo UC1 which should be in the initially populated database
-        subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+        subtask_template = models.SubtaskTemplate.get_version_or_latest(name='observation control')
         self.assertIsNotNone(subtask_template)
 
         specifications_doc = get_default_json_object_for_schema(subtask_template.schema)
@@ -89,7 +89,7 @@ class SubtaskValidationTest(unittest.TestCase):
 
     def test_validate_correlator_schema_with_invalid_specification(self):
         # fetch correlator_schema for Dupplo UC1 which should be in the initially populated database
-        subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+        subtask_template = models.SubtaskTemplate.get_version_or_latest(name='observation control')
         self.assertIsNotNone(subtask_template)
 
         # test with invalid json
diff --git a/SAS/TMSS/backend/test/t_subtasks.py b/SAS/TMSS/backend/test/t_subtasks.py
index db0c3753569b2d0d578bdf7396bd805d9e62fcb6..0b813a6b34ca95ceb4ed24b22f7c106a9af542a3 100755
--- a/SAS/TMSS/backend/test/t_subtasks.py
+++ b/SAS/TMSS/backend/test/t_subtasks.py
@@ -74,7 +74,7 @@ def create_task_blueprint_object_for_testing(task_template_name="target observat
     :param QA_enabled: (Optional) QA plots and file_conversion
     :return: task_blueprint_obj: Created Task Blueprint object
     """
-    task_template = models.TaskTemplate.objects.get(name=task_template_name)
+    task_template = models.TaskTemplate.get_version_or_latest(name=task_template_name)
     task_spec = task_template.add_defaults_to_json_object_for_schema(task_spec or {})
     if 'QA' in task_spec:
         task_spec["QA"]['plots']['enabled'] = QA_enabled
diff --git a/SAS/TMSS/backend/test/t_tasks.py b/SAS/TMSS/backend/test/t_tasks.py
index 6cfcfadea839a464b06005641eee895a704535d5..e2031a101f2639f81ba2bf03c9086b5cbeae8206 100755
--- a/SAS/TMSS/backend/test/t_tasks.py
+++ b/SAS/TMSS/backend/test/t_tasks.py
@@ -63,7 +63,7 @@ class CreationFromSchedulingUnitDraft(unittest.TestCase):
         Check if the name draft (specified) is equal to name blueprint (created)
         Check with REST-call if NO tasks are created
         """
-        strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
         strategy_template.template['tasks'] = {}
         strategy_template.template['task_relations'] = []
         strategy_template.template['task_scheduling_relations'] = []
@@ -95,7 +95,7 @@ class CreationFromSchedulingUnitDraft(unittest.TestCase):
         Check if NO tasks are created
         Check with REST-call if NO tasks are created
         """
-        strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
         strategy_template.template['tasks'] = {}
         strategy_template.template['task_relations'] = []
         strategy_template.template['task_scheduling_relations'] = []
@@ -119,7 +119,7 @@ class CreationFromSchedulingUnitDraft(unittest.TestCase):
         Create Task Blueprints (only)
         Check if tasks (7) are created
         """
-        strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
 
         scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(
                                    name="Test Scheduling Unit UC1",
@@ -139,7 +139,7 @@ class CreationFromSchedulingUnitDraft(unittest.TestCase):
         Check if the name draft (specified) is equal to name blueprint (created)
         Check that a blueprint was created, even though the draft has no tasks
         """
-        strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
         strategy_template.template['tasks'] = {}
         strategy_template.template['task_relations'] = []
         strategy_template.template['task_scheduling_relations'] = []
@@ -171,14 +171,14 @@ class CreationFromSchedulingUnitDraft(unittest.TestCase):
         Test if we can create multiple scheduling_unit_blueprints from one draft.
         """
         # Create a SchedulingUnitDraft from a json specifications_doc with one linked observation and pipeline.
-        specifications_template = models.SchedulingUnitTemplate.objects.get(name="scheduling unit")
+        specifications_template = models.SchedulingUnitTemplate.get_version_or_latest(name="scheduling unit")
         specifications_doc = specifications_template.get_default_json_document_for_schema()
 
-        obs_task_template = models.TaskTemplate.objects.get(name="target observation")
+        obs_task_template = models.TaskTemplate.get_version_or_latest(name="target observation")
         obs_task_doc = obs_task_template.get_default_json_document_for_schema()
         specifications_doc['tasks']['Observation'] = { 'specifications_doc': obs_task_doc, 'specifications_template': {'name': obs_task_template.name } }
 
-        pipe_task_template = models.TaskTemplate.objects.get(name="preprocessing pipeline")
+        pipe_task_template = models.TaskTemplate.get_version_or_latest(name="preprocessing pipeline")
         pipe_task_doc = pipe_task_template.get_default_json_document_for_schema()
         specifications_doc['tasks']['Pipeline'] = { 'specifications_doc': pipe_task_doc, 'specifications_template': {'name': pipe_task_template.name } }
 
@@ -190,7 +190,7 @@ class CreationFromSchedulingUnitDraft(unittest.TestCase):
                                                    'output': {'role': models.Role.Choices.CORRELATOR.value,
                                                               'datatype': models.Datatype.Choices.VISIBILITIES.value,
                                                               'dataformat': models.Dataformat.Choices.MEASUREMENTSET.value},
-                                                   'selection_template': 'all'})
+                                                   'selection_template': {'name': 'all'} })
 
         # create the scheduling_unit_draft and its tasks
         scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(
@@ -247,7 +247,7 @@ class CreationFromTaskDraft(unittest.TestCase):
         """
         Helper function to create a task object for testing
         """
-        obs_task_template = models.TaskTemplate.objects.get(name='target observation')
+        obs_task_template = models.TaskTemplate.get_version_or_latest(name='target observation')
         task_draft_data = TaskDraft_test_data(name=task_draft_name, specifications_template=obs_task_template, output_pinned=output_pinned)
         models.TaskDraft.objects.create(**task_draft_data)
 
@@ -350,7 +350,7 @@ class TaskBlueprintStateTest(unittest.TestCase):
             task_blueprint_data = TaskBlueprint_test_data(name="Task Blueprint With One Subtask")
             task_blueprint = models.TaskBlueprint.objects.create(**task_blueprint_data)
             # Create pipeline subtask related to taskblueprint
-            subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.objects.get(name='preprocessing pipeline'), task_blueprint=task_blueprint)
+            subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.get_version_or_latest(name='preprocessing pipeline'), task_blueprint=task_blueprint)
             subtask_pipe = models.Subtask.objects.create(**subtask_data)
 
             # Do the actual test
@@ -449,9 +449,9 @@ class TaskBlueprintStateTest(unittest.TestCase):
             task_blueprint_data = TaskBlueprint_test_data(name="Task Blueprint With Subtasks")
             task_blueprint = models.TaskBlueprint.objects.create(**task_blueprint_data)
             # Create observation and qa subtask related to taskblueprint
-            subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.objects.get(name='observation control'), task_blueprint=task_blueprint, primary=True)
+            subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.get_version_or_latest(name='observation control'), task_blueprint=task_blueprint, primary=True)
             subtask_obs = models.Subtask.objects.create(**subtask_data)
-            subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.objects.get(name='QA file conversion'), task_blueprint=task_blueprint, primary=False)
+            subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.get_version_or_latest(name='QA file conversion'), task_blueprint=task_blueprint, primary=False)
             subtask_qa = models.Subtask.objects.create(**subtask_data)
 
             # Do the actual test
@@ -501,11 +501,11 @@ class TaskBlueprintStateTest(unittest.TestCase):
             task_blueprint_data = TaskBlueprint_test_data(name="Task Blueprint With Subtasks")
             task_blueprint = models.TaskBlueprint.objects.create(**task_blueprint_data)
             # Create observation and qa subtasks related to taskblueprint
-            subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.objects.get(name='observation control'), task_blueprint=task_blueprint, primary=True)
+            subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.get_version_or_latest(name='observation control'), task_blueprint=task_blueprint, primary=True)
             subtask_obs1 = models.Subtask.objects.create(**subtask_data)
             subtask_data['primary'] = False
             subtask_obs2 = models.Subtask.objects.create(**subtask_data)
-            subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.objects.get(name='QA file conversion'), task_blueprint=task_blueprint, primary=False)
+            subtask_data = Subtask_test_data(subtask_template=models.SubtaskTemplate.get_version_or_latest(name='QA file conversion'), task_blueprint=task_blueprint, primary=False)
             subtask_qa1 = models.Subtask.objects.create(**subtask_data)
             subtask_qa2 = models.Subtask.objects.create(**subtask_data)
 
diff --git a/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py b/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py
index d769b57354b01923dcf6b6776d178f948beebd4c..d45ba93a06ccd0efd59e66b9e8a551f3703646d2 100755
--- a/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py
+++ b/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py
@@ -1358,7 +1358,7 @@ class SchedulingUnitDraftTestCase(unittest.TestCase):
         """
         # setup
         scheduling_set = models.SchedulingSet.objects.create(**SchedulingSet_test_data())
-        strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="LoTSS Observing strategy")
+        strategy_template = models.SchedulingUnitObservingStrategyTemplate.get_version_or_latest(name="IM HBA LoTSS - 2 Beams")
 
         from lofar.sas.tmss.tmss.tmssapp.tasks import create_scheduling_unit_draft_from_observing_strategy_template
         su_draft_1 = create_scheduling_unit_draft_from_observing_strategy_template(strategy_template, scheduling_set, name='sud1_%s' % uuid.uuid4(), description="<none>",
@@ -3172,7 +3172,7 @@ class PinningTestCase(unittest.TestCase):
         ''''''
         tmss_test_env.delete_scheduling_unit_drafts_cascade()
 
-        su_template = models.SchedulingUnitTemplate.objects.get(name='scheduling unit', version=1)
+        su_template = models.SchedulingUnitTemplate.get_version_or_latest(name='scheduling unit', version=1)
         self.su_specification_doc = su_template.get_default_json_document_for_schema()
         self.su_specification_doc['tasks'] = { 'obs1': {'specifications_template': {'name': 'target observation'}},
                                                'obs2': {'specifications_template': {'name': 'target observation'}}}
diff --git a/SAS/TMSS/backend/test/t_tmssapp_specification_django_API.py b/SAS/TMSS/backend/test/t_tmssapp_specification_django_API.py
index b17472d4cfc54122d1053d20ea0ea93a87ead351..6f1b44b997a6c9960d0aef53dd942bf0432934f3 100755
--- a/SAS/TMSS/backend/test/t_tmssapp_specification_django_API.py
+++ b/SAS/TMSS/backend/test/t_tmssapp_specification_django_API.py
@@ -197,11 +197,11 @@ class TaskTemplateTest(unittest.TestCase):
         self.assertEqual(3, models.TaskTemplate.objects.filter(name=name).count())
 
         # lets request the "old" entry2 via name and version, so we can check if it is unchanged
-        entry2 = models.TaskTemplate.objects.get(name=name, version=2)
+        entry2 = models.TaskTemplate.get_version_or_latest(name=name, version=2)
         self.assertEqual(org_schema, entry2.schema)
 
         # instead there should be a new version of the template with the new schema
-        entry3 = models.TaskTemplate.objects.get(name=name, version=3)
+        entry3 = models.TaskTemplate.get_version_or_latest(name=name, version=3)
         self.assertEqual(3, entry3.version)
         self.assertEqual(new_schema, entry3.schema)
 
@@ -816,7 +816,7 @@ class SchedulingUnitBlueprintTest(unittest.TestCase):
         # setup
         project = models.Project.objects.create(**Project_test_data(can_trigger=True))
         scheduling_set = models.SchedulingSet.objects.create(**SchedulingSet_test_data(project=project))
-        constraints_template = models.SchedulingConstraintsTemplate.objects.get(name="constraints")
+        constraints_template = models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints")
         scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(**SchedulingUnitDraft_test_data(scheduling_set=scheduling_set, interrupts_telescope=True, scheduling_constraints_template=constraints_template))
         scheduling_unit_blueprint = models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprint_test_data(draft=scheduling_unit_draft))
 
diff --git a/SAS/TMSS/backend/test/test_environment.py b/SAS/TMSS/backend/test/test_environment.py
index 1a486d2720f5a4402532fb5f0236aee8b3803e58..84299968fcd668b861f0fcd04c059c0de0f87b24 100644
--- a/SAS/TMSS/backend/test/test_environment.py
+++ b/SAS/TMSS/backend/test/test_environment.py
@@ -797,7 +797,7 @@ def create_scheduling_unit_blueprint_simulator(scheduling_unit_blueprint_id: int
                                 file.write(1024 * 'a')
 
                     # create some nice default (and thus correct although not scientifically meaningful) feedback
-                    template = models.DataproductFeedbackTemplate.objects.get(name="feedback")
+                    template = models.DataproductFeedbackTemplate.get_version_or_latest(name="feedback")
                     feedback_doc = get_default_json_object_for_schema(template.schema)
                     feedback_doc['frequency']['subbands'] = [0]
                     feedback_doc['frequency']['beamlet_indices'] = [0]
@@ -817,7 +817,7 @@ def create_scheduling_unit_blueprint_simulator(scheduling_unit_blueprint_id: int
                             feedback_template = input_dp.feedback_template
                             feedback_doc = input_dp.feedback_doc
                         except models.Subtask.DoesNotExist:
-                            feedback_template = models.DataproductFeedbackTemplate.objects.get(name="empty")
+                            feedback_template = models.DataproductFeedbackTemplate.get_version_or_latest(name="empty")
                             feedback_doc = get_default_json_object_for_schema(feedback_template.schema)
 
                         output_dp.size = 1024
diff --git a/SAS/TMSS/client/lib/mains.py b/SAS/TMSS/client/lib/mains.py
index 11cb754cb1b46c571f8ada9d9a5fa8d6246795ff..dacb7f1d78b3c76de9299a56cacb925aa265e898 100644
--- a/SAS/TMSS/client/lib/mains.py
+++ b/SAS/TMSS/client/lib/mains.py
@@ -261,10 +261,12 @@ def main_submit_trigger():
             # this is a bit flacky, as it assumes that these parameters are available in the overrides dict
             dict_search_and_replace(overrides, 'angle1', args.pointing_angle1)
             dict_search_and_replace(overrides, 'angle2', args.pointing_angle2)
-            dict_search_and_replace(overrides, 'name', args.target_name)
-            if args.target_name: dict_search_and_replace(overrides, 'target', args.target_name)
             dict_search_and_replace(overrides, 'duration', args.duration)
 
+            if args.target_name:
+                dict_search_and_replace(overrides, 'target', args.target_name)
+                dict_search_and_replace(overrides, 'name', args.target_name)
+
             if args.end_before:
                 overrides['scheduling_constraints_doc']['time']['before'] = args.end_before
 
diff --git a/SAS/TMSS/client/lib/populate.py b/SAS/TMSS/client/lib/populate.py
index 80975eeeb12a3f0e472456ac60bf6c0a0769e313..098b957a6697322d8e8ca87032ecb2ecf97b2038 100644
--- a/SAS/TMSS/client/lib/populate.py
+++ b/SAS/TMSS/client/lib/populate.py
@@ -187,6 +187,12 @@ def populate_schemas(schema_dir: str=None, dbcreds_name: str=None, parallel: boo
                 # lookup the url for the referenced template...
                 referenced_template = template.pop('referenced_template')
                 response_templates = client.get_path_as_json_object(referenced_template['type']+'?name=' + referenced_template['name'] + '&version=' + str(referenced_template['version']))
+
+                if len(response_templates) != 1:
+                    logger.info("Skipping strategy template with name='%s' version='%s' it references an unknown template with name='%s' version='%s'",
+                                template['name'], template['version'], referenced_template['name'], referenced_template['version'])
+                    return
+
                 # ... and inject it in the to-be-uploaded template
                 template[referenced_template['type']] = response_templates[0]['url']
 
diff --git a/SAS/TMSS/client/lib/tmss_http_rest_client.py b/SAS/TMSS/client/lib/tmss_http_rest_client.py
index 0e34f8f96033246e8582082fadd5404a11bc665d..ced861cd358dfef6b507890eff96f413bb669fc5 100644
--- a/SAS/TMSS/client/lib/tmss_http_rest_client.py
+++ b/SAS/TMSS/client/lib/tmss_http_rest_client.py
@@ -350,6 +350,17 @@ class TMSSsession(object):
             clauses["name"] = name
         if version is not None:
             clauses["version"] = version
+        else:
+            # try to determine the latest version
+            if name is not None:
+                try:
+                    schema = self.get_path_as_json_object('/schemas/%s/%s/latest' % (template_type_name.replace('_', ''), name))
+                    if schema and 'version' in schema:
+                        clauses["version"] = schema['version']
+                except:
+                    # could not determine latest version
+                    pass
+
         result = self.get_path_as_json_object(template_type_name, clauses)
         if isinstance(result, list):
             if len(result) > 1:
@@ -645,6 +656,10 @@ class TMSSsession(object):
                 json_data['template'] = json.loads(template) if isinstance(template, str) else template
             json_data.update(**kwargs)
 
+            if json_data['state'].rstrip('/').endswith('obsolete'):
+                logger.info("Skipping upload of template with name='%s' version='%s' because its state is 'obsolete'", json_data['name'], json_data['version'])
+                return
+
             response = self.session.request(method=method.upper(), url=self.get_full_url_for_path(template_path), json=json_data)
             self._log_response(response)
 
@@ -701,4 +716,3 @@ class TMSSsession(object):
         Returns the created scheduling_unit_draft/blueprint upon success, or raises.
         Use the method get_trigger_specification_doc_for_scheduling_unit_observing_strategy_template to get a valid trigger json doc, edit it, and sumbit using this method."""
         return self.post_to_path_and_get_result_as_json_object('/submit_trigger', json_data=trigger_doc, retry_count=retry_count, retry_interval=retry_interval)
-
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
index b34997a712227a30d9ffdd61a6dc88d27517a330..86d12e4a909a0d9a919333f4ecddf7cc371def4f 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
@@ -962,8 +962,8 @@ const ScheduleService = {
     },
     getStations: async function (group) {
         try {
-            // const response = await axios.get('/api/station_groups/stations/1/dutch');
-            const response = await axios.get(`/api/station_groups/stations/1/${group}`);
+            // const response = await axios.get('/api/station_groups/stations/2/dutch');
+            const response = await axios.get(`/api/station_groups/stations/2/${group}`);
             return response.data;
         } catch (error) {
             console.error(error);
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js
index 8014f0926edbb4e590ad29fdc76f8b04033a32cd..f9aab0724bed5a135ee53b909ff9c11f3eb27124 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js
@@ -75,7 +75,7 @@ const UtilService = {
      */
     getAllStationSunTimings: async(timestamps) => {
       try {
-        let allStations = (await axios.get("/api/station_groups/stations/1/All")).data.stations;
+        let allStations = (await axios.get("/api/station_groups/stations/2/All")).data.stations;
         let allStationSuntimes = (await axios.get(`/api/util/sun_rise_and_set?stations=${allStations.join(",")}&timestamps=${timestamps}`)).data;
         return allStationSuntimes;
       } catch(error) {