diff --git a/layers/+distributions/spacemacs-docker/README.org b/layers/+distributions/spacemacs-docker/README.org
index 673f3802a..b45ce0d50 100644
--- a/layers/+distributions/spacemacs-docker/README.org
+++ b/layers/+distributions/spacemacs-docker/README.org
@@ -86,7 +86,7 @@ Get [[https://www.cygwin.com][Cygwin]] with =xinit=, =xorg-server= and optionaly
  #+END_SRC
  #+BEGIN_SRC sh
  docker run --name spacemacs \
-  -e DISPLAY="unix$DISPLAY" \
+  -e DISPLAY="$DISPLAY" \
   -v <path_to_your_workspace>:/mnt/workspace \
   spacemacs/emacs25:develop
 #+END_SRC
@@ -94,12 +94,12 @@ Get [[https://www.cygwin.com][Cygwin]] with =xinit=, =xorg-server= and optionaly
  Or with =-ti= via =winpty=
 #+BEGIN_SRC sh
 winpty docker run -ti --name spacemacs \
- -e DISPLAY="unix$DISPLAY" \
+ -e DISPLAY="$DISPLAY" \
  -v <path_to_your_workspace>:/mnt/workspace \
  spacemacs/emacs25:develop
 #+END_SRC
 [[http://manomarks.github.io/2015/12/03/docker-gui-windows.html][source]]
-Also You can use [[https://github.com/JAremko/docker-emacs/issues/2#issuecomment-260047233][@ninrod 's vagrant setup]]
+Also You can use [[https://www.reddit.com/r/emacs/comments/7a63r4/emacs_in_win10linuxdockerxserver_combo/][@ninrod 's setup]]
 
 ** GNU/Linux
 Make sure that =$DISPLAY= variable is set
@@ -192,6 +192,7 @@ Now visit http://localhost:10000/index.html?encoding=png&password=<PASSWORD>
 - =docker ps -a= - list all containers
 - =docker run ... spacemacs/emacs25:develop= - run the [[https://github.com/JAremko/docker-emacs/blob/master/Dockerfile.emacs25#L63][default command]]
 - =docker run -ti ... spacemacs/emacs25:develop /bin/bash= - start bash
+- =docker run --network=host ...= - less overhead and no need to map ports
 - =docker exec spacemacs /usr/bin/emacs= - start =/usr/bin/emacs=
 With the running =spacemacs= container
 - =docker logs spacemacs= - print =spacemacs= container's logs
diff --git a/layers/+distributions/spacemacs-docker/deps-install/installers/clojure/install.el b/layers/+distributions/spacemacs-docker/deps-install/installers/clojure/install.el
index dd062aa6d..0740c2900 100755
--- a/layers/+distributions/spacemacs-docker/deps-install/installers/clojure/install.el
+++ b/layers/+distributions/spacemacs-docker/deps-install/installers/clojure/install.el
@@ -25,7 +25,7 @@
      "su - ${UNAME} -c 'echo exit | lein repl'")
   (! "Installing Boot...")
   (cp ".boot" (dir $UHOME))
-  (set-glob-envs '("BOOT_CLOJURE_VERSION" . "1.8.0")
+  (set-glob-envs '("BOOT_CLOJURE_VERSION" . "1.9.0")
                  `("BOOT_LOCAL_REPO" . ,(concat (dir $UHOME) ".m2/repository")))
   ($ ["curl -Lo /usr/local/bin/boot"
       "https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh"]
diff --git a/layers/+distributions/spacemacs-docker/deps-install/installers/gtags/install.el b/layers/+distributions/spacemacs-docker/deps-install/installers/gtags/install.el
index 91e16bc8d..6a5bfa2c4 100755
--- a/layers/+distributions/spacemacs-docker/deps-install/installers/gtags/install.el
+++ b/layers/+distributions/spacemacs-docker/deps-install/installers/gtags/install.el
@@ -14,7 +14,7 @@
                         (file-name-directory
                          load-file-name)) nil t)
 
-(let ((global-version "6.5.5"))
+(let ((global-version "6.5.6"))
   (install python-pygments libncurses-dev)
   (with-installed (git tar curl gzip autotools-dev
                        pkg-config libtool dh-autoreconf)
diff --git a/layers/+distributions/spacemacs-docker/deps-install/installers/pandoc/install.el b/layers/+distributions/spacemacs-docker/deps-install/installers/pandoc/install.el
index 228ee23f1..e545c3f4a 100755
--- a/layers/+distributions/spacemacs-docker/deps-install/installers/pandoc/install.el
+++ b/layers/+distributions/spacemacs-docker/deps-install/installers/pandoc/install.el
@@ -14,4 +14,13 @@
                         (file-name-directory
                          load-file-name)) nil t)
 
-(install pandoc)
+(let* ((pandoc-version "2.0.6")
+       (pandoc-url (concat "https://github.com/jgm/pandoc/releases/download/"
+                           (format "%s/pandoc-%s-1-amd64.deb"
+                                   pandoc-version
+                                   pandoc-version))))
+  (with-build-dir (tpd "/tmp/pandoc")
+    (with-installed (wget)
+      ($ `("wget %s -O pandoc.deb" ,pandoc-url)
+         "dpkg -i ./pandoc.deb"
+         "apt-get install -f"))))