diff --git a/README.md b/README.md
index 6327061a5..caa0ac1f5 100644
--- a/README.md
+++ b/README.md
@@ -243,6 +243,7 @@ local DEFAULT_SETTINGS = {
 | Fennel | [`fennel_ls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#fennel_ls) |
 | Flux | [`flux_lsp`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#flux_lsp) |
 | Fortran | [`fortls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#fortls) |
+| GitHub Actions | [`gh_actions_ls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.txt#gh_actions_ls) |
 | Glimmer | [`glint`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#glint) |
 | GLSL | [`glslls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#glslls) |
 | Go | [`ast_grep`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#ast_grep) |
diff --git a/doc/mason-lspconfig-mapping.txt b/doc/mason-lspconfig-mapping.txt
index 795c16154..63ccf804f 100644
--- a/doc/mason-lspconfig-mapping.txt
+++ b/doc/mason-lspconfig-mapping.txt
@@ -68,6 +68,7 @@ flux-lsp                                  flux_lsp
 foam-language-server                      foam_ls
 fortls                                    fortls
 fsautocomplete                            fsautocomplete
+gh-actions-language-server                gh_actions_ls
 ginko_ls                                  ginko_ls
 gitlab-ci-ls                              gitlab_ci_ls
 glint                                     glint
diff --git a/doc/server-mapping.md b/doc/server-mapping.md
index b51218d10..370975c87 100644
--- a/doc/server-mapping.md
+++ b/doc/server-mapping.md
@@ -65,6 +65,7 @@
 | [foam_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#foam_ls) | [foam-language-server](https://mason-registry.dev/registry/list#foam-language-server) |
 | [fortls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#fortls) | [fortls](https://mason-registry.dev/registry/list#fortls) |
 | [fsautocomplete](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#fsautocomplete) | [fsautocomplete](https://mason-registry.dev/registry/list#fsautocomplete) |
+| [gh_actions_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#gh_actions_ls) | [gh-actions-language-server](https://mason-registry.dev/registry/list#gh-actions-language-server) |
 | [ginko_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#ginko_ls) | [ginko_ls](https://mason-registry.dev/registry/list#ginko_ls) |
 | [gitlab_ci_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#gitlab_ci_ls) | [gitlab-ci-ls](https://mason-registry.dev/registry/list#gitlab-ci-ls) |
 | [glint](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#glint) | [glint](https://mason-registry.dev/registry/list#glint) |
diff --git a/lua/mason-lspconfig/mappings/filetype.lua b/lua/mason-lspconfig/mappings/filetype.lua
index 5a6a3a8a3..cfbe00df6 100644
--- a/lua/mason-lspconfig/mappings/filetype.lua
+++ b/lua/mason-lspconfig/mappings/filetype.lua
@@ -242,8 +242,9 @@ return {
   ["yaml.ansible"] = { "ansiblels" },
   ["yaml.docker-compose"] = { "docker_compose_language_service", "yamlls" },
   ["yaml.gitlab"] = { "gitlab_ci_ls", "yamlls" },
+  ["yaml.github"] = { "gh_actions_ls", "yamlls" },
   ["yaml.openapi"] = { "vacuum" },
   yml = { "spectral" },
   zig = { "zls" },
   zir = { "zls" }
-}
\ No newline at end of file
+}
diff --git a/lua/mason-lspconfig/mappings/server.lua b/lua/mason-lspconfig/mappings/server.lua
index 73d9f9895..a0551fd14 100644
--- a/lua/mason-lspconfig/mappings/server.lua
+++ b/lua/mason-lspconfig/mappings/server.lua
@@ -69,6 +69,7 @@ M.lspconfig_to_package = {
     ["fortls"] = "fortls",
     ["fsautocomplete"] = "fsautocomplete",
     ["gitlab_ci_ls"] = "gitlab-ci-ls",
+    ["gh_actions_ls"] = "gh-actions-language-server",
     ["ginko_ls"] = "ginko_ls",
     ["glint"] = "glint",
     ["glsl_analyzer"] = "glsl_analyzer",