diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 668032e0e..ef9510310 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -89,28 +89,10 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")
 ;;
 ;;; Packages
 
-(when (featurep! :editor evil)
-  (after! macrostep
-    (evil-define-key* 'normal macrostep-keymap
-      [return]  #'macrostep-expand
-      "e"       #'macrostep-expand
-      "u"       #'macrostep-collapse
-      "c"       #'macrostep-collapse
-
-      [tab]     #'macrostep-next-macro
-      "\C-n"    #'macrostep-next-macro
-      "J"       #'macrostep-next-macro
-
-      [backtab] #'macrostep-prev-macro
-      "K"       #'macrostep-prev-macro
-      "\C-p"    #'macrostep-prev-macro
-
-      "q"       #'macrostep-collapse-all
-      "C"       #'macrostep-collapse-all)
-
-    ;; `evil-normalize-keymaps' seems to be required for macrostep or it won't
-    ;; apply for the very first invocation
-    (add-hook 'macrostep-mode-hook #'evil-normalize-keymaps)))
+(map! :when (featurep! :editor evil)
+      :after macrostep
+      :map macrostep-keymap
+      :n [return] #'macrostep-expand)
 
 
 ;;;###package overseer