diff --git a/lockfile.json b/lockfile.json
index d66d3f73e65..729aa66bc3c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -168,7 +168,7 @@
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"
   },
   "yaml": {
-    "revision": "2240ccd0538c8f41394b9cd2202a175b1660b8d6"
+    "revision": "6129a83eeec7d6070b1c0567ec7ce3509ead607c"
   },
   "zig": {
     "revision": "05d6f44e5ae8fe986a7ca09ce2a301aa5148a20f"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4cd99a11f6e..e3dfeb5c024 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -352,7 +352,8 @@ list.yaml = {
   install_info = {
     url = "https://github.com/ikatyang/tree-sitter-yaml",
     files = { "src/parser.c", "src/scanner.cc" },
-  }
+  },
+  maintainers = {"@stsewd"},
 }
 
 list.nix = {
diff --git a/queries/yaml/highlights.scm b/queries/yaml/highlights.scm
index 1517e9134c4..818352bb712 100644
--- a/queries/yaml/highlights.scm
+++ b/queries/yaml/highlights.scm
@@ -8,11 +8,12 @@
 (integer_scalar) @number
 (float_scalar) @number
 (comment) @comment
-(anchor) @type
-(alias) @type
+(anchor_name) @type
+(alias_name) @type
 (tag) @type
 (yaml_directive) @keyword
 (ERROR) @error
+
 [
 ","
 "-"
@@ -21,9 +22,12 @@
 "?"
 "|"
 ] @punctuation.delimiter
+
 [
 "["
 "]"
 "{"
 "}"
 ] @punctuation.bracket
+
+["*" "&"] @punctuation.special
diff --git a/queries/yaml/locals.scm b/queries/yaml/locals.scm
index 6a74fb47357..be91b5ca740 100644
--- a/queries/yaml/locals.scm
+++ b/queries/yaml/locals.scm
@@ -1,4 +1,4 @@
 (document) @scope
 
-(anchor) @definition
-(alias) @reference
+(anchor_name) @definition
+(alias_name) @reference