diff --git a/modules/tools/docker/config.el b/modules/tools/docker/config.el
index 5f520a7d6..d030acd85 100644
--- a/modules/tools/docker/config.el
+++ b/modules/tools/docker/config.el
@@ -2,6 +2,7 @@
 
 (after! dockerfile-mode
   (set-docsets! 'dockerfile-mode "Docker")
+  (set-formatter! 'dockfmt '("dockfmt" "fmt" filepath) :modes '(dockerfile-mode))
 
   (when (modulep! +lsp)
     (add-hook 'dockerfile-mode-local-vars-hook #'lsp! 'append)))
diff --git a/modules/tools/docker/doctor.el b/modules/tools/docker/doctor.el
new file mode 100644
index 000000000..d84713e7c
--- /dev/null
+++ b/modules/tools/docker/doctor.el
@@ -0,0 +1,5 @@
+;;; tools/docker/doctor.el -*- lexical-binding: t; -*-
+
+(when (modulep! :editor format)
+  (unless (executable-find "dockfmt")
+    (warn! "Couldn't find dockfmt. Formatting will be disabled.")))