diff --git a/modules/tools/docker/config.el b/modules/tools/docker/config.el
index 151352899..cf3c8a32f 100644
--- a/modules/tools/docker/config.el
+++ b/modules/tools/docker/config.el
@@ -1,9 +1,10 @@
 ;;; tools/docker/config.el -*- lexical-binding: t; -*-
 
-(def-package! docker
-  :config
-  (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))
+(after! docker
+  (set-evil-initial-state!
+    '(docker-container-mode
+      docker-image-mode
+      docker-network-mode
+      docker-volume-mode
+      docker-machine-mode)
+    'emacs))