diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_type.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_type.scss
index 3e07104eeabc..ee0bda0c84d0 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_type.scss
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_type.scss
@@ -89,11 +89,4 @@ code {
 
 a {
     cursor: pointer;
-}
-
-// we should eventually get rid of this as bootstrap5+ doesn't natively support
-.page-header {
-    padding-bottom: 7.5px;
-    margin: 34px 0 17px;
-    border-bottom: 1px solid #eeeeee;
 }
\ No newline at end of file
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/base_page.html b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/base_page.html
index 7985dcbc36dc..58b4a8caebf6 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/base_page.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/base_page.html
@@ -21,7 +21,7 @@
     {% endif %}
   {% endblock page_breadcrumbs %}
   <div class="container">
-    <div class="page-header">
+    <div class="border-bottom pb-1 my-4">
       <h1>{% block page_name %}{{ current_page.page_name }}{% endblock %}</h1>
     </div>
     {% block page_content %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/base_page.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/base_page.html.diff.txt
index 644ffef9e929..614256c993da 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/base_page.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/base_page.html.diff.txt
@@ -6,3 +6,12 @@
  {% load hq_shared_tags %}
  
  {% block title %}{{ section.page_name }}{% if current_page.title %}: {{ current_page.title }}{% endif %}{% endblock %}
+@@ -21,7 +21,7 @@
+     {% endif %}
+   {% endblock page_breadcrumbs %}
+   <div class="container">
+-    <div class="page-header">
++    <div class="border-bottom pb-1 my-4">
+       <h1>{% block page_name %}{{ current_page.page_name }}{% endblock %}</h1>
+     </div>
+     {% block page_content %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/typography._type.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/typography._type.style.diff.txt
index 011dab19e956..4a94b67d7397 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/typography._type.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/typography._type.style.diff.txt
@@ -28,14 +28,9 @@
  }
  
  .no-border {
-@@ -89,3 +90,10 @@
+@@ -88,4 +89,4 @@
+ 
  a {
      cursor: pointer;
- }
-+
-+// we should eventually get rid of this as bootstrap5+ doesn't natively support
-+.page-header {
-+    padding-bottom: 7.5px;
-+    margin: 34px 0 17px;
-+    border-bottom: 1px solid #eeeeee;
+-}
 +}
\ No newline at end of file