diff --git a/app/views/custom_actions/index.html.erb b/app/views/custom_actions/index.html.erb
index afff2b400c5..d1239f92b94 100644
--- a/app/views/custom_actions/index.html.erb
+++ b/app/views/custom_actions/index.html.erb
@@ -11,24 +11,21 @@
   end
 %>
 
-<%=
-  render(Primer::OpenProject::SubHeader.new) do |subheader|
-    subheader.with_action_button(
-      scheme: :primary,
-      leading_icon: :plus,
-      label: t("custom_actions.new"),
-      test_selector: "op-admin-custom-actions--button-new",
-      tag: :a,
-      disabled: !EnterpriseToken.allows_to?(:custom_actions),
-      href: new_custom_action_path
-    ) do
-      CustomAction.model_name.human
+<%= with_enterprise_banner_guard(:custom_actions, variant: :large, video: "enterprise/custom-actions.mp4") do %>
+  <%=
+    render(Primer::OpenProject::SubHeader.new) do |subheader|
+      subheader.with_action_button(
+        scheme: :primary,
+        leading_icon: :plus,
+        label: t("custom_actions.new"),
+        test_selector: "op-admin-custom-actions--button-new",
+        tag: :a,
+        disabled: !EnterpriseToken.allows_to?(:custom_actions),
+        href: new_custom_action_path
+      ) do
+        CustomAction.model_name.human
+      end
     end
-  end
-%>
-
-<%=
-  with_enterprise_banner_guard(:custom_actions, variant: :large, video: "enterprise/custom-actions.mp4") do
-    render(::CustomActions::TableComponent.new(rows: @custom_actions))
-  end
-%>
+  %>
+  <%= render(::CustomActions::TableComponent.new(rows: @custom_actions)) %>
+<% end %>
diff --git a/app/views/notifications/date_alerts.html.erb b/app/views/notifications/date_alerts.html.erb
index 9342b13b74f..a97d0ddefed 100644
--- a/app/views/notifications/date_alerts.html.erb
+++ b/app/views/notifications/date_alerts.html.erb
@@ -1,5 +1,9 @@
 <% html_title t("js.notifications.title") %>
 
+<% content_for :content_header do %>
+  <%= render(Notifications::IndexPageHeaderComponent.new) %>
+<% end %>
+
 <%= render EnterpriseEdition::BannerComponent.new(
   :date_alerts,
   variant: :large,
diff --git a/app/views/notifications/share_upsell.html.erb b/app/views/notifications/share_upsell.html.erb
index 7b69492146a..dd9d3bf13de 100644
--- a/app/views/notifications/share_upsell.html.erb
+++ b/app/views/notifications/share_upsell.html.erb
@@ -1,5 +1,9 @@
 <% html_title t("js.notifications.title") %>
 
+<% content_for :content_header do %>
+  <%= render(Notifications::IndexPageHeaderComponent.new) %>
+<% end %>
+
 <%= render EnterpriseEdition::BannerComponent.new(
   :work_package_sharing,
   variant: :large,
diff --git a/app/views/placeholder_users/index.html.erb b/app/views/placeholder_users/index.html.erb
index cc69db743fe..dd9e00428eb 100644
--- a/app/views/placeholder_users/index.html.erb
+++ b/app/views/placeholder_users/index.html.erb
@@ -27,20 +27,19 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 <% html_title t(:label_administration), t(:label_placeholder_user_plural) -%>
-<% has_ee = EnterpriseToken.allows_to?(:placeholder_users) %>
 
-<% if has_ee %>
-  <%=
-    render(Primer::OpenProject::PageHeader.new) do |header|
-      header.with_title { t(:label_placeholder_user_plural) }
-      header.with_breadcrumbs(
-        [{ href: admin_index_path, text: t("label_administration") },
-         { href: admin_settings_users_path, text: t(:label_user_and_permission) },
-         t(:label_placeholder_user_plural)]
-      )
-    end
-  %>
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t(:label_placeholder_user_plural) }
+    header.with_breadcrumbs(
+      [{ href: admin_index_path, text: t("label_administration") },
+       { href: admin_settings_users_path, text: t(:label_user_and_permission) },
+       t(:label_placeholder_user_plural)]
+    )
+  end
+%>
 
+<%= with_enterprise_banner_guard(:placeholder_users, variant: :large, video: "enterprise/placeholder_users.mp4") do %>
   <%=
     render(Primer::OpenProject::SubHeader.new) do |subheader|
       subheader.with_action_button(
@@ -60,8 +59,4 @@ See COPYRIGHT and LICENSE files for more details.
   %>
 
   <%= render PlaceholderUsers::TableComponent.new(rows: @placeholder_users) %>
-<% else %>
-  <%= render EnterpriseEdition::BannerComponent.new(:placeholder_users,
-                                                    variant: :large,
-                                                    video: "enterprise/placeholder_users.mp4") %>
 <% end %>
diff --git a/modules/storages/app/views/storages/admin/storages/upsell.html.erb b/modules/storages/app/views/storages/admin/storages/upsell.html.erb
index 8e607c17a14..2ee53e973bd 100644
--- a/modules/storages/app/views/storages/admin/storages/upsell.html.erb
+++ b/modules/storages/app/views/storages/admin/storages/upsell.html.erb
@@ -1,5 +1,21 @@
 <% html_title(t(:label_administration), t("storages.upsell.title")) -%>
 
+<% label_new_file_storage = t("storages.label_new_storage") %>
+<% html_title t(:label_administration), t("project_module_storages"), label_new_file_storage %>
+
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title(test_selector: 'storage-new-page-header--title') { label_new_file_storage }
+    header.with_breadcrumbs(
+      [
+        { href: admin_index_path, text: t("label_administration") },
+        { href: admin_settings_storages_path, text: t(:project_module_storages) }
+      ]
+    )
+  end
+%>
+
+
 <%= render EnterpriseEdition::BannerComponent.new(
   :one_drive_sharepoint_file_storage,
   variant: :large,