diff --git a/.changelog/23366.txt b/.changelog/23366.txt
new file mode 100644
index 00000000000..a9e1ada7f38
--- /dev/null
+++ b/.changelog/23366.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Update headers in the Admin section to use the HashiCorp Design System
+```
diff --git a/ui/app/templates/administration/namespaces/acl-namespace.hbs b/ui/app/templates/administration/namespaces/acl-namespace.hbs
index 77a8f2c7ba1..8a2223b5ee4 100644
--- a/ui/app/templates/administration/namespaces/acl-namespace.hbs
+++ b/ui/app/templates/administration/namespaces/acl-namespace.hbs
@@ -6,14 +6,12 @@
{{page-title "Namespace"}}
-
-
- {{this.model.name}}
-
- {{#if (and (not (eq this.model.name "default")) (can "destroy namespace"))}}
-
+ {{this.model.name}}
+ {{#if (and (not (eq this.model.name "default")) (can "destroy namespace"))}}
+
+
- {{/if}}
-
+
+ {{/if}}
+
-
- Related Resources
-
- View this namespace's <jobs
- or <variables.
-
-
+
+ Related Resources
+
+ View this namespace's <jobs
+ or <variables.
+
+
-
+
diff --git a/ui/app/templates/administration/namespaces/new.hbs b/ui/app/templates/administration/namespaces/new.hbs
index 613ce099254..d2cbba0fd76 100644
--- a/ui/app/templates/administration/namespaces/new.hbs
+++ b/ui/app/templates/administration/namespaces/new.hbs
@@ -6,8 +6,8 @@
{{page-title "Create Namespace"}}
-
- Create Namespace
-
-
+
+ Create Namespace
+
+
diff --git a/ui/app/templates/administration/policies/new.hbs b/ui/app/templates/administration/policies/new.hbs
index 7b84fc665ab..ba1e1f3e262 100644
--- a/ui/app/templates/administration/policies/new.hbs
+++ b/ui/app/templates/administration/policies/new.hbs
@@ -6,9 +6,9 @@
{{page-title "Create Policy"}}
-
- Create Policy
-
+
+ Create Policy
+
diff --git a/ui/app/templates/administration/policies/policy.hbs b/ui/app/templates/administration/policies/policy.hbs
index b73550bdccf..365e90c69ca 100644
--- a/ui/app/templates/administration/policies/policy.hbs
+++ b/ui/app/templates/administration/policies/policy.hbs
@@ -6,12 +6,10 @@
{{page-title "Policy"}}
-
-
- {{this.policy.name}}
-
- {{#if (can "destroy policy")}}
-
+
+ {{this.policy.name}}
+ {{#if (can "destroy policy")}}
+
-
- {{/if}}
-
+
+ {{/if}}
+
diff --git a/ui/app/templates/administration/roles/new.hbs b/ui/app/templates/administration/roles/new.hbs
index ac144bd88bc..47b113a78c0 100644
--- a/ui/app/templates/administration/roles/new.hbs
+++ b/ui/app/templates/administration/roles/new.hbs
@@ -6,9 +6,9 @@
{{page-title "Create Role"}}
-
- Create Role
-
+
+ Create Role
+
{{#if this.model.policies.length}}
{{page-title "Role"}}
-
-
- Edit Role
-
- {{#if (can "destroy role")}}
-
+
+ {{this.role.name}}
+
+ {{#if (can "destroy role")}}
+
+
- {{/if}}
-
+
+ {{/if}}
+
{{this.model.name}}
-
- {{#if (can "destroy sentinel-policy")}}
+ {{#if (can "destroy sentinel-policy")}}
+
- {{/if}}
-
+
+ {{/if}}
diff --git a/ui/app/templates/administration/tokens/new.hbs b/ui/app/templates/administration/tokens/new.hbs
index 32545da73a5..1e6135c5ff8 100644
--- a/ui/app/templates/administration/tokens/new.hbs
+++ b/ui/app/templates/administration/tokens/new.hbs
@@ -6,9 +6,9 @@
{{page-title "Create Token"}}
-
- Create Token
-
+
+ Create Token
+
{{page-title "Token"}}
-
-
- Edit Token
-
- {{#if (can "destroy token")}}
-
+
+ Edit Token
+
+ {{#if (can "destroy token")}}
+
+
- {{/if}}
-
+
+ {{/if}}
+