diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml
index 2c9b92d1dc..541108ccb4 100644
--- a/.github/issue-labeler.yml
+++ b/.github/issue-labeler.yml
@@ -70,7 +70,7 @@ theme/testing:
 theme/tls:
     - '(mtls|mTLS|tls|TLS)'
 theme/ui:
-    - '(ui|browser|chrome|firefox|IE|ie|Chrome)'
+    - '(browser|chrome|firefox|IE|ie|Chrome)'
 theme/windows:
     - '(windows|Windows|Microsoft|microsoft)'
 # thinking:
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
index ae50f3cc4d..38459f9783 100644
--- a/.github/pr-labeler.yml
+++ b/.github/pr-labeler.yml
@@ -1,84 +1,65 @@
-# backport/1.6:
-# backport/1.7:
-# backport/1.8:
-# beta/1.8:
-# blocks-release:
-# crash:
-# do-not-merge:
-# help-wanted:
-# needs-discussion:
-# needs-investigation:
-# post-beta:
-pr/dependencies:
-    - vendor/**/*
-    - go.*
-# pr/needs-rebase:
-# pr/needs-tests:
-theme/acls:
-    - acl/**/*
-theme/agent-cache:
-    - agent/cache/**/*
-theme/api:
-    - api/**/*
-theme/catalog:
-    - agent/catalog/**/*
-theme/certificates:
-    - tlsutil/**/*
-theme/cli:
-    - command/**/*
-theme/config:
-    - agent/config/**/*
-theme/connect:
-    - connect/**/*
-    - agent/connect/**/*
-# theme/consul-nomad:
-theme/consul-terraform-sync:
-    - website/pages/docs/nia/**/*
-    - website/pages/docs/integrate/nia*
-# theme/consul-vault:
-theme/contributing:
-    - .github/**/*
-theme/dns:
-    - dns/**/*
-theme/envoy/xds:
-    - agent/xds/**/*
-# theme/federation-usability:
-theme/health-checks:
-    - agent/health*
-    - api/health*
-# theme/ingress-gw:
-# theme/internal-cleanup:
-theme/internals:
-    - lib/**/*
-    - types/**/*
-# theme/kubernetes:
-# theme/mesh-gw:
-# theme/operator-usability:
-# theme/performance:
-# theme/service-metadata:
-# theme/streaming:
-theme/telemetry:
-    - logging/**/*
-# theme/terminating-gw:
-theme/testing:
-    - ./*test*/**/*
-theme/tls:
-    - tlsutil/**/*
-theme/ui:
-    - ui-v2/**/*
-# theme/windows:
-# thinking:
-# type/bug:
-type/ci:
-    - .circleci/*
-# type/crash:
-type/docs:
-    - website/**/*
-# type/enhancement:
-# type/good-first-issue:
-# type/question:
-# type/umbrella-☂️:
-# version/0.8.3:
-# waiting-pr-merge:
-# waiting-reply:
-# waiting-reply-🤖:
+pr/dependencies:
+    - vendor/**/*
+    - go.*
+theme/acls:
+    - acl/**/*
+theme/agent-cache:
+    - agent/cache/**/*
+theme/api:
+    - api/**/*
+theme/catalog:
+    - agent/catalog/**/*
+theme/certificates:
+    - tlsutil/**/*
+theme/cli:
+    - command/**/*
+theme/config:
+    - agent/config/**/*
+theme/connect:
+    - connect/**/*
+    - agent/connect/**/*
+# theme/consul-nomad:
+theme/consul-terraform-sync:
+    - website/pages/docs/nia/**/*
+    - website/pages/docs/integrate/nia*
+# theme/consul-vault:
+theme/contributing:
+    - .github/**/*
+theme/dns:
+    - dns/**/*
+theme/envoy/xds:
+    - agent/xds/**/*
+# theme/federation-usability:
+theme/health-checks:
+    - agent/health*
+    - api/health*
+# theme/ingress-gw:
+# theme/internal-cleanup:
+theme/internals:
+    - lib/**/*
+    - types/**/*
+# theme/kubernetes:
+# theme/mesh-gw:
+# theme/operator-usability:
+# theme/performance:
+# theme/service-metadata:
+# theme/streaming:
+theme/telemetry:
+    - logging/**/*
+# theme/terminating-gw:
+theme/testing:
+    - ./*test*/**/*
+theme/tls:
+    - tlsutil/**/*
+theme/ui:
+    - ui-v2/**/*
+# theme/windows:
+# thinking:
+# type/bug:
+type/ci:
+    - .circleci/*
+# type/crash:
+type/docs:
+    - website/**/*
+type/docs-cherrypick:
+    - website/**/*
\ No newline at end of file