diff --git a/init.example.el b/init.example.el
index aaae090b1..809dc3e2f 100644
--- a/init.example.el
+++ b/init.example.el
@@ -63,6 +63,7 @@
        vc                ; version-control and Emacs, sitting in a tree
 
        :tools
+      ;docker
        editorconfig      ; let someone else argue about tabs vs spaces
       ;ein               ; tame Jupyter notebooks with emacs
       ;gist              ; interacting with github gists
diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index df7258d15..ebfbfbd42 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -729,7 +729,10 @@
           :desc "Send to Transmit"          :n "u" #'+macos/send-to-transmit
           :desc "Send project to Transmit"  :n "U" #'+macos/send-project-to-transmit
           :desc "Send to Launchbar"         :n "l" #'+macos/send-to-launchbar
-          :desc "Send project to Launchbar" :n "L" #'+macos/send-project-to-launchbar))
+          :desc "Send project to Launchbar" :n "L" #'+macos/send-project-to-launchbar)
+
+        (:when (featurep! :tools docker)
+          :desc "Docker"                    :n "D" #'docker))
 
       (:desc "project" :prefix "p"
         :desc "Browse project"          :n  "." #'+default/browse-project
diff --git a/modules/tools/docker/config.el b/modules/tools/docker/config.el
new file mode 100644
index 000000000..cf3c8a32f
--- /dev/null
+++ b/modules/tools/docker/config.el
@@ -0,0 +1,10 @@
+;;; tools/docker/config.el -*- lexical-binding: t; -*-
+
+(after! docker
+  (set-evil-initial-state!
+    '(docker-container-mode
+      docker-image-mode
+      docker-network-mode
+      docker-volume-mode
+      docker-machine-mode)
+    'emacs))
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)