diff --git a/.github/ISSUE_TEMPLATE/documentation.yml b/.github/ISSUE_TEMPLATE/documentation.yml
index 80b7e2cb7..b1b76d5c3 100644
--- a/.github/ISSUE_TEMPLATE/documentation.yml
+++ b/.github/ISSUE_TEMPLATE/documentation.yml
@@ -10,7 +10,7 @@ body:
         Please search for [issues with the `docs` label][docs-issues] (including
         closed issues) before you continue.
 
-        [docs-issues]: https://github.com/simple-icons/simple-icons/issues?q=is%3Aissue+label%3Adocs
+        [docs-issues]: https://github.com/simple-icons/simple-icons/labels/docs
 
   - type: dropdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/icon_removal.yml b/.github/ISSUE_TEMPLATE/icon_removal.yml
index eeaa8ccdc..74b4c93f7 100644
--- a/.github/ISSUE_TEMPLATE/icon_removal.yml
+++ b/.github/ISSUE_TEMPLATE/icon_removal.yml
@@ -1,6 +1,6 @@
 name: Icon removal
 description: Report an icon for removal
-labels: [removal request]
+labels: [breaking change]
 title: 'Removal: <brand-name>'
 
 body:
@@ -8,11 +8,11 @@ body:
     attributes:
       value: |
         Before opening a new issue, make sure it isn't covered by an existing issue.
-        Please search for [issues with the `removal request` or `breaking change` label][removal-issues]
+        Please search for [issues with the `breaking change` label][breaking-issues]
         (including closed issues) before you continue. If you find one for the brand
         you're reporting then leave a comment on it or add a reaction.
 
-        [removal-issues]: https://github.com/simple-icons/simple-icons/issues?q=is%3Aissue+label%3A%22removal+request%22%2C%22breaking+change%22
+        [breaking-issues]: https://github.com/simple-icons/simple-icons/labels/breaking%20change
 
   - type: input
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/icon_update.yml b/.github/ISSUE_TEMPLATE/icon_update.yml
index 58516257f..f864075fa 100644
--- a/.github/ISSUE_TEMPLATE/icon_update.yml
+++ b/.github/ISSUE_TEMPLATE/icon_update.yml
@@ -1,6 +1,6 @@
 name: Icon update
 description: Help us improve by reporting outdated icons
-labels: [icon outdated]
+labels: [update icon/data]
 title: 'Update: <brand-name>'
 
 body:
@@ -8,11 +8,11 @@ body:
     attributes:
       value: |
         Before opening a new issue, make sure it isn't covered by an existing issue.
-        Please search for [issues with the `icon outdated` label][icon-outdated-issues]
+        Please search for [issues with the `update icon/data` label][update-icon-data-issues]
         (including closed issues) before you continue. If you find one for the brand
         you're reporting then leave a comment on it or add a reaction.
 
-        [icon-outdated-issues]: https://github.com/simple-icons/simple-icons/issues?q=is%3Aissue+label%3A%22icon+outdated%22
+        [update-icon-data-issues]: https://github.com/simple-icons/simple-icons/labels/update%20icon/data
 
   - type: input
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/package.yml b/.github/ISSUE_TEMPLATE/package.yml
index 3fc798817..ed213e88f 100644
--- a/.github/ISSUE_TEMPLATE/package.yml
+++ b/.github/ISSUE_TEMPLATE/package.yml
@@ -1,5 +1,5 @@
 name: Packages
-description: Report problems and suggest ideas for the packages
+description: Report problems and suggest ideas for the NPM and Packagist packages
 labels: [package]
 
 body:
@@ -10,7 +10,7 @@ body:
         Please search for [issues with the `package` label][package-issues] (including
         closed issues) before you continue.
 
-        [package-issues]: https://github.com/simple-icons/simple-icons/issues?q=is%3Aissue+label%3Apackage
+        [package-issues]: https://github.com/simple-icons/simple-icons/labels/package
 
   - type: dropdown
     attributes:
diff --git a/DISCLAIMER.md b/DISCLAIMER.md
index 9ff134576..f1429e9eb 100644
--- a/DISCLAIMER.md
+++ b/DISCLAIMER.md
@@ -47,8 +47,8 @@ Should a brand wish for their icon or data to be updated, please [submit an issu
 Should a brand wish for their icon to be removed from the package, contact `removals at simpleicons dot org` explaining your affiliation with the company, and reasons for removal. Alternatively, it is also possible to [submit an issue][removal-issues] on [the Simple Icons GitHub repository] with the same information. We generally remove icons that no longer [meet our criteria] twice a year in our major releases - but can occasionally make exceptions for immediate removal of brands.
 
 [meet our criteria]: https://github.com/simple-icons/simple-icons/blob/develop/CONTRIBUTING.md#requesting-an-icon
-[icon-outdated-issues]: https://github.com/simple-icons/simple-icons/issues/new?assignees=&labels=icon+outdated&template=icon_update.yml&title=Update%3A+
-[removal-issues]: https://github.com/simple-icons/simple-icons/issues/new?assignees=&labels=removal+request&template=icon_removal.yml&title=Remove%3A+
+[icon-outdated-issues]: https://github.com/simple-icons/simple-icons/issues/new?assignees=&labels=update+icon%2Fdata&template=icon_update.yml&title=Update%3A+
+[removal-issues]: https://github.com/simple-icons/simple-icons/issues/new?assignees=&labels=breaking+change&template=icon_removal.yml&title=Remove%3A+
 [the simple icons contributing guidelines]: https://github.com/simple-icons/simple-icons/blob/develop/CONTRIBUTING.md#icon-guidelines
 [the simple icons github repository]: https://github.com/simple-icons/simple-icons
 [the simple icons website]: https://simpleicons.org/