diff --git a/app/components/attachment/edit_component.rb b/app/components/attachment/edit_component.rb
index e096591ef..cd2e7628c 100644
--- a/app/components/attachment/edit_component.rb
+++ b/app/components/attachment/edit_component.rb
@@ -165,8 +165,7 @@ class Attachment::EditComponent < ApplicationComponent
       # There is always a single input by champ, its id must match the label "for" attribute.
       return champ.input_id
     end
-
-    helpers.field_id(@form_object_name || @attached_file.record, attribute_name)
+    @form_object_name || dom_id(@attached_file.record, attribute_name)
   end
 
   def auto_attach_url
diff --git a/app/views/administrateurs/procedures/_informations.html.haml b/app/views/administrateurs/procedures/_informations.html.haml
index 98458512c..2700aec4f 100644
--- a/app/views/administrateurs/procedures/_informations.html.haml
+++ b/app/views/administrateurs/procedures/_informations.html.haml
@@ -16,7 +16,7 @@
 
   .fr-fieldset__element
     .fr-input-group
-      = f.label :logo, 'Ajouter un logo de la démarche', class: 'fr-label'
+      = f.label :logo, 'Ajouter un logo de la démarche', class: 'fr-label', for: dom_id(@procedure, :logo)
       = render Attachment::EditComponent.new(attached_file: @procedure.logo, view_as: :link)
   .fr-fieldset__element
     .fr-input-group
@@ -55,7 +55,7 @@
 
   .fr-fieldset__element
     .fr-input-group
-      = f.label :deliberation, 'Cadre juridique - texte à importer', class: 'fr-label'
+      = f.label :deliberation, 'Cadre juridique - texte à importer', class: 'fr-label', for: dom_id(@procedure, :deliberation)
       = render Attachment::EditComponent.new(attached_file: @procedure.deliberation, view_as: :download)
 
 %fieldset.fr-fieldset
@@ -80,7 +80,7 @@
 
   .fr-fieldset__element
     .fr-input-group
-      = f.label :notice, 'Notice explicative de la démarche', class: 'fr-label'
+      = f.label :notice, 'Notice explicative de la démarche', class: 'fr-label', for: dom_id(@procedure, :notice)
       %p.fr-hint-text
         Une notice explicative est un document que vous avez élaboré, destiné à guider l’usager dans sa démarche. Le bouton pour télécharger cette notice apparaît en haut du formulaire pour l’usager.
         %br
diff --git a/app/views/shared/dossiers/messages/_form.html.haml b/app/views/shared/dossiers/messages/_form.html.haml
index bd0cfe98e..f8f9eb09c 100644
--- a/app/views/shared/dossiers/messages/_form.html.haml
+++ b/app/views/shared/dossiers/messages/_form.html.haml
@@ -11,7 +11,7 @@
 
   - if local_assigns.has_key?(:dossier)
     .fr-mt-3w.fr-input-group
-      = f.label :piece_jointe, class: "fr-label"
+      = f.label :piece_jointe, class: "fr-label", for: dom_id(commentaire, :piece_jointe)
       %div{ data: { controller: "file-input-reset", delete_label: t('views.shared.messages.remove_file') } }
         = render Attachment::MultipleComponent.new(attached_file: commentaire.piece_jointe)
         %ul{ data: { 'file-input-reset-target': 'fileList' } }