diff --git a/app/controllers/instructeurs/export_templates_controller.rb b/app/controllers/instructeurs/export_templates_controller.rb
index cc41c0108..64ef44a4e 100644
--- a/app/controllers/instructeurs/export_templates_controller.rb
+++ b/app/controllers/instructeurs/export_templates_controller.rb
@@ -46,11 +46,13 @@ module Instructeurs
     end
 
     def preview
-      param = params.require(:export_template).keys.first
-      @preview_param = param.delete_prefix("tiptap_")
-      hash = JSON.parse(params[:export_template][param]).deep_symbolize_keys
-      export_template = ExportTemplate.new(kind: 'zip', groupe_instructeur: @groupe_instructeurs.first)
-      @preview_value = export_template.render_attributes_for(hash, @procedure.dossier_for_preview(current_instructeur))
+      set_groupe_instructeur
+      @export_template = @groupe_instructeur.export_templates.build(export_template_params)
+      @export_template.assign_pj_names(pj_params)
+
+      @sample_dossier = @procedure.dossier_for_preview(current_instructeur)
+
+      render turbo_stream: turbo_stream.replace('preview', partial: 'preview', locals: { export_template: @export_template, procedure: @procedure, dossier: @sample_dossier })
     end
 
     private
diff --git a/app/views/instructeurs/export_templates/_form.html.haml b/app/views/instructeurs/export_templates/_form.html.haml
index 74a29afd5..00813d9b6 100644
--- a/app/views/instructeurs/export_templates/_form.html.haml
+++ b/app/views/instructeurs/export_templates/_form.html.haml
@@ -9,7 +9,7 @@
 
 .fr-grid-row.fr-grid-row--gutters
   .fr-col-12.fr-col-md-8
-    = form_with url: form_url, model: @export_template, local: true do |f|
+    = form_with url: form_url, model: @export_template, local: true, data: { turbo: 'true', controller: 'autosubmit' } do |f|
 
       = render Dsfr::InputComponent.new(form: f, attribute: :name, input_type: :text_field)
 
@@ -34,7 +34,7 @@
             = t('activerecord.attributes.export_template.hints.tiptap_default_dossier_directory')
 
         .tiptap-editor.fr-mt-1w{ data: { tiptap_target: 'editor' } }
-        = f.hidden_field :tiptap_default_dossier_directory, data: { tiptap_target: 'input', controller: 'turbo-input', turbo_input_url_value: preview_instructeur_export_templates_path }
+        = f.hidden_field :tiptap_default_dossier_directory, data: { tiptap_target: 'input' }
         .fr-mt-2w= render TagsButtonListComponent.new(tags: { nil => @export_template.specific_tags })
 
       .fr-input-group{ data: { controller: 'tiptap' } }
@@ -44,7 +44,7 @@
           %span.fr-hint-text
             = t('activerecord.attributes.export_template.hints.tiptap_pdf_name')
         .tiptap-editor.fr-mt-1w{ data: { tiptap_target: 'editor' } }
-        = f.hidden_field :tiptap_pdf_name, data: { tiptap_target: 'input', controller: 'turbo-input', turbo_input_url_value: preview_instructeur_export_templates_path }
+        = f.hidden_field :tiptap_pdf_name, data: { tiptap_target: 'input' }
         .fr-mt-2w= render TagsButtonListComponent.new(tags: { nil => @export_template.specific_tags })
 
       - if @all_pj.any?
@@ -58,14 +58,15 @@
           .fr-input-group{ data: { controller: 'tiptap' } }
             = label_tag pj.libelle, nil, name: field_name(:export_template, "tiptap_pj_#{pj.stable_id}"), class: "fr-label"
             .tiptap-editor.fr-mt-1w{ data: { tiptap_target: 'editor' } }
-              = hidden_field_tag field_name(:export_template, "tiptap_pj_#{pj.stable_id}"), "#{@export_template.content_for_pj(pj)}" , data: { tiptap_target: 'input', controller: 'turbo-input', turbo_input_url_value: preview_instructeur_export_templates_path }
+              = hidden_field_tag field_name(:export_template, "tiptap_pj_#{pj.stable_id}"), "#{@export_template.content_for_pj(pj)}" , data: { tiptap_target: 'input' }
             .fr-mt-2w= render TagsButtonListComponent.new(tags: { nil => @export_template.tags_for_pj })
 
       .fixed-footer
         .fr-container
           %ul.fr-btns-group.fr-btns-group--inline-md
             %li
-              = f.submit "Enregistrer", class: "fr-btn"
+              %input.hidden{ type: 'submit', formaction: preview_instructeur_export_templates_path, data: { autosubmit_target: 'submitter' }, formnovalidate: 'true', formmethod: 'get' }
+              = f.button "Enregistrer", class: "fr-btn", data: { turbo: 'false' }
             %li
               = link_to "Annuler", instructeur_procedure_path(@procedure), class: "fr-btn fr-btn--secondary"
             - if @export_template.persisted?
diff --git a/app/views/instructeurs/export_templates/preview.turbo_stream.haml b/app/views/instructeurs/export_templates/preview.turbo_stream.haml
deleted file mode 100644
index f6c1e5468..000000000
--- a/app/views/instructeurs/export_templates/preview.turbo_stream.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-= turbo_stream.update "preview_#{@preview_param}" do
-  = @preview_value