diff --git a/template/audio/mlek_audio.csolution.yml b/template/audio/mlek_audio.csolution.yml
index c581d0f..7edff2a 100644
--- a/template/audio/mlek_audio.csolution.yml
+++ b/template/audio/mlek_audio.csolution.yml
@@ -71,14 +71,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-300/Board.clayer.yml
       target-set:
-        - set:
+        - set: "Data-Array"
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-300_Ethos-U55
-            config-file: board/Corstone-300/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+            config-file: ./board/Corstone-300/fvp_config.txt
+            args: --simlimit 25
           images:
             - project-context: kws.Debug-Data_Array
+        - set: "Live-Stream"
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-300_Ethos-U55
+            config-file: ./board/Corstone-300/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+          images:
+            - project-context: kws.Debug-Live_Stream
 
     - type: SSE-300-U55
       board: V2M-MPS3-SSE-300-FVP
@@ -86,14 +94,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-300/Board-U55.clayer.yml
       target-set:
-        - set:
+        - set: "Data-Array"
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-300_Ethos-U55
-            config-file: board/Corstone-300/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+            config-file: ./board/Corstone-300/fvp_config.txt
+            args: --simlimit 25
           images:
             - project-context: kws.Debug-Data_Array
+        - set: "Live-Stream"
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-300_Ethos-U55
+            config-file: ./board/Corstone-300/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+          images:
+            - project-context: kws.Debug-Live_Stream
 
     - type: SSE-300-U65
       board: V2M-MPS3-SSE-300-FVP
@@ -101,14 +117,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-300/Board-U65.clayer.yml
       target-set:
-        - set:
+        - set: "Data-Array"
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-300_Ethos-U65
             config-file: ./board/Corstone-300/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: kws.Debug-Data_Array
+        - set: "Live-Stream"
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-300_Ethos-U65
+            config-file: ./board/Corstone-300/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+          images:
+            - project-context: kws.Debug-Live_Stream
 
     # Arm Corstone-310 targets
     - type: SSE-310
@@ -117,14 +141,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-310/Board.clayer.yml
       target-set:
-        - set:
+        - set: "Data-Array"
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-310
             config-file: ./board/Corstone-310/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: kws.Debug-Data_Array
+        - set: "Live-Stream"
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-310
+            config-file: ./board/Corstone-310/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+          images:
+            - project-context: kws.Debug-Live_Stream
 
     - type: SSE-310-U55
       board: V2M-MPS3-SSE-310
@@ -132,14 +164,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-310/Board-U55.clayer.yml
       target-set:
-        - set:
+        - set: "Data-Array"
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-310
             config-file: ./board/Corstone-310/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: kws.Debug-Data_Array
+        - set: "Live-Stream"
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-310
+            config-file: ./board/Corstone-310/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+          images:
+            - project-context: kws.Debug-Live_Stream
 
     - type: SSE-310-U65
       board: V2M-MPS3-SSE-310
@@ -147,14 +187,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-310/Board-U65.clayer.yml
       target-set:
-        - set:
+        - set: "Data-Array"
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-310_Ethos-U65
             config-file: ./board/Corstone-310/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: kws.Debug-Data_Array
+        - set: "Live-Stream"
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-310_Ethos-U65
+            config-file: ./board/Corstone-310/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+          images:
+            - project-context: kws.Debug-Live_Stream
 
     # Arm Corstone-315 targets
     - type: SSE-315
@@ -163,14 +211,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-315/Board.clayer.yml
       target-set:
-        - set:
+        - set: "Data-Array"
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-315
             config-file: ./board/Corstone-315/fvp_config.txt
-            args: -C mps4_board.v_path=./board/Corstone-315/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: kws.Debug-Data_Array
+        - set: "Live-Stream"
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-315
+            config-file: ./board/Corstone-315/fvp_config.txt
+            args: -C mps4_board.v_path=./board/Corstone-315/vsi/python/
+          images:
+            - project-context: kws.Debug-Live_Stream
 
     - type: SSE-315-U65
       board: SSE-315
@@ -178,14 +234,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-315/Board-U65.clayer.yml
       target-set:
-        - set:
+        - set: "Data-Array"
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-315
             config-file: ./board/Corstone-315/fvp_config.txt
-            args: -C mps4_board.v_path=./board/Corstone-315/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: kws.Debug-Data_Array
+        - set: "Live-Stream"
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-315
+            config-file: ./board/Corstone-315/fvp_config.txt
+            args: -C mps4_board.v_path=./board/Corstone-315/vsi/python/
+          images:
+            - project-context: kws.Debug-Live_Stream
 
     # Arm Corstone-320 targets
     - type: SSE-320
@@ -194,14 +258,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-320/Board.clayer.yml
       target-set:
-        - set:
+        - set: "Data-Array"
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-320
             config-file: ./board/Corstone-320/fvp_config.txt
-            args: -C mps4_board.v_path=./board/Corstone-320/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: kws.Debug-Data_Array
+        - set: "Live-Stream"
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-320
+            config-file: ./board/Corstone-320/fvp_config.txt
+            args: -C mps4_board.v_path=./board/Corstone-320/vsi/python/
+          images:
+            - project-context: kws.Debug-Live_Stream
 
     - type: SSE-320-U85
       board: SSE-320
@@ -209,14 +281,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-320/Board-U85.clayer.yml
       target-set:
-        - set:
+        - set: "Data-Array"
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-320
             config-file: ./board/Corstone-320/fvp_config.txt
-            args: -C mps4_board.v_path=./board/Corstone-320/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: kws.Debug-Data_Array
+        - set: "Live-Stream"
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-320
+            config-file: ./board/Corstone-320/fvp_config.txt
+            args: -C mps4_board.v_path=./board/Corstone-320/vsi/python/
+          images:
+            - project-context: kws.Debug-Live_Stream
 
   projects:
     # Keyword Spotting (KWS) use case
diff --git a/template/video/mlek_video.csolution.yml b/template/video/mlek_video.csolution.yml
index 1af566a..907cb21 100644
--- a/template/video/mlek_video.csolution.yml
+++ b/template/video/mlek_video.csolution.yml
@@ -71,14 +71,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-300/Board.clayer.yml
       target-set:
-        - set:
+        - set: Data-Array
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-300_Ethos-U55
-            config-file: board/Corstone-300/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+            config-file: ./board/Corstone-300/fvp_config.txt
+            args: --simlimit 25
           images:
             - project-context: object-detection.Debug-Data_Array
+        - set: Live-Stream
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-300_Ethos-U55
+            config-file: ./board/Corstone-300/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+          images:
+            - project-context: object-detection.Debug-Live_Stream
 
     - type: SSE-300-U55
       board: V2M-MPS3-SSE-300-FVP
@@ -86,14 +94,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-300/Board-U55.clayer.yml
       target-set:
-        - set:
+        - set: Data-Array
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-300_Ethos-U55
-            config-file: board/Corstone-300/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+            config-file: ./board/Corstone-300/fvp_config.txt
+            args: --simlimit 25
           images:
             - project-context: object-detection.Debug-Data_Array
+        - set: Live-Stream
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-300_Ethos-U55
+            config-file: ./board/Corstone-300/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+          images:
+            - project-context: object-detection.Debug-Live_Stream
 
     - type: SSE-300-U65
       board: V2M-MPS3-SSE-300-FVP
@@ -101,14 +117,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-300/Board-U65.clayer.yml
       target-set:
-        - set:
+        - set: Data-Array
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-300_Ethos-U65
             config-file: ./board/Corstone-300/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: object-detection.Debug-Data_Array
+        - set: Live-Stream
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-300_Ethos-U65
+            config-file: ./board/Corstone-300/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-300/vsi/python/
+          images:
+            - project-context: object-detection.Debug-Live_Stream
 
     # Arm Corstone-310 targets
     - type: SSE-310
@@ -117,14 +141,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-310/Board.clayer.yml
       target-set:
-        - set:
+        - set: Data-Array
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-310
             config-file: ./board/Corstone-310/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: object-detection.Debug-Data_Array
+        - set: Live-Stream
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-310
+            config-file: ./board/Corstone-310/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+          images:
+            - project-context: object-detection.Debug-Live_Stream
 
     - type: SSE-310-U55
       board: V2M-MPS3-SSE-310
@@ -132,14 +164,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-310/Board-U55.clayer.yml
       target-set:
-        - set:
+        - set: Data-Array
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-310
             config-file: ./board/Corstone-310/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: object-detection.Debug-Data_Array
+        - set: Live-Stream
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-310
+            config-file: ./board/Corstone-310/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+          images:
+            - project-context: object-detection.Debug-Live_Stream
 
     - type: SSE-310-U65
       board: V2M-MPS3-SSE-310
@@ -147,14 +187,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-310/Board-U65.clayer.yml
       target-set:
-        - set:
+        - set: Data-Array
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-310_Ethos-U65
             config-file: ./board/Corstone-310/fvp_config.txt
-            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: object-detection.Debug-Data_Array
+        - set: Live-Stream
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-310_Ethos-U65
+            config-file: ./board/Corstone-310/fvp_config.txt
+            args: -C mps3_board.v_path=./board/Corstone-310/vsi/python/
+          images:
+            - project-context: object-detection.Debug-Live_Stream
 
     # Arm Corstone-315 targets
     - type: SSE-315
@@ -163,14 +211,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-315/Board.clayer.yml
       target-set:
-        - set:
+        - set: Data-Array
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-315
             config-file: ./board/Corstone-315/fvp_config.txt
-            args: -C mps4_board.v_path=./board/Corstone-315/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: object-detection.Debug-Data_Array
+        - set: Live-Stream
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-315
+            config-file: ./board/Corstone-315/fvp_config.txt
+            args: -C mps4_board.v_path=./board/Corstone-315/vsi/python/
+          images:
+            - project-context: object-detection.Debug-Live_Stream
 
     - type: SSE-315-U65
       board: SSE-315
@@ -178,14 +234,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-315/Board-U65.clayer.yml
       target-set:
-        - set:
+        - set: Data-Array
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-315
             config-file: ./board/Corstone-315/fvp_config.txt
-            args: -C mps4_board.v_path=./board/Corstone-315/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: object-detection.Debug-Data_Array
+        - set: Live-Stream
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-315
+            config-file: ./board/Corstone-315/fvp_config.txt
+            args: -C mps4_board.v_path=./board/Corstone-315/vsi/python/
+          images:
+            - project-context: object-detection.Debug-Live_Stream
 
     # Arm Corstone-320 targets
     - type: SSE-320
@@ -194,14 +258,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-320/Board.clayer.yml
       target-set:
-        - set:
+        - set: Data-Array
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-320
             config-file: ./board/Corstone-320/fvp_config.txt
-            args: -C mps4_board.v_path=./board/Corstone-320/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: object-detection.Debug-Data_Array
+        - set: Live-Stream
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-320
+            config-file: ./board/Corstone-320/fvp_config.txt
+            args: -C mps4_board.v_path=./board/Corstone-320/vsi/python/
+          images:
+            - project-context: object-detection.Debug-Live_Stream
 
     - type: SSE-320-U85
       board: SSE-320
@@ -209,14 +281,22 @@ solution:
       variables:
         - Board-Layer: ../board/Corstone-320/Board-U85.clayer.yml
       target-set:
-        - set:
+        - set: Data-Array
           debugger:
             name: Arm-FVP
             model: FVP_Corstone_SSE-320
             config-file: ./board/Corstone-320/fvp_config.txt
-            args: -C mps4_board.v_path=./board/Corstone-320/vsi/python/
+            args: --simlimit 25
           images:
             - project-context: object-detection.Debug-Data_Array
+        - set: Live-Stream
+          debugger:
+            name: Arm-FVP
+            model: FVP_Corstone_SSE-320
+            config-file: ./board/Corstone-320/fvp_config.txt
+            args: -C mps4_board.v_path=./board/Corstone-320/vsi/python/
+          images:
+            - project-context: object-detection.Debug-Live_Stream
 
   projects:
     # Object Detection use case