diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index f51f5cfa..da8a8b24 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -287,7 +287,9 @@
   <https://github.com/nvim-treesitter/nvim-treesitter/blob/main/plugin/filetypes.lua>.
   This is mostly use full for Markdown code block injections.
 
-- Added some Tree-sitter filetype mappings for `ash`, `dash` and `zsh`.
+- Added some Tree-sitter filetype mappings for:
+  - `bash` = `ash`, `dash`, `zsh`
+  - `yaml` = `yaml`
 
 - Added `vim.lsp.presets.<name>` to contain LSP configurations. This allows for
   more flexibility in nvf and reuse of LSPs across languages. Dropped
diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix
index bba0eba3..db84d346 100644
--- a/modules/plugins/languages/yaml.nix
+++ b/modules/plugins/languages/yaml.nix
@@ -46,8 +46,11 @@ in {
 
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
-      vim.treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.package];
+      vim.treesitter = {
+        enable = true;
+        grammars = [cfg.treesitter.package];
+        filetypeMappings.yaml = ["yml"];
+      };
     })
 
     (mkIf cfg.lsp.enable {