diff --git a/neovim/lua/plugins/ale.lua b/neovim/lua/plugins/ale.lua
index 40a5a88..ab5cace 100644
--- a/neovim/lua/plugins/ale.lua
+++ b/neovim/lua/plugins/ale.lua
@@ -13,6 +13,7 @@ vim.g.ale_linters = {
     markdown = {},
     fish = {},
     ansible = {},
+    dockerfile = {},
 }
 vim.g.ale_linter_aliases = {
     markdown = { "text" },
diff --git a/neovim/lua/plugins/lsp.lua b/neovim/lua/plugins/lsp.lua
index 9734722..d1e64ee 100644
--- a/neovim/lua/plugins/lsp.lua
+++ b/neovim/lua/plugins/lsp.lua
@@ -239,6 +239,8 @@ function M.config_null_ls()
             -- Lua
             null_ls.builtins.diagnostics.luacheck,
             null_ls.builtins.formatting.stylua,
+            -- Docker
+            null_ls.builtins.diagnostics.hadolint,
         }
 
         -- HACK: Handle old versions of null_ls for vim < 0.6 that don't support `setup`