diff --git a/lua/astrocommunity/pack/docker/README.md b/lua/astrocommunity/pack/docker/README.md
new file mode 100644
index 000000000..e52547008
--- /dev/null
+++ b/lua/astrocommunity/pack/docker/README.md
@@ -0,0 +1,7 @@
+# Docker Language Pack
+
+This plugin pack does the following:
+
+- Adds `dockerfile` Treesitter parser
+- Adds `dockerfile-language-server` and `docker-compose-language-service` language servers
+- Adds `hadolint` linter
diff --git a/lua/astrocommunity/pack/docker/docker.lua b/lua/astrocommunity/pack/docker/docker.lua
new file mode 100644
index 000000000..7f3e097f7
--- /dev/null
+++ b/lua/astrocommunity/pack/docker/docker.lua
@@ -0,0 +1,24 @@
+local utils = require "astronvim.utils"
+return {
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      if opts.ensure_installed ~= "all" then
+        opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "dockerfile")
+      end
+    end,
+  },
+  {
+    "williamboman/mason-lspconfig.nvim",
+    opts = function(_, opts)
+      opts.ensure_installed = utils.list_insert_unique(
+        opts.ensure_installed,
+        { "docker-compose-language-service", "dockerfile-language-server" }
+      )
+    end,
+  },
+  {
+    "jay-babu/mason-null-ls.nvim",
+    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "hadolint") end,
+  },
+}