diff --git a/languages.toml b/languages.toml
index e59803dae..ba9419b3e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1223,7 +1223,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "heex"
-source = { git = "https://github.com/connorlay/tree-sitter-heex", rev = "592e22292a367312c35e13de7fdb888f029981d6" }
+source = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "961bc4d2937cfd24ceb0a5a6b2da607809f8822e" }
 
 [[language]]
 name = "sql"
diff --git a/runtime/queries/heex/highlights.scm b/runtime/queries/heex/highlights.scm
index d63853b5c..c42a689fc 100644
--- a/runtime/queries/heex/highlights.scm
+++ b/runtime/queries/heex/highlights.scm
@@ -49,6 +49,9 @@
   (quoted_attribute_value)
 ] @string
 
+; HEEx special attributes are keywords
+(special_attribute_name) @keyword
+
 ; HEEx components are highlighted as Elixir modules and functions
 (component_name
   [