diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/models/scheduling.py b/SAS/TMSS/backend/src/tmss/tmssapp/models/scheduling.py
index 9535b3c3d9732a2ae062b3186717697a5f853cd4..d5a0964b579907fdd39361dd4a17bb6218645842 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/models/scheduling.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/models/scheduling.py
@@ -61,7 +61,7 @@ class SubtaskType(AbstractChoice):
         INSPECTION = "inspection"
         QA_FILES = "qa_files" # task which creates "adder" QA h5 file(s) from a MeasurementSet of beamformed data
         QA_PLOTS = "qa_plots" # task which creates "adder" QA plots from an "adder" QA h5 file h5
-        DELETION = "deletion"
+        CLEANUP = "cleanup"
         MANUAL = 'manual'
         OTHER = 'other'
 
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-cleanup-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-cleanup-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..b0244ed9f921709d7a16176a3afe887e0b24d2a9
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-cleanup-1.json
@@ -0,0 +1,12 @@
+{
+  "$id":"http://tmss.lofar.org/api/schemas/subtasktemplate/cleanup/1#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "title":"cleanup",
+  "description":"This schema defines the parameters to setup and control a dataproducts cleanup subtask.",
+  "version":1,
+  "type": "object",
+  "properties": {
+  },
+  "required": [
+  ]
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-cleanup-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-cleanup-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..993e48bf6386e887f9ead7cb9b448e72fe7bdace
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-cleanup-1.json
@@ -0,0 +1,12 @@
+{
+  "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/cleanup/1#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "title": "cleanup",
+  "description": "This schema defines the parameters to setup a dataproduct(s) cleanup task.",
+  "version": 1,
+  "type": "object",
+  "properties": {
+  },
+  "required": [
+  ]
+}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/templates.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/templates.json
index 480d7a4abb715673befa1742ef8fedb6ac04a00f..e04153325924a66921bfba4fa888643eff78a0f4 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/templates.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/templates.json
@@ -159,11 +159,21 @@
     "template": "subtask_template",
     "type": "ingest"
   },
+  {
+    "file_name": "subtask_template-cleanup-1.json",
+    "template": "subtask_template",
+    "type": "cleanup"
+  },
   {
     "file_name": "task_template-ingest-1.json",
     "template": "task_template",
     "type": "ingest"
   },
+  {
+    "file_name": "task_template-cleanup-1.json",
+    "template": "task_template",
+    "type": "cleanup"
+  },
   {
     "file_name": "reservation_template-reservation-1.json",
     "template": "reservation_template"