diff --git a/Makefile b/Makefile
index 73cfb70..9e3776b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,8 @@
 
 IMAGE=csiplugin/csi-neonsan
 TAG=canary
-IMAGE_UBUNTU=csiplugin/csi-neonsan-ubuntu
+UBUNTU_VERSION=1604
+IMAGE_UBUNTU=csiplugin/csi-neonsan-ubuntu${UBUNTU_VERSION}
 TAG_UBUNTU=canary
 IMAGE_CENTOS=csiplugin/csi-neonsan-centos
 TAG_CENTOS=canary
@@ -29,7 +30,7 @@ container:
 	docker build -t ${IMAGE}:${TAG} -f deploy/neonsan/docker/Dockerfile  .
 
 container-ubuntu:
-	docker build -t ${IMAGE_UBUNTU}:${TAG_UBUNTU} -f deploy/neonsan/docker/ubuntu/Dockerfile  .
+	docker build -t ${IMAGE_UBUNTU}:${TAG_UBUNTU} -f deploy/neonsan/docker/ubuntu/${UBUNTU_VERSION}.Dockerfile  .
 
 container-centos:
 	docker build -t ${IMAGE_CENTOS}:${TAG_CENTOS} -f deploy/neonsan/docker/centos/Dockerfile  .
diff --git a/deploy/neonsan/docker/ubuntu/1604.Dockerfile b/deploy/neonsan/docker/ubuntu/1604.Dockerfile
new file mode 100644
index 0000000..e6f3b82
--- /dev/null
+++ b/deploy/neonsan/docker/ubuntu/1604.Dockerfile
@@ -0,0 +1,32 @@
+# +-------------------------------------------------------------------------
+# | Copyright (C) 2018 Yunify, Inc.
+# +-------------------------------------------------------------------------
+# | Licensed under the Apache License, Version 2.0 (the "License");
+# | you may not use this work except in compliance with the License.
+# | You may obtain a copy of the License in the LICENSE file, or at:
+# |
+# | http://www.apache.org/licenses/LICENSE-2.0
+# |
+# | Unless required by applicable law or agreed to in writing, software
+# | distributed under the License is distributed on an "AS IS" BASIS,
+# | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# | See the License for the specific language governing permissions and
+# | limitations under the License.
+# +-------------------------------------------------------------------------
+
+FROM golang:1.14.4-alpine as builder
+WORKDIR /qingstor-csi
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=vendor  -ldflags "-s -w" -o  _output/neonsan-csi-driver ./cmd/neonsan
+
+FROM ubuntu:16.04
+LABEL maintainers="Yunify"
+LABEL description="NeonSAN CSI plugin"
+# libcurl3 and libicu55 for qbd
+RUN apt-get update -y && \
+    apt-get install -y libcurl3 libicu55 && \
+    apt-get install -y e2fsprogs xfsprogs mount ca-certificates udev
+COPY --from=builder /qingstor-csi/_output/neonsan-csi-driver /neonsan-csi-driver
+RUN chmod +x /neonsan-csi-driver && \
+    mkdir -p /var/log/neonsan-csi-driver
+ENTRYPOINT ["/neonsan-csi-driver"]
\ No newline at end of file
diff --git a/deploy/neonsan/docker/ubuntu/1804.Dockerfile b/deploy/neonsan/docker/ubuntu/1804.Dockerfile
new file mode 100644
index 0000000..1925f05
--- /dev/null
+++ b/deploy/neonsan/docker/ubuntu/1804.Dockerfile
@@ -0,0 +1,32 @@
+# +-------------------------------------------------------------------------
+# | Copyright (C) 2018 Yunify, Inc.
+# +-------------------------------------------------------------------------
+# | Licensed under the Apache License, Version 2.0 (the "License");
+# | you may not use this work except in compliance with the License.
+# | You may obtain a copy of the License in the LICENSE file, or at:
+# |
+# | http://www.apache.org/licenses/LICENSE-2.0
+# |
+# | Unless required by applicable law or agreed to in writing, software
+# | distributed under the License is distributed on an "AS IS" BASIS,
+# | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# | See the License for the specific language governing permissions and
+# | limitations under the License.
+# +-------------------------------------------------------------------------
+
+FROM golang:1.14.4-alpine as builder
+WORKDIR /qingstor-csi
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=vendor  -ldflags "-s -w" -o  _output/neonsan-csi-driver ./cmd/neonsan
+
+FROM ubuntu:18.04
+LABEL maintainers="Yunify"
+LABEL description="NeonSAN CSI plugin"
+# libcurl4 and libicu60 for qbd
+RUN apt-get update -y && \
+    apt-get install -y libcurl4 libicu60 && \
+    apt-get install -y e2fsprogs xfsprogs mount ca-certificates udev
+COPY --from=builder /qingstor-csi/_output/neonsan-csi-driver /neonsan-csi-driver
+RUN chmod +x /neonsan-csi-driver && \
+    mkdir -p /var/log/neonsan-csi-driver
+ENTRYPOINT ["/neonsan-csi-driver"]