diff --git a/system_test_mapping.json b/system_test_mapping.json
index 952e9961..ef750ba1 100644
--- a/system_test_mapping.json
+++ b/system_test_mapping.json
@@ -1,5 +1,86 @@
 
 {
+  "scan_custom_framework_scanning_file_scope_testing": {
+    "target": [
+      "CLI"
+    ],
+    "target_repositories": [],
+    "description": "",
+    "skip_on_environment": "",
+    "owner": "amirm@armosec.io"
+  },
+  "scan_custom_framework_scanning_cluster_scope_testing": {
+    "target": [
+      "CLI"
+    ],
+    "target_repositories": [],
+    "description": "",
+    "skip_on_environment": "",
+    "owner": "amirm@armosec.io"
+  },
+  "scan_custom_framework_scanning_cluster_and_file_scope_testing": {
+    "target": [
+      "CLI"
+    ],
+    "target_repositories": [],
+    "description": "",
+    "skip_on_environment": "",
+    "owner": "amirm@armosec.io"
+  },
+  "scan_local_list_of_files": {
+    "target": [
+      "CLI"
+    ],
+    "target_repositories": [],
+    "description": "",
+    "skip_on_environment": "",
+    "owner": "amirm@armosec.io"
+  },
+  "scan_local_file": {
+    "target": [
+      "CLI"
+    ],
+    "target_repositories": [],
+    "description": "",
+    "skip_on_environment": "",
+    "owner": "amirm@armosec.io"
+  },
+  "scan_local_glob_files": {
+    "target": [
+      "CLI"
+    ],
+    "target_repositories": [],
+    "description": "",
+    "skip_on_environment": "",
+    "owner": "amirm@armosec.io"
+  },
+  "scan_repository": {
+    "target": [
+      "CLI"
+    ],
+    "target_repositories": [],
+    "description": "",
+    "skip_on_environment": "",
+    "owner": "jonathang@armosec.io"
+  },
+  "scan_mitre": {
+    "target": [
+      "CLI"
+    ],
+    "target_repositories": [],
+    "description": "",
+    "skip_on_environment": "",
+    "owner": "amirm@armosec.io"
+  },
+  "scan_nsa": {
+    "target": [
+      "CLI"
+    ],
+    "target_repositories": [],
+    "description": "",
+    "skip_on_environment": "",
+    "owner": "amirm@armosec.io"
+  },
   "relevancy_disabled_installation": {
     "target": [
       "In cluster",