diff --git a/docker/deploy/cpu_version/Dockerfile b/docker/deploy/cpu_version/Dockerfile
new file mode 100644
index 0000000000..317001385e
--- /dev/null
+++ b/docker/deploy/cpu_version/Dockerfile
@@ -0,0 +1,18 @@
+FROM ubuntu:18.04
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    gfortran libsqlite3-dev libmysqlclient-dev && \
+    apt-get remove --purge -y && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so
+
+COPY ./docker-entrypoint.sh /opt
+COPY ./milvus /opt/milvus
+ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/milvus/lib"
+
+ENTRYPOINT [ "/opt/docker-entrypoint.sh" ]
+
+CMD [ "start" ]
+
+EXPOSE 19530
diff --git a/docker/deploy/ubuntu16.04/docker-entrypoint.sh b/docker/deploy/cpu_version/docker-entrypoint.sh
similarity index 100%
rename from docker/deploy/ubuntu16.04/docker-entrypoint.sh
rename to docker/deploy/cpu_version/docker-entrypoint.sh
diff --git a/docker/deploy/ubuntu16.04/Dockerfile b/docker/deploy/gpu_version/ubuntu16.04/Dockerfile
similarity index 100%
rename from docker/deploy/ubuntu16.04/Dockerfile
rename to docker/deploy/gpu_version/ubuntu16.04/Dockerfile
diff --git a/docker/deploy/ubuntu18.04/docker-entrypoint.sh b/docker/deploy/gpu_version/ubuntu16.04/docker-entrypoint.sh
similarity index 100%
rename from docker/deploy/ubuntu18.04/docker-entrypoint.sh
rename to docker/deploy/gpu_version/ubuntu16.04/docker-entrypoint.sh
diff --git a/docker/deploy/ubuntu18.04/Dockerfile b/docker/deploy/gpu_version/ubuntu18.04/Dockerfile
similarity index 100%
rename from docker/deploy/ubuntu18.04/Dockerfile
rename to docker/deploy/gpu_version/ubuntu18.04/Dockerfile
diff --git a/docker/deploy/gpu_version/ubuntu18.04/docker-entrypoint.sh b/docker/deploy/gpu_version/ubuntu18.04/docker-entrypoint.sh
new file mode 100755
index 0000000000..446c174d74
--- /dev/null
+++ b/docker/deploy/gpu_version/ubuntu18.04/docker-entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+if [ "$1" == 'start' ]; then
+    cd /opt/milvus/scripts && ./start_server.sh
+fi
+
+exec "$@"
+