diff --git a/app/views/components/_figure.html.erb b/app/views/components/_figure.html.erb
index d0a100e82..dfb349821 100644
--- a/app/views/components/_figure.html.erb
+++ b/app/views/components/_figure.html.erb
@@ -3,8 +3,12 @@
   alt ||= ''
   caption ||= ''
   credit ||= ''
+  local_assigns[:lang] ||= "en"
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("app-c-figure")
 %>
-<figure class="app-c-figure" lang="en">
+<%= tag.figure(**component_helper.all_attributes) do %>
   <% if src.present? %>
     <img class="app-c-figure__image" src="<%= src %>" alt="<%= alt %>">
   <% end %>
@@ -22,4 +26,4 @@
       <% end %>
     </figcaption>
   <% end %>
-</figure>
+<% end %>
diff --git a/app/views/components/docs/figure.yml b/app/views/components/docs/figure.yml
index ac90ce485..83f0c6b9f 100644
--- a/app/views/components/docs/figure.yml
+++ b/app/views/components/docs/figure.yml
@@ -11,6 +11,7 @@ accessibility_criteria: |
 
   - provide an informative text description, as alt text or caption
 
+uses_component_wrapper_helper: true
 examples:
   default:
     data: