diff --git a/.changeset/modern-knives-destroy.md b/.changeset/modern-knives-destroy.md
new file mode 100644
index 000000000..574c872cf
--- /dev/null
+++ b/.changeset/modern-knives-destroy.md
@@ -0,0 +1,6 @@
+---
+"@primer/primitives": patch
+---
+
+Update a few `bgColor` and `borderColor` Primitive fallbacks
+
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-colorblind-theme-1-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-colorblind-theme-1-linux.png
index f0bf10335..25686b15c 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-colorblind-theme-1-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-colorblind-theme-1-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-high-contrast-theme-1-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-high-contrast-theme-1-linux.png
index 48ba3d8df..c5ab671dd 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-high-contrast-theme-1-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-high-contrast-theme-1-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-theme-1-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-theme-1-linux.png
index 44b7751b8..008e457ac 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-theme-1-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-theme-1-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-tritanopia-theme-1-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-tritanopia-theme-1-linux.png
index 50a554e75..9ac1f981d 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-tritanopia-theme-1-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-dark-tritanopia-theme-1-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-colorblind-theme-1-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-colorblind-theme-1-linux.png
index 96c7910ab..864be29ff 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-colorblind-theme-1-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-colorblind-theme-1-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-high-contrast-theme-1-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-high-contrast-theme-1-linux.png
index 0b08f6044..df0125164 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-high-contrast-theme-1-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-high-contrast-theme-1-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-theme-1-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-theme-1-linux.png
index 050ec6b98..82e8b0c53 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-theme-1-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-theme-1-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-tritanopia-theme-1-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-tritanopia-theme-1-linux.png
index f8037ff99..a8420a39b 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-tritanopia-theme-1-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-migration-tables--fallbacks-all-themes-light-tritanopia-theme-1-linux.png differ
diff --git a/src/tokens/fallback/color-fallbacks.json b/src/tokens/fallback/color-fallbacks.json
index 9a600c30b..52490d242 100644
--- a/src/tokens/fallback/color-fallbacks.json
+++ b/src/tokens/fallback/color-fallbacks.json
@@ -201,23 +201,23 @@
   "--bgColor-neutral-muted": "var(--color-neutral-subtle)",
   "--bgColor-neutral-emphasis": "var(--color-fg-subtle)",
   "--bgColor-accent-muted": "var(--color-accent-subtle)",
-  "--bgColor-accent-emphasis": "var(--color-accent-fg)",
+  "--bgColor-accent-emphasis": "var(--color-accent-emphasis)",
   "--bgColor-success-muted": "var(--color-success-subtle)",
-  "--bgColor-success-emphasis": "var(--color-success-fg)",
+  "--bgColor-success-emphasis": "var(--color-success-emphasis)",
   "--bgColor-attention-muted": "var(--color-attention-subtle)",
-  "--bgColor-attention-emphasis": "var(--color-attention-fg)",
+  "--bgColor-attention-emphasis": "var(--color-attention-emphasis)",
   "--bgColor-severe-muted": "var(--color-severe-subtle)",
-  "--bgColor-severe-emphasis": "var(--color-severe-fg)",
+  "--bgColor-severe-emphasis": "var(--color-severe-emphasis)",
   "--bgColor-danger-muted": "var(--color-danger-subtle)",
-  "--bgColor-danger-emphasis": "var(--color-danger-fg)",
+  "--bgColor-danger-emphasis": "var(--color-danger-emphasis)",
   "--bgColor-open-muted": "var(--color-open-subtle)",
-  "--bgColor-open-emphasis": "var(--color-open-fg)",
+  "--bgColor-open-emphasis": "var(--color-open-emphasis)",
   "--bgColor-closed-muted": "var(--color-closed-subtle)",
-  "--bgColor-closed-emphasis": "var(--color-closed-fg)",
+  "--bgColor-closed-emphasis": "var(--color-closed-emphasis)",
   "--bgColor-done-muted": "var(--color-done-subtle)",
-  "--bgColor-done-emphasis": "var(--color-done-fg)",
+  "--bgColor-done-emphasis": "var(--color-done-emphasis)",
   "--bgColor-sponsors-muted": "var(--color-sponsors-subtle)",
-  "--bgColor-sponsors-emphasis": "var(--color-sponsors-fg)",
+  "--bgColor-sponsors-emphasis": "var(--color-sponsors-emphasis)",
   "--borderColor-default": "var(--color-border-default)",
   "--borderColor-muted": "var(--color-border-muted)",
   "--borderColor-emphasis": "var(--color-fg-subtle)",
@@ -225,7 +225,7 @@
   "--borderColor-neutral-muted": "var(--color-neutral-muted)",
   "--borderColor-neutral-emphasis": "var(--color-fg-subtle)",
   "--borderColor-accent-muted": "var(--color-accent-muted)",
-  "--borderColor-accent-emphasis": "var(--color-accent-fg)",
+  "--borderColor-accent-emphasis": "var(--color-accent-emphasis)",
   "--borderColor-success-muted": "var(--color-success-muted)",
   "--borderColor-success-emphasis": "var(--color-success-emphasis)",
   "--borderColor-attention-muted": "var(--color-attention-muted)",