diff --git a/modules/plugins/languages/helm.nix b/modules/plugins/languages/helm.nix
index ffe115c9..b3ca8dc6 100644
--- a/modules/plugins/languages/helm.nix
+++ b/modules/plugins/languages/helm.nix
@@ -4,44 +4,37 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
+  inherit (builtins) attrNames head;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
-  inherit (lib.types) enum either listOf package str;
+  inherit (lib.meta) getExe;
+  inherit (lib.types) enum listOf;
   inherit (lib.nvim.types) mkGrammarOption;
-  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.helm;
   yamlCfg = config.vim.languages.yaml;
 
-  helmCmd =
-    if isList cfg.lsp.package
-    then cfg.lsp.package
-    else ["${cfg.lsp.package}/bin/helm_ls" "serve"];
-  yamlCmd =
-    if isList yamlCfg.lsp.package
-    then builtins.elemAt yamlCfg.lsp.package 0
-    else "${yamlCfg.lsp.package}/bin/yaml-language-server";
-
-  defaultServer = "helm-ls";
+  defaultServers = ["helm-ls"];
   servers = {
     helm-ls = {
-      package = pkgs.helm-ls;
-      lspConfig = ''
-        lspconfig.helm_ls.setup {
-          capabilities = capabilities,
-          on_attach = default_on_attach,
-          cmd = ${expToLua helmCmd},
-          settings = {
-            ['helm-ls'] = {
-              yamlls = {
-                  path = "${yamlCmd}"
-              }
-            }
-          }
-        }
-      '';
+      enable = true;
+      cmd = [(getExe pkgs.helm-ls) "serve"];
+      filetypes = ["helm" "yaml.helm-values"];
+      root_markers = ["Chart.yaml"];
+      capabilities = {
+        didChangeWatchedFiles = {
+          dynamicRegistration = true;
+        };
+      };
+      # TODO: Reconsider this? Not sure if that necessary.
+      settings = {
+        helm-ls = {
+          yamlls = {
+            path = (head yamlCfg.lsp.servers).cmd;
+          };
+        };
+      };
     };
   };
 in {
@@ -55,17 +48,10 @@ in {
 
     lsp = {
       enable = mkEnableOption "Helm LSP support" // {default = config.vim.lsp.enable;};
-
-      server = mkOption {
+      servers = mkOption {
         description = "Helm LSP server to use";
-        type = enum (attrNames servers);
-        default = defaultServer;
-      };
-
-      package = mkOption {
-        description = "Helm LSP server package";
-        type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
       };
     };
   };
@@ -77,8 +63,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.helm-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
 
     {
diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix
index 7a1a4552..4fd5ae29 100644
--- a/modules/plugins/languages/yaml.nix
+++ b/modules/plugins/languages/yaml.nix
@@ -7,10 +7,10 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
-  inherit (lib.types) enum either listOf package str;
+  inherit (lib.meta) getExe;
+  inherit (lib.types) enum listOf;
   inherit (lib.nvim.types) mkGrammarOption;
-  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.yaml;
 
@@ -25,23 +25,22 @@
       end''
     else "on_attach = default_on_attach";
 
-  defaultServer = "yaml-language-server";
+  defaultServers = ["yaml-language-server"];
   servers = {
     yaml-language-server = {
-      package = pkgs.nodePackages.yaml-language-server;
-      lspConfig = ''
-
-
-        lspconfig.yamlls.setup {
-          capabilities = capabilities,
-          ${onAttach},
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/yaml-language-server", "--stdio"}''
-        },
-        }
-      '';
+      enable = true;
+      cmd = [(getExe pkgs.nodePackages.yaml-language-server) "--stdio"];
+      filetypes = ["yaml" "yaml.docker-compose" "yaml.gitlab" "yaml.helm-values"];
+      root_markers = [".git"];
+      on_attach = onAttach;
+      # -- https://github.com/redhat-developer/vscode-redhat-telemetry#how-to-disable-telemetry-reporting
+      settings = {
+        redhat = {
+          telemetry = {
+            enabled = false;
+          };
+        };
+      };
     };
   };
 in {
@@ -55,18 +54,11 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "YAML LSP support" // {default = config.vim.lsp.enable;};
-
-      server = mkOption {
-        type = enum (attrNames servers);
-        default = defaultServer;
-        description = "YAML LSP server to use";
-      };
-
-      package = mkOption {
-        type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
-        description = "YAML LSP server package";
+      enable = mkEnableOption "Yaml LSP support" // {default = config.vim.lsp.enable;};
+      servers = mkOption {
+        description = "Yaml LSP server to use";
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
       };
     };
   };
@@ -78,8 +70,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.yaml-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
   ]);
 }