diff --git a/packages/ui/src/components/Header/Header.module.css b/packages/ui/src/components/Header/Header.module.css
index e6ea55e363..2e3ca28d3b 100644
--- a/packages/ui/src/components/Header/Header.module.css
+++ b/packages/ui/src/components/Header/Header.module.css
@@ -54,9 +54,19 @@
     align-items: center;
     gap: var(--bui-space-2);
     flex-wrap: wrap;
+    list-style: none;
+    margin: 0;
+    padding: 0;
   }
 
-  .bui-HeaderTagDivider {
+  .bui-HeaderTag {
+    display: flex;
+    align-items: center;
+    gap: var(--bui-space-2);
+  }
+
+  .bui-HeaderTag + .bui-HeaderTag::before {
+    content: '';
     width: 3px;
     height: 3px;
     border-radius: 50%;
@@ -70,6 +80,7 @@
     align-items: center;
     gap: var(--bui-space-5);
     flex-wrap: wrap;
+    margin: 0;
   }
 
   .bui-HeaderMetaItem {
@@ -77,5 +88,9 @@
     flex-direction: row;
     align-items: center;
     gap: var(--bui-space-2);
+
+    dd {
+      margin: 0;
+    }
   }
 }
diff --git a/packages/ui/src/components/Header/Header.tsx b/packages/ui/src/components/Header/Header.tsx
index 0098fa00d4..5d41d6ca0f 100644
--- a/packages/ui/src/components/Header/Header.tsx
+++ b/packages/ui/src/components/Header/Header.tsx
@@ -23,7 +23,7 @@ import { HeaderDefinition } from './definition';
 import { Container } from '../Container';
 import { Lexer } from 'marked';
 import { Link } from '../Link';
-import { Fragment } from 'react/jsx-runtime';
+import { Fragment } from 'react';
 
 // Reject javascript:/vbscript:/data: URIs to prevent XSS via description links.
 const UNSAFE_HREF_RE = /^(javascript:|vbscript:|data:)/i;
@@ -78,10 +78,12 @@ export const Header = (props: HeaderProps) => {
   return (
     <Container className={classes.root}>
       {tags && tags.length > 0 && (
-        <div className={classes.tags}>
+        <ul className={classes.tags}>
           {tags.map((tag, i) => (
-            <Fragment key={`${i}:${tag.label}:${tag.href ?? ''}`}>
-              {i > 0 && <span className={classes.tagDivider} aria-hidden />}
+            <li
+              key={`${i}:${tag.label}:${tag.href ?? ''}`}
+              className={classes.tag}
+            >
               {tag.href ? (
                 <Link
                   href={tag.href}
@@ -96,9 +98,9 @@ export const Header = (props: HeaderProps) => {
                   {tag.label}
                 </Text>
               )}
-            </Fragment>
+            </li>
           ))}
-        </div>
+        </ul>
       )}
       <div className={classes.content}>
         <div className={classes.breadcrumbs}>
@@ -135,20 +137,24 @@ export const Header = (props: HeaderProps) => {
         </Text>
       )}
       {metadata && metadata.length > 0 && (
-        <div className={classes.metaRow}>
+        <dl className={classes.metaRow}>
           {metadata.map((item, i) => (
             <div key={`${i}:${item.label}`} className={classes.metaItem}>
-              <Text variant="body-medium" color="secondary">
-                {item.label}
-              </Text>
-              {typeof item.value === 'string' ? (
-                <Text variant="body-medium">{item.value}</Text>
-              ) : (
-                item.value
-              )}
+              <dt>
+                <Text variant="body-medium" color="secondary">
+                  {item.label}
+                </Text>
+              </dt>
+              <dd>
+                {typeof item.value === 'string' ? (
+                  <Text variant="body-medium">{item.value}</Text>
+                ) : (
+                  item.value
+                )}
+              </dd>
             </div>
           ))}
-        </div>
+        </dl>
       )}
       {tabs && (
         <div className={classes.tabsWrapper}>
diff --git a/packages/ui/src/components/Header/HeaderMetadataStatus.tsx b/packages/ui/src/components/Header/HeaderMetadataStatus.tsx
index 75c9ea778f..2bf2effa8f 100644
--- a/packages/ui/src/components/Header/HeaderMetadataStatus.tsx
+++ b/packages/ui/src/components/Header/HeaderMetadataStatus.tsx
@@ -32,7 +32,11 @@ export const HeaderMetadataStatus = ({
 }: HeaderMetadataStatusItem) => {
   return (
     <div className={styles.single}>
-      <span className={`${styles.dot} ${styles[`dot-${color}`]}`} />
+      <span
+        role="img"
+        aria-label={`${color} status`}
+        className={`${styles.dot} ${styles[`dot-${color}`]}`}
+      />
       <Text variant="body-medium">
         {href ? (
           <Link href={href} standalone>
diff --git a/packages/ui/src/components/Header/HeaderMetadataUsers.module.css b/packages/ui/src/components/Header/HeaderMetadataUsers.module.css
index 745e768d56..0b84734b81 100644
--- a/packages/ui/src/components/Header/HeaderMetadataUsers.module.css
+++ b/packages/ui/src/components/Header/HeaderMetadataUsers.module.css
@@ -29,6 +29,9 @@
     flex-direction: row;
     align-items: center;
     gap: var(--bui-space-1);
+    list-style: none;
+    margin: 0;
+    padding: 0;
   }
 
   .avatarLink {
diff --git a/packages/ui/src/components/Header/HeaderMetadataUsers.tsx b/packages/ui/src/components/Header/HeaderMetadataUsers.tsx
index e644811899..ce1688643f 100644
--- a/packages/ui/src/components/Header/HeaderMetadataUsers.tsx
+++ b/packages/ui/src/components/Header/HeaderMetadataUsers.tsx
@@ -39,43 +39,10 @@ export const HeaderMetadataUsers = ({
 
   if (users.length === 1) {
     const user = users[0];
-    const avatar = (
-      <Avatar
-        src={user.src ?? 'data:,'}
-        name={user.name}
-        size="small"
-        purpose="decoration"
-      />
-    );
     return (
       <div className={styles.single}>
         {user.href ? (
-          <Link
-            href={user.href}
-            aria-label={user.name}
-            className={styles.avatarLink}
-          >
-            {avatar}
-          </Link>
-        ) : (
-          avatar
-        )}
-        {user.href ? (
-          <Link href={user.href} variant="body-medium" standalone>
-            {user.name}
-          </Link>
-        ) : (
-          <Text variant="body-medium">{user.name}</Text>
-        )}
-      </div>
-    );
-  }
-
-  return (
-    <div className={styles.stack}>
-      {users.map(user => (
-        <TooltipTrigger key={user.name}>
-          {user.href ? (
+          <>
             <Link
               href={user.href}
               aria-label={user.name}
@@ -88,19 +55,57 @@ export const HeaderMetadataUsers = ({
                 purpose="decoration"
               />
             </Link>
-          ) : (
-            <Pressable>
-              <Avatar
-                src={user.src ?? 'data:,'}
-                name={user.name}
-                size="small"
-                purpose="informative"
-              />
-            </Pressable>
-          )}
-          <Tooltip>{user.name}</Tooltip>
-        </TooltipTrigger>
+            <Link href={user.href} variant="body-medium" standalone>
+              {user.name}
+            </Link>
+          </>
+        ) : (
+          <>
+            <Avatar
+              src={user.src ?? 'data:,'}
+              name={user.name}
+              size="small"
+              purpose="decoration"
+            />
+            <Text variant="body-medium">{user.name}</Text>
+          </>
+        )}
+      </div>
+    );
+  }
+
+  return (
+    <ul className={styles.stack}>
+      {users.map(user => (
+        <li key={user.name}>
+          <TooltipTrigger>
+            {user.href ? (
+              <Link
+                href={user.href}
+                aria-label={user.name}
+                className={styles.avatarLink}
+              >
+                <Avatar
+                  src={user.src ?? 'data:,'}
+                  name={user.name}
+                  size="small"
+                  purpose="decoration"
+                />
+              </Link>
+            ) : (
+              <Pressable>
+                <Avatar
+                  src={user.src ?? 'data:,'}
+                  name={user.name}
+                  size="small"
+                  purpose="informative"
+                />
+              </Pressable>
+            )}
+            <Tooltip>{user.name}</Tooltip>
+          </TooltipTrigger>
+        </li>
       ))}
-    </div>
+    </ul>
   );
 };
diff --git a/packages/ui/src/components/Header/definition.ts b/packages/ui/src/components/Header/definition.ts
index 7c9878d7e9..c0420dade5 100644
--- a/packages/ui/src/components/Header/definition.ts
+++ b/packages/ui/src/components/Header/definition.ts
@@ -31,7 +31,7 @@ export const HeaderDefinition = defineComponent<HeaderOwnProps>()({
     tabsWrapper: 'bui-HeaderTabsWrapper',
     controls: 'bui-HeaderControls',
     tags: 'bui-HeaderTags',
-    tagDivider: 'bui-HeaderTagDivider',
+    tag: 'bui-HeaderTag',
     description: 'bui-HeaderDescription',
     metaRow: 'bui-HeaderMetaRow',
     metaItem: 'bui-HeaderMetaItem',