diff --git a/common/.config/nvim/lsp/taplo.lua b/common/.config/nvim/lsp/taplo.lua
new file mode 100644
index 0000000..a564707
--- /dev/null
+++ b/common/.config/nvim/lsp/taplo.lua
@@ -0,0 +1 @@
+return {}
diff --git a/common/.config/nvim/lsp/yamlls.lua b/common/.config/nvim/lsp/yamlls.lua
new file mode 100644
index 0000000..a564707
--- /dev/null
+++ b/common/.config/nvim/lsp/yamlls.lua
@@ -0,0 +1 @@
+return {}
diff --git a/common/.config/nvim/lua/core/lsp.lua b/common/.config/nvim/lua/core/lsp.lua
index 9017214..6db1a15 100644
--- a/common/.config/nvim/lua/core/lsp.lua
+++ b/common/.config/nvim/lua/core/lsp.lua
@@ -4,23 +4,24 @@
 -- Step 2: Append the LSP server name in the below array
 vim.lsp.enable({
     "bashls",
+    "cssls",
+    "docker_compose_language_service",
+    "dockerls",
+    "html",
+    "jsonls",
+    "lua_ls",
+    "markdownlint",
+    "marksman",
+    "prettier",
+    "pylsp",
     "shellcheck",
     "shellharden",
     "shfmt",
-    "docker_compose_language_service",
-    "dockerls",
-    "jsonls",
-    "lua_ls",
-    "pylsp",
     "sqlls",
-    "cssls",
-    "html",
-    "ts_ls",
-    "prettier",
-    "marksman",
-    "markdownlint",
-    "trivy",
     "taplo",
+    "trivy",
+    "ts_ls",
+    "yamlls",
 })
 
 -- TIP: On new systems, install these through Mason
diff --git a/scripts/package-list-brew b/scripts/package-list-brew
index 7dc480b..cc33d04 100644
--- a/scripts/package-list-brew
+++ b/scripts/package-list-brew
@@ -39,6 +39,7 @@ tokei
 tree-sitter
 typescript-language-server
 vue-language-server
+yaml-language-server
 yamlfmt
 yt-dlp
 zoxide
diff --git a/scripts/package-list-os b/scripts/package-list-os
index d6cf0a2..d16c22d 100644
--- a/scripts/package-list-os
+++ b/scripts/package-list-os
@@ -1,8 +1,46 @@
 # Lines that start with # are ignored
 
+# Coding: Some are common, some not found in some OSes; all are required
+aspnetcore-runtime-8.0
+build-essential
+clang
+cmake
+code
+codespell
+git
+gitleaks
+hadolint
+html
+jq
+llvm
+lua
+lua5.3
+lua54
+luajit
+make
+node
+nodejs-bash-language-server
+npm
+podman
+python3
+python3-pip
+sccache
+shellcheck
+shfmt
+software-properties-common
+sqlite
+stylua
+tmux
+tokei
+tree-sitter
+tree-sitter-cli
+trivy
+vscode
+yamllint
+zoxide
+
 # Below few are apt-only packages - non-free sources must be added before this
 apt-transport-https
-build-essential
 libreadline-dev
 libavcodec-extra
 
@@ -10,23 +48,14 @@ libavcodec-extra
 akmod-nvidia
 dnf-plugins-core
 libva-nvidia-driver
-nodejs-bash-language-server
 xorg-x11-drv-nvidia-cuda
 
 # Common
-aspnetcore-runtime-8.0
 bash
 bat
 bleachbit
 btop
-cmake
-code
-containerd.io
 curl
-docker-buildx-plugin
-docker-ce
-docker-ce-cli
-docker-compose-plugin
 dolphin
 dolphin-plugins
 evolution-ews
@@ -38,48 +67,28 @@ flatpak
 fzf
 gcc
 gdb
-git
-gitleaks
 gnupg
-go
 gparted
 grub-customizer
-hadolint
 htop
 inxi
-jq
 kitty
 kde-spectacle
 kitty-terminfo
 libreoffice
-llvm
-lua5.3
-luajit
 nala
 neovim
 net-tools
-node
-npm
 nvidia-driver
 nvidia-settings
 openssh-client
-python3
-python3-pip
-podman
 qbittorrent
 rclone
 ripgrep
-sccache
-shellcheck
 simplescreenrecorder
 smplayer
-software-properties-common
 solaar
 syncthing
-tmux
-tokei
-tree-sitter-cli
-trivy
 ufw
 ulauncher
 vim
@@ -88,30 +97,16 @@ vulkan-tools
 wget
 xclip
 yt-dlp
-zoxide
 zsh
 
 # FreeBSD packages
-codespell
-html
 fusefs-lkl
 firefox-esr
-gitleaks
-lua54
-shfmt
-sqlite
-stylua
-tree-sitter
-vscode
 
 # Conflicts on FreeBSD
 ca-certificates
-clang
-code
 dnscrypt-proxy
 extra-cmake-modules
 firefox
 kdeconnect
-lua
-make
 synaptic