diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cdecb5e99..af3106f0b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -29,6 +29,6 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: docker/Dockerfile.nvim-python3
+          file: docker/Dockerfile
           push: true
           tags: spacevim/spacevim:latest
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 000000000..763d86969
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,34 @@
+FROM debian:jessie
+
+MAINTAINER Shidong Wang <wsdjeg@outlook.com>
+
+RUN apt-get update && \
+    apt-get install -y neovim curl git exuberant-ctags silversearcher-ag && \
+    apt-get clean
+
+ENV HOME /home/spacevim
+
+RUN groupdel users                                              \
+  && groupadd -r spacevim                                       \
+  && useradd --create-home --home-dir $HOME                     \
+             -r -g spacevim                                     \
+             spacevim
+
+USER spacevim
+
+WORKDIR $HOME
+ENV PATH "$HOME/.local/bin:${PATH}"
+
+RUN mkdir -p $HOME/.config $HOME/.SpaceVim.d
+
+RUN pip install --user neovim pipenv
+
+RUN curl https://raw.githubusercontent.com/SpaceVim/SpaceVim/master/docker/init.toml > $HOME/.SpaceVim.d/init.toml
+
+RUN curl -sLf https://spacevim.org/install.sh | bash
+
+RUN nvim --headless +'call dein#install#_update([], "install", v:false)' +qall
+
+RUN rm $HOME/.SpaceVim.d/init.toml
+
+ENTRYPOINT /usr/local/bin/nvim
diff --git a/docker/Dockerfile.nvim-python3 b/docker/Dockerfile.nvim-python3
deleted file mode 100644
index 34e765432..000000000
--- a/docker/Dockerfile.nvim-python3
+++ /dev/null
@@ -1,58 +0,0 @@
-FROM python:3.6.5-stretch
-
-ENV DEBIAN_URL "http://ftp.us.debian.org/debian"
-
-RUN echo "deb $DEBIAN_URL testing main contrib non-free" >> /etc/apt/sources.list \
-  && apt-get update                                             \
-  && apt-get install -y --allow-unauthenticated                 \
-    autoconf                                                    \
-    automake                                                    \
-    cmake                                                       \
-    fish                                                        \
-    g++                                                         \
-    gettext                                                     \
-    git                                                         \
-    libtool                                                     \
-    libtool-bin                                                 \
-    lua5.3                                                      \
-    ninja-build                                                 \
-    pkg-config                                                  \
-    unzip                                                       \
-    xclip                                                       \
-    xfonts-utils                                                \
-  && apt-get clean all
-
-RUN cd /usr/src                                                 \
-  && git clone https://github.com/neovim/neovim.git             \
-  && cd neovim                                                  \
-  && make CMAKE_BUILD_TYPE=RelWithDebInfo                       \
-          CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=/usr/local" \
-  && make install                                               \
-  && rm -r /usr/src/neovim
-
-ENV HOME /home/spacevim
-
-RUN groupdel users                                              \
-  && groupadd -r spacevim                                       \
-  && useradd --create-home --home-dir $HOME                     \
-             -r -g spacevim                                     \
-             spacevim
-
-USER spacevim
-
-WORKDIR $HOME
-ENV PATH "$HOME/.local/bin:${PATH}"
-
-RUN mkdir -p $HOME/.config $HOME/.SpaceVim.d
-
-RUN pip install --user neovim pipenv
-
-RUN curl https://raw.githubusercontent.com/SpaceVim/SpaceVim/master/docker/init.toml > $HOME/.SpaceVim.d/init.toml
-
-RUN curl -sLf https://spacevim.org/install.sh | bash
-
-RUN nvim --headless +'call dein#install#_update([], "install", v:false)' +qall
-
-RUN rm $HOME/.SpaceVim.d/init.toml
-
-ENTRYPOINT /usr/local/bin/nvim
diff --git a/docker/Makefile b/docker/Makefile
index 02bba0022..def3653f1 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -3,10 +3,10 @@ HAVE_PODMAN := $(shell which podman 2>/dev/null)
 
 build:
 ifdef HAVE_DOCKER	
-	docker build -t nvim -f Dockerfile.nvim-python3 .
+	docker build -t nvim -f Dockerfile .
 else
 ifdef HAVE_PODMAN
-	podman build -t nvim -f Dockerfile.nvim-python3 .
+	podman build -t nvim -f Dockerfile .
 else
 	$(error "No docker or podman in $(PATH). Check if one was installed.")
 endif
diff --git a/docker/README.md b/docker/README.md
index 31fcf909d..1ee45489e 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -26,7 +26,7 @@ You can build using the supplied `Makefile`:
 
 or call the command manually using:
 
-    docker build -t nvim -f Dockerfile.nvim-python3 .
+    docker build -t nvim -f Dockerfile .
 
 ### Run