diff --git a/layers/+tools/docker/README.org b/layers/+tools/docker/README.org
index bbb827b0b..868aa3f85 100644
--- a/layers/+tools/docker/README.org
+++ b/layers/+tools/docker/README.org
@@ -72,19 +72,8 @@ auto-completion of the running containers.
 
 * Key bindings
 
-| Key binding   | Description                                 |
-|---------------+---------------------------------------------|
-| ~SPC m c b~   | build current buffer                        |
-| ~SPC m c B~   | build current buffer without cache          |
-| ~SPC a t d c~ | list docker containers                      |
-| ~SPC a t d C~ | docker-compose commands for current project |
-| ~SPC a t d d~ | delete image                                |
-| ~SPC a t d e~ | unpause container                           |
-| ~SPC a t d F~ | pull image                                  |
-| ~SPC a t d i~ | list docker images                          |
-| ~SPC a t d k~ | delete container                            |
-| ~SPC a t d o~ | stop container                              |
-| ~SPC a t d p~ | pause container                             |
-| ~SPC a t d P~ | push image                                  |
-| ~SPC a t d r~ | restart container                           |
-| ~SPC a t d s~ | start container                             |
+| Key binding | Description                                                       |
+|-------------+-------------------------------------------------------------------|
+| ~SPC m c b~ | build current buffer                                              |
+| ~SPC m c B~ | build current buffer without cache                                |
+| ~SPC a t d~ | entry point to interact with dockers, after that use ~?~ for help |
diff --git a/layers/+tools/docker/packages.el b/layers/+tools/docker/packages.el
index 7cd8d80ce..2523663bc 100644
--- a/layers/+tools/docker/packages.el
+++ b/layers/+tools/docker/packages.el
@@ -35,29 +35,7 @@
     :defer t
     :init
     (progn
-      (spacemacs/declare-prefix "atd" "Docker")
-      (evil-leader/set-key
-        "atdc" 'docker-containers
-        "atdC" 'docker-compose
-        "atdd" 'docker-rmi
-        "atde" 'docker-unpause
-        "atdF" 'docker-pull
-        "atdk" 'docker-rm
-        "atdi" 'docker-images
-        "atdm" 'docker-machines
-        "atdn" 'docker-networks
-        "atdo" 'docker-stop
-        "atdP" 'docker-push
-        "atdp" 'docker-pause
-        "atdr" 'docker-restart
-        "atds" 'docker-start
-        "atdv" 'docker-volumes)))
-  (with-eval-after-load 'docker-containers
-    (evilified-state-evilify-map docker-containers-mode-map
-      :mode docker-containers-mode))
-  (with-eval-after-load 'docker-images
-    (evilified-state-evilify-map docker-images-mode-map
-      :mode docker-images-mode)))
+      (spacemacs/set-leader-keys "atd" #'docker))))
 
 (defun docker/init-docker-tramp ()
   (use-package docker-tramp