diff --git a/modules/tools/docker/config.el b/modules/tools/docker/config.el
new file mode 100644
index 000000000..c9bcc422a
--- /dev/null
+++ b/modules/tools/docker/config.el
@@ -0,0 +1,22 @@
+;;; tools/docker/config.el -*- lexical-binding: t; -*-
+
+(def-package! docker)
+(def-package! docker-tramp)
+(def-package! dockerfile-mode)
+
+(after! docker
+  (set-evil-initial-state! 'docker-container-mode 'emacs)
+  (set-evil-initial-state! 'docker-image-mode 'emacs)
+  (set-evil-initial-state! 'docker-network-mode 'emacs)
+  (set-evil-initial-state! 'docker-volume-mode 'emacs)
+  (set-evil-initial-state! 'docker-machine-mode 'emacs))
+
+(map!
+ (:leader
+   (:prefix "d"
+    :desc "Docker":n            "." #'docker
+    :desc "Docker Containers":n "c" #'docker-containers
+    :desc "Docker Images":n     "i" #'docker-images
+    :desc "Docker Networks":n   "n" #'docker-networks
+    :desc "Docker Volumes":n    "v" #'docker-volumes
+    :desc "Docker Machines":n   "m" #'docker-machines)))
diff --git a/modules/tools/docker/packages.el b/modules/tools/docker/packages.el
new file mode 100644
index 000000000..9266beee4
--- /dev/null
+++ b/modules/tools/docker/packages.el
@@ -0,0 +1,6 @@
+;; -*- no-byte-compile: t; -*-
+;;; tools/docker/packages.el
+
+(package! docker)
+(package! docker-tramp)
+(package! dockerfile-mode)