diff --git a/nvim/after/lsp/yamlls.lua b/nvim/after/lsp/yamlls.lua
new file mode 100644
index 0000000..fad7dde
--- /dev/null
+++ b/nvim/after/lsp/yamlls.lua
@@ -0,0 +1,9 @@
+return {
+    settings = {
+        yaml = {
+            schemaStore = {
+                enable = true
+            }
+        }
+    }
+}
diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index 6716e70..eafa1fa 100644
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -36,5 +36,6 @@ return {
         })
 
         vim.lsp.enable('gdscript')
+        vim.lsp.enable('cfn-lint')
     end
 }
diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua
index 8634c65..2f8c577 100644
--- a/nvim/lua/plugins/mason.lua
+++ b/nvim/lua/plugins/mason.lua
@@ -10,7 +10,7 @@ return {
                 'ansiblels',               -- Ansible
                 'arduino_language_server', -- Arduino specific C
                 'bashls',                  -- Bash
-                'cfn-lint',                -- Cloudformation for AWS
+                -- 'cfn-lint',                -- Cloudformation for AWS
                 'clangd',                  -- C/C++
                 'intelephense',            -- PHP
                 'lua_ls',                  -- Lua