diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index bf1163df..a6371d72 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -119,7 +119,7 @@ jobs:
         run: echo "date=$(date +'%Y-%m-%d-%H%M%S')" >> ${GITHUB_OUTPUT}
 
       - name: Upload doc artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: "${{ matrix.package }}"
           path: result/share/doc/nvf
diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index 4a322868..ea460926 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -45,9 +45,6 @@
   allow valid options. `default` is no longer valid. `inline` and `split` are
   two new valid options.
 
-- Added [taplo](https://taplo.tamasfe.dev/) as the default formatter and lsp for
-  `languages.toml` so we don't default to AI-Slop.
-
 ## Changelog {#sec-release-0-9-changelog}
 
 [taylrfnt](https://github.com/taylrfnt)
diff --git a/modules/plugins/languages/toml.nix b/modules/plugins/languages/toml.nix
index 9a5ec948..d771925b 100644
--- a/modules/plugins/languages/toml.nix
+++ b/modules/plugins/languages/toml.nix
@@ -8,12 +8,12 @@
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) enum;
+  inherit (lib.types) bool enum;
   inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.toml;
-  defaultServers = ["taplo"];
+  defaultServers = ["tombi"];
   servers = {
     tombi = {
       enable = true;
@@ -27,21 +27,9 @@
         ".git"
       ];
     };
-    taplo = {
-      enable = true;
-      cmd = [
-        (getExe pkgs.taplo)
-        "lsp"
-        "stdio"
-      ];
-      filetypes = ["toml"];
-      root_markers = [
-        ".git"
-      ];
-    };
   };
 
-  defaultFormat = ["taplo"];
+  defaultFormat = ["tombi"];
   formats = {
     tombi = {
       command = getExe pkgs.tombi;
@@ -52,15 +40,6 @@
         "-"
       ];
     };
-    taplo = {
-      command = getExe pkgs.taplo;
-      args = [
-        "format"
-        "--stdin-filepath"
-        "$FILENAME"
-        "-"
-      ];
-    };
   };
   defaultDiagnosticsProvider = ["tombi"];
   diagnosticsProviders = {