diff --git a/changelog/17866.txt b/changelog/17866.txt
new file mode 100644
index 000000000..7e173f8de
--- /dev/null
+++ b/changelog/17866.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: consolidate all tag usage
+```
\ No newline at end of file
diff --git a/ui/app/templates/components/database-connection.hbs b/ui/app/templates/components/database-connection.hbs
index d21d8c0a4..74d97d70f 100644
--- a/ui/app/templates/components/database-connection.hbs
+++ b/ui/app/templates/components/database-connection.hbs
@@ -310,7 +310,7 @@
Go back
- Documentation
+ Documentation
{{else}}
{{#each @model.showAttrs as |attr|}}
diff --git a/ui/app/templates/components/license-banners.hbs b/ui/app/templates/components/license-banners.hbs
index 141629097..5e7d75131 100644
--- a/ui/app/templates/components/license-banners.hbs
+++ b/ui/app/templates/components/license-banners.hbs
@@ -10,13 +10,9 @@
}}. Add a new license to your configuration and restart Vault."
@marginless={{true}}
>
-
+
Read documentation
-
+
{{else if (lte this.licenseExpiringInDays 30)}}
@@ -35,13 +31,9 @@
}}"
@marginless={{true}}
>
-
+
Read documentation
-
+
{{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/components/link-status.hbs b/ui/app/templates/components/link-status.hbs
index 2ff89bd0d..5bd005a08 100644
--- a/ui/app/templates/components/link-status.hbs
+++ b/ui/app/templates/components/link-status.hbs
@@ -4,9 +4,9 @@
{{#if (eq this.state "connected")}}
This self-managed Vault is linked to
-
+
HCP.
-
+
{{else}}
There was an error connecting to HCP. Click
{{#each this.downloadHrefs as |dl|}}
{{/each}}
diff --git a/ui/app/templates/components/raft-storage-overview.hbs b/ui/app/templates/components/raft-storage-overview.hbs
index f4af3b8d0..b6bd618f3 100644
--- a/ui/app/templates/components/raft-storage-overview.hbs
+++ b/ui/app/templates/components/raft-storage-overview.hbs
@@ -21,12 +21,13 @@