diff --git a/emacs/.emacs.d/config/init-docker.el b/emacs/.emacs.d/config/init-docker.el
new file mode 100644
index 0000000..f409b27
--- /dev/null
+++ b/emacs/.emacs.d/config/init-docker.el
@@ -0,0 +1,11 @@
+;; -*- lexical-binding: t; -*-
+
+(use-package dockerfile-mode
+  :mode (("Dockerfile\\'" . dockerfile-mode)))
+
+(use-package docker
+  :commands (docker)
+  :config
+  (evil-collection-docker-setup))
+
+(provide 'init-docker)
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index c980656..54e1f37 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -83,6 +83,7 @@
 (require 'init-yaml)
 (require 'init-groovy)
 (require 'init-terraform)
+(require 'init-docker)
 (require 'init-run-command)
 (require 'init-aws)
 (require 'init-prodigy)