diff --git a/app/forms/admin/settings/aggregation_settings_form.rb b/app/forms/admin/settings/aggregation_settings_form.rb
new file mode 100644
index 00000000000..b3466f9b7cc
--- /dev/null
+++ b/app/forms/admin/settings/aggregation_settings_form.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Admin
+  module Settings
+    class AggregationSettingsForm < ApplicationForm
+      include Redmine::I18n
+
+      settings_form do |f|
+        f.text_field name: :journal_aggregation_time_minutes,
+                     type: :number,
+                     min: 0,
+                     input_width: :medium,
+                     trailing_visual: { text: { text: I18n.t("datetime.units.minute_abbreviated", count: 2) } }
+
+        f.submit
+      end
+    end
+  end
+end
diff --git a/app/forms/admin/settings/aggregation_settings_form/journal_aggregation_time_minutes_caption.html.erb b/app/forms/admin/settings/aggregation_settings_form/journal_aggregation_time_minutes_caption.html.erb
new file mode 100644
index 00000000000..986e2aa67fd
--- /dev/null
+++ b/app/forms/admin/settings/aggregation_settings_form/journal_aggregation_time_minutes_caption.html.erb
@@ -0,0 +1,8 @@
+<%= render(Primer::Beta::Text.new(tag: :p)) do %>
+  <%= link_translate("admin.journal_aggregation.caption", links: { webhook_link: url_helpers.admin_outgoing_webhooks_path }) %>
+<% end %>
+<%= render(Primer::OpenProject::InlineMessage.new(scheme: :warning, size: :small)) do %>
+  <%= render(Primer::Beta::Text.new(tag: :p)) do %>
+    <%= I18n.t(:text_hint_disable_with_0) %>
+  <% end %>
+<% end %>
diff --git a/app/views/admin/settings/aggregation_settings/show.html.erb b/app/views/admin/settings/aggregation_settings/show.html.erb
index 14308e9ff81..18ebddc5d73 100644
--- a/app/views/admin/settings/aggregation_settings/show.html.erb
+++ b/app/views/admin/settings/aggregation_settings/show.html.erb
@@ -40,25 +40,13 @@ See COPYRIGHT and LICENSE files for more details.
   end
 %>
 
-<%= styled_form_tag(admin_settings_aggregation_path, method: :patch) do %>
-  <div class="form--field">
-    <%= setting_number_field :journal_aggregation_time_minutes,
-                             unit: t(:label_minute_plural),
-                             min: 0,
-                             container_class: "-xslim" %>
-    <span class="form--field-instructions">
-      <%= t(
-            :"admin.journal_aggregation.explanation.text",
-            webhook_link: link_to(
-              t(:"admin.journal_aggregation.explanation.link"),
-              admin_outgoing_webhooks_path,
-              target: "_blank"
-            )
-          ).html_safe %>
-      <br>
-      <%= t(:text_hint_disable_with_0) %>
-    </span>
-  </div>
-
-  <%= styled_button_tag t(:button_save), class: "-primary -with-icon icon-checkmark" %>
-<% end %>
+<%=
+  settings_primer_form_with(
+    url: admin_settings_aggregation_path,
+    scope: :settings,
+    method: :patch,
+    data: { turbo: false }
+  ) do |form|
+    render Admin::Settings::AggregationSettingsForm.new(form)
+  end
+%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9be0da78640..50fd1fb3094 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -116,9 +116,8 @@ en:
         trial: "Trial"
     jemalloc_allocator: Jemalloc memory allocator
     journal_aggregation:
-      explanation:
-        text: "Individual actions of a user (e.g. updating a work package twice) are aggregated into a single action if their age difference is less than the specified timespan. They will be displayed as a single action within the application. This will also delay notifications by the same amount of time reducing the number of emails being sent and will also affect %{webhook_link} delay."
-        link: "webhook"
+      caption: >
+        Individual actions of a user (e.g. updating a work package twice) are aggregated into a single action if their age difference is less than the specified timespan. They will be displayed as a single action within the application. This will also delay notifications by the same amount of time reducing the number of emails being sent and will also affect the [webhook](webhook_link) delay.
     import:
       title: "Import"
     jira: