diff --git a/app/components/goals/card_component.rb b/app/components/goals/card_component.rb
index 4d2a22742..34fe7fd6f 100644
--- a/app/components/goals/card_component.rb
+++ b/app/components/goals/card_component.rb
@@ -15,9 +15,8 @@ class Goals::CardComponent < ApplicationComponent
 
   def ring_color
     case goal.status
-    when :reached then "var(--color-green-600)"
-    when :behind then "var(--color-yellow-600)"
-    when :on_track then "var(--color-green-500)"
+    when :reached, :on_track then "var(--color-success)"
+    when :behind then "var(--color-warning)"
     else "var(--color-gray-400)"
     end
   end
diff --git a/app/views/goals/_status_callout.html.erb b/app/views/goals/_status_callout.html.erb
index 721adb32e..2c6521d74 100644
--- a/app/views/goals/_status_callout.html.erb
+++ b/app/views/goals/_status_callout.html.erb
@@ -4,9 +4,9 @@
 
   variant_classes = case goal.status
                     when :behind
-                      "bg-warning/10 border-warning/20 text-yellow-700 theme-dark:text-yellow-300"
+                      "bg-warning/10 border-warning/20 text-warning"
                     when :on_track
-                      "bg-success/10 border-success/20 text-green-700 theme-dark:text-green-300"
+                      "bg-success/10 border-success/20 text-success"
                     else
                       "bg-surface-inset border-secondary text-secondary"
                     end