diff --git a/Dockerfile b/Dockerfile
index b835cc52cbe25492ae52e2da195b8d2b77391e4a..8f3137df08875a640a6809e4cd8b3c4409007cff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG UBUNTU_MIRROR
-RUN /bin/bash -c 'if [[ -n ${UBUNTU_MIRROR} ]]; then sed -i 's#http://archive.ubuntu.com#${UBUNTU_MIRROR}#g' /etc/apt/sources.list; fi'
+RUN /bin/bash -c 'if [[ -n ${UBUNTU_MIRROR} ]]; then sed -i 's#http://archive.ubuntu.com/ubuntu#${UBUNTU_MIRROR}#g' /etc/apt/sources.list; fi'
 
 # ENV variables
 ARG BUILD_WOBOQ
diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh
index 9f91d8b5715b12958a6b7391c9e1af3387424875..b617865016dc2ea9a53a2afe19cfdafd6de8eb3c 100755
--- a/paddle/scripts/docker/build.sh
+++ b/paddle/scripts/docker/build.sh
@@ -16,15 +16,19 @@ if [ ${WITH_GPU} == "ON" ]; then
   BASE_IMAGE="nvidia/cuda:7.5-cudnn5-runtime-ubuntu14.04"
   if [ ${WITH_AVX} == "ON" ]; then
     DEB_PATH="dist/gpu/"
+    DOCKER_SUFFIX="gpu"
   else
     DEB_PATH="dist/gpu-noavx/"
+    DOCKER_SUFFIX="gpu-noavx"
   fi
 else
   BASE_IMAGE="python:2.7.13-slim"
   if [ ${WITH_AVX} == "ON" ]; then
     DEB_PATH="dist/cpu/"
+    DOCKER_SUFFIX=""
   else
     DEB_PATH="dist/cpu-noavx/"
+    DOCKER_SUFFIX="noavx"
   fi
 fi
 # If Dockerfile.* sets BUILD_AND_INSTALL to 'ON', it would have copied
@@ -95,7 +99,7 @@ else
   MIRROR_UPDATE="\\"
 fi
 
-cat > /paddle/build/Dockerfile <<EOF
+cat > /paddle/build/Dockerfile.${DOCKER_SUFFIX} <<EOF
 FROM ${BASE_IMAGE}
 MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>