diff --git a/lava_helper/jinja2_templates/template_tfm_mps2_sse_200.jinja2 b/lava_helper/jinja2_templates/template_tfm_mps2_sse_200.jinja2
index 3fdf519..6aefc55 100644
--- a/lava_helper/jinja2_templates/template_tfm_mps2_sse_200.jinja2
+++ b/lava_helper/jinja2_templates/template_tfm_mps2_sse_200.jinja2
@@ -24,28 +24,19 @@
 
 actions:
 {%- for platform, recovery in platforms.items()|sort(reverse=false) %}
-    - deploy:
-        to: mps
-        images:
-          recovery_image:
-            url: {{ recovery_store_url }}/{{ build_no }}/artifact/{{ recovery }}
-            compression: gz
-        namespace: target_{{ recovery | replace(".tar.gz",  "") }}
-{% for compiler in compilers|sort(reverse=true) %}
+  {% for compiler in compilers|sort(reverse=true) %}
     {%- for build_type in build_types|sort(reverse=false) %}
       {%- for boot_type in boot_types|sort(reverse=false) %}
         {%- for name, test in tests.items()|sort(reverse=false) %}
     - deploy:
-        to: mps
+        to: flasher
         images:
-          test_binary:
+          recovery_image:
+            url: {{ recovery_store_url }}/{{ build_no }}/artifact/{{ recovery }}
+            compression: gz
+          test_binary_1:
             url: {{artifact_store_url}}/{{ build_no }}/artifact/build-ci-all/{{ platform }}_{{ compiler }}_Config{{ name }}_{{ build_type }}_{{ boot_type }}/install/outputs/{{ platform }}/{{ test.binaries.firmware }}
-        namespace: target
-
-    - deploy:
-        to: mps
-        images:
-          test_binary:
+          test_binary_2:
             url: {{artifact_store_url}}/{{ build_no }}/artifact/build-ci-all/{{ platform }}_{{ compiler }}_Config{{ name }}_{{ build_type }}_{{ boot_type }}/install/outputs/{{ platform }}/{{ test.binaries.bootloader }}
         namespace: target