diff --git a/app/views/additional_payments/claims/check_your_answers.html.erb b/app/views/additional_payments/claims/check_your_answers.html.erb
index 7761e08322..2af63b08b4 100644
--- a/app/views/additional_payments/claims/check_your_answers.html.erb
+++ b/app/views/additional_payments/claims/check_your_answers.html.erb
@@ -22,14 +22,16 @@
 
     <%= render partial: "claims/check_your_answers_section", locals: {heading: "Payment details", answers: journey.answers_for_claim(@form.journey_session).payment_answers} %>
 
-    <%= form_with url: claim_submission_path do |form| %>
-      <h2 class="govuk-heading-m"><%= t("additional_payments.check_your_answers.heading_send_application") %></h2>
+    <%= form_with url: claim_submission_path, builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
+      <h2 class="govuk-heading-m">
+        <%= t("additional_payments.check_your_answers.heading_send_application") %>
+      </h2>
 
-      <p class="govuk-body"><%= t("additional_payments.check_your_answers.statement") %></p>
+      <p class="govuk-body">
+        <%= t("additional_payments.check_your_answers.statement") %>
+      </p>
 
-      <div class="govuk-form-group">
-        <%= form.submit t("additional_payments.check_your_answers.btn_text"), class: "govuk-button" %>
-      </div>
+      <%= f.govuk_submit t("additional_payments.check_your_answers.btn_text") %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/early_years_payment/provider/authenticated/claims/check_your_answers.html.erb b/app/views/early_years_payment/provider/authenticated/claims/check_your_answers.html.erb
index e87d45e799..5b34ab0b0f 100644
--- a/app/views/early_years_payment/provider/authenticated/claims/check_your_answers.html.erb
+++ b/app/views/early_years_payment/provider/authenticated/claims/check_your_answers.html.erb
@@ -17,16 +17,19 @@
     </h1>
 
     <%= render partial: "claims/check_your_answers_section", locals: {heading: nil, answers: journey.answers_for_claim(@form.journey_session).claim_answers} %>
-    <%= form_with model: @form, url: claim_path(current_journey_routing_name), method: :patch, builder: GOVUKDesignSystemFormBuilder::FormBuilder do |form| %>
-      <h2 class="govuk-heading-m"><%= t("early_years_payment_provider_authenticated.check_your_answers.heading_send_application") %></h2>
 
-      <p class="govuk-body"><%= t("early_years_payment_provider_authenticated.check_your_answers.statement") %></p>
+    <%= form_with model: @form, url: claim_path(current_journey_routing_name), method: :patch, builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
+      <h2 class="govuk-heading-m">
+        <%= t("early_years_payment_provider_authenticated.check_your_answers.heading_send_application") %>
+      </h2>
 
-      <%= form.govuk_text_field :provider_contact_name, label: { text: "Your full name" }, spellcheck: "false" %>
+      <p class="govuk-body">
+        <%= t("early_years_payment_provider_authenticated.check_your_answers.statement") %>
+      </p>
 
-      <div class="govuk-form-group">
-        <%= form.submit t("early_years_payment_provider_authenticated.check_your_answers.btn_text"), class: "govuk-button" %>
-      </div>
+      <%= f.govuk_text_field :provider_contact_name, label: { text: "Your full name" }, spellcheck: "false" %>
+
+      <%= f.govuk_submit t("early_years_payment_provider_authenticated.check_your_answers.btn_text") %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/further_education_payments/claims/check_your_answers.html.erb b/app/views/further_education_payments/claims/check_your_answers.html.erb
index b860ff89e4..7d5fc3957f 100644
--- a/app/views/further_education_payments/claims/check_your_answers.html.erb
+++ b/app/views/further_education_payments/claims/check_your_answers.html.erb
@@ -22,14 +22,16 @@
 
     <%= render partial: "claims/check_your_answers_section", locals: {heading: "Payment details", answers: journey.answers_for_claim(@form.journey_session).payment_answers} %>
 
-    <%= form_with url: claim_submission_path do |form| %>
-      <h2 class="govuk-heading-m"><%= t("further_education_payments.check_your_answers.heading_send_application") %></h2>
+    <%= form_with url: claim_submission_path, builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
+      <h2 class="govuk-heading-m">
+        <%= t("further_education_payments.check_your_answers.heading_send_application") %>
+      </h2>
 
-      <p class="govuk-body"><%= t("further_education_payments.check_your_answers.statement") %></p>
+      <p class="govuk-body">
+        <%= t("further_education_payments.check_your_answers.statement") %>
+      </p>
 
-      <div class="govuk-form-group">
-        <%= form.submit t("further_education_payments.check_your_answers.btn_text"), class: "govuk-button" %>
-      </div>
+      <%= f.govuk_submit t("further_education_payments.check_your_answers.btn_text") %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/student_loans/claims/check_your_answers.html.erb b/app/views/student_loans/claims/check_your_answers.html.erb
index 722a961c1d..846d32494a 100644
--- a/app/views/student_loans/claims/check_your_answers.html.erb
+++ b/app/views/student_loans/claims/check_your_answers.html.erb
@@ -24,14 +24,16 @@
 
     <%= render partial: "claims/check_your_answers_section", locals: {heading: "Payment details", answers: journey.answers_for_claim(@form.journey_session).payment_answers} %>
 
-    <%= form_with url: claim_submission_path do |form| %>
-      <h2 class="govuk-heading-m"><%= t("check_your_answers.heading_send_application") %></h2>
+    <%= form_with url: claim_submission_path, builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
+      <h2 class="govuk-heading-m">
+        <%= t("check_your_answers.heading_send_application") %>
+      </h2>
 
-      <p class="govuk-body"><%= t("check_your_answers.statement") %></p>
+      <p class="govuk-body">
+        <%= t("check_your_answers.statement") %>
+      </p>
 
-      <div class="govuk-form-group">
-        <%= form.submit t("check_your_answers.btn_text"), class: "govuk-button" %>
-      </div>
+      <%= f.govuk_submit t("check_your_answers.btn_text") %>
     <% end %>
   </div>
 </div>