diff --git a/app/views/case_logs/_logs_breadcrumb.html.erb b/app/views/case_logs/_logs_breadcrumb.html.erb
deleted file mode 100644
index f4c23e8ac..000000000
--- a/app/views/case_logs/_logs_breadcrumb.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="govuk-breadcrumbs">
-  <ol class="govuk-breadcrumbs__list">
-    <li class="govuk-breadcrumbs__list-item">
-      <a class="govuk-breadcrumbs__link" href="/logs">Logs</a>
-    </li>
-    <li class="govuk-breadcrumbs__list-item" aria-current="page"> <%= content_for(:title) %></li>
-  </ol>
-</div>
diff --git a/app/views/case_logs/edit.html.erb b/app/views/case_logs/edit.html.erb
index ec5bb856c..add9248c5 100644
--- a/app/views/case_logs/edit.html.erb
+++ b/app/views/case_logs/edit.html.erb
@@ -3,7 +3,8 @@
 <%= turbo_frame_tag "case_log_form", target: "_top" do %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop">
-      <%= render partial: 'logs_breadcrumb' %>
+      <% breadcrumbs = { "Logs" => "/logs", content_for(:title) => "" } %>
+      <%= govuk_breadcrumbs(breadcrumbs: breadcrumbs) %>
       <h1 class="govuk-heading-l">
         <%= content_for(:title) %>
       </h1>
diff --git a/app/views/form/_check_answers_breadcrumb.html.erb b/app/views/form/_check_answers_breadcrumb.html.erb
deleted file mode 100644
index 46e7d0d62..000000000
--- a/app/views/form/_check_answers_breadcrumb.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="govuk-breadcrumbs">
-  <ol class="govuk-breadcrumbs__list">
-    <li class="govuk-breadcrumbs__list-item">
-      <a class="govuk-breadcrumbs__link" href="/logs">Logs</a>
-    </li>
-    <li class="govuk-breadcrumbs__list-item">
-      <a class="govuk-breadcrumbs__link" href=" /logs/<%= @case_log.id %>">Log</a>
-    </li>
-    <li class="govuk-breadcrumbs__list-item" aria-current="page"><%= subsection_name %></li>
-  </ol>
-</div>
diff --git a/app/views/form/check_answers.html.erb b/app/views/form/check_answers.html.erb
index 321918695..3eed12715 100644
--- a/app/views/form/check_answers.html.erb
+++ b/app/views/form/check_answers.html.erb
@@ -3,7 +3,8 @@
 <%= turbo_frame_tag "case_log_form", target: "_top" do %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters-from-desktop">
-      <%= render partial: 'check_answers_breadcrumb', locals: { subsection_name: subsection.id.humanize } %>
+      <% breadcrumbs = { "Logs" => "/logs", "Log" => "/logs/" + @case_log.id.to_s, subsection.id.humanize => "" } %>
+      <%= govuk_breadcrumbs(breadcrumbs: breadcrumbs) %>
       <h1 class="govuk-heading-l">
         <span class="govuk-caption-l"><%= subsection.id.humanize %></span>
         Check your answers