diff --git a/.changeset/fifty-ads-dance.md b/.changeset/fifty-ads-dance.md
new file mode 100644
index 0000000000..79801caafd
--- /dev/null
+++ b/.changeset/fifty-ads-dance.md
@@ -0,0 +1,5 @@
+---
+'@backstage/ui': patch
+---
+
+Fixes a couple of small bugs in BUI including setting H1 and H2 correctly on the Header and HeaderPage.
diff --git a/packages/ui/report.api.md b/packages/ui/report.api.md
index 4a7a7b98f8..38992bdac4 100644
--- a/packages/ui/report.api.md
+++ b/packages/ui/report.api.md
@@ -322,7 +322,7 @@ export const componentDefinitions: {
     };
     readonly dataAttributes: {
       readonly size: readonly ['small', 'medium', 'large'];
-      readonly variant: readonly ['primary', 'secondary', 'ghost'];
+      readonly variant: readonly ['primary', 'secondary', 'tertiary'];
     };
   };
   readonly ButtonIcon: {
diff --git a/packages/ui/src/components/Header/HeaderToolbar.tsx b/packages/ui/src/components/Header/HeaderToolbar.tsx
index 20f0519707..ee75eff639 100644
--- a/packages/ui/src/components/Header/HeaderToolbar.tsx
+++ b/packages/ui/src/components/Header/HeaderToolbar.tsx
@@ -124,13 +124,15 @@ export const HeaderToolbar = (props: HeaderToolbarProps) => {
       <div className={classNames.toolbar} data-has-tabs={hasTabs}>
         <div className={classNames.toolbarWrapper} ref={toolbarWrapperRef}>
           <div className={classNames.toolbarContent} ref={toolbarContentRef}>
-            {titleLink ? (
-              <Link className={classNames.toolbarName} href={titleLink}>
-                {titleContent}
-              </Link>
-            ) : (
-              <div className={classNames.toolbarName}>{titleContent}</div>
-            )}
+            <Text as="h1" variant="body-medium">
+              {titleLink ? (
+                <Link className={classNames.toolbarName} href={titleLink}>
+                  {titleContent}
+                </Link>
+              ) : (
+                <div className={classNames.toolbarName}>{titleContent}</div>
+              )}
+            </Text>
             {breadcrumbs && (
               <div
                 ref={breadcrumbsRef}
diff --git a/packages/ui/src/components/HeaderPage/HeaderPage.tsx b/packages/ui/src/components/HeaderPage/HeaderPage.tsx
index 5eeab28b2f..9ad3f3e472 100644
--- a/packages/ui/src/components/HeaderPage/HeaderPage.tsx
+++ b/packages/ui/src/components/HeaderPage/HeaderPage.tsx
@@ -34,7 +34,7 @@ export const HeaderPage = (props: HeaderPageProps) => {
   return (
     <div className={classNames.root}>
       <div className={classNames.content}>
-        <Text variant="title-small" weight="bold">
+        <Text variant="title-small" weight="bold" as="h2">
           {title}
         </Text>
         <div className={classNames.controls}>
diff --git a/packages/ui/src/components/Select/Select.tsx b/packages/ui/src/components/Select/Select.tsx
index ce3e094b9d..d404b39e1a 100644
--- a/packages/ui/src/components/Select/Select.tsx
+++ b/packages/ui/src/components/Select/Select.tsx
@@ -58,7 +58,7 @@ export const Select = forwardRef<HTMLDivElement, SelectProps>((props, ref) => {
   useEffect(() => {
     if (!label && !ariaLabel && !ariaLabelledBy) {
       console.warn(
-        'TextField requires either a visible label, aria-label, or aria-labelledby for accessibility',
+        'Select requires either a visible label, aria-label, or aria-labelledby for accessibility',
       );
     }
   }, [label, ariaLabel, ariaLabelledBy]);
diff --git a/packages/ui/src/utils/componentDefinitions.ts b/packages/ui/src/utils/componentDefinitions.ts
index 86aacb7d58..30d1c93d23 100644
--- a/packages/ui/src/utils/componentDefinitions.ts
+++ b/packages/ui/src/utils/componentDefinitions.ts
@@ -42,7 +42,7 @@ export const componentDefinitions = {
     },
     dataAttributes: {
       size: ['small', 'medium', 'large'] as const,
-      variant: ['primary', 'secondary', 'ghost'] as const,
+      variant: ['primary', 'secondary', 'tertiary'] as const,
     },
   },
   ButtonIcon: {