diff --git a/tokens/src/tokens/brand-defaults/components.json b/tokens/src/tokens/brand-defaults/components.json
index 3e91632..4a68888 100644
--- a/tokens/src/tokens/brand-defaults/components.json
+++ b/tokens/src/tokens/brand-defaults/components.json
@@ -1,5 +1,14 @@
 {
   "brand": {
+    "badge": {
+      "color": {
+        "text": {
+          "warning": {
+            "value": "{alias.color.text.feedback.warning.strong.value}"
+          }
+        }
+      }
+    },
     "decoratorBar": {
       "color": {
         "background": {
@@ -195,6 +204,15 @@
         }
       }
     },
+    "tag": {
+      "color": {
+        "text": {
+          "warning": {
+            "value": "{alias.color.text.feedback.warning.strong.value}"
+          }
+        }
+      }
+    },
     "dialog": {
       "header": {
         "color": {
diff --git a/tokens/src/tokens/component/feedback/Badge/badge.json b/tokens/src/tokens/component/feedback/Badge/badge.json
index 919713c..b992433 100644
--- a/tokens/src/tokens/component/feedback/Badge/badge.json
+++ b/tokens/src/tokens/component/feedback/Badge/badge.json
@@ -202,7 +202,7 @@
             "value": "{alias.color.text.feedback.success.strong.value}"
           },
           "warning": {
-            "value": "{alias.color.text.feedback.warning.strong.value}"
+            "value": "{brand.badge.color.text.warning.value}"
           },
           "help": {
             "value": "{alias.color.text.feedback.help.strong.value}"
diff --git a/tokens/src/tokens/component/feedback/Tag/tag.json b/tokens/src/tokens/component/feedback/Tag/tag.json
index d11038b..5623a93 100644
--- a/tokens/src/tokens/component/feedback/Tag/tag.json
+++ b/tokens/src/tokens/component/feedback/Tag/tag.json
@@ -120,7 +120,7 @@
             "value": "{alias.color.text.feedback.success.strong.value}"
           },
           "warning": {
-            "value": "{alias.color.text.feedback.warning.strong.value}"
+            "value": "{brand.tag.color.text.warning.value}"
           },
           "help": {
             "value": "{alias.color.text.feedback.help.strong.value}"