diff --git a/paddle/scripts/docker/cpu/Dockerfile b/paddle/scripts/docker/Dockerfile.cpu
similarity index 94%
rename from paddle/scripts/docker/cpu/Dockerfile
rename to paddle/scripts/docker/Dockerfile.cpu
index 119154200a135f204ddd572fb21069c5712af913..3aa8cb1a3a8695d513ca0682c0ac2a269e6589da 100644
--- a/paddle/scripts/docker/cpu/Dockerfile
+++ b/paddle/scripts/docker/Dockerfile.cpu
@@ -7,4 +7,5 @@ ENV WITH_DEMO=OFF
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/cpu-demo/Dockerfile b/paddle/scripts/docker/Dockerfile.cpu-demo
similarity index 93%
rename from paddle/scripts/docker/cpu-demo/Dockerfile
rename to paddle/scripts/docker/Dockerfile.cpu-demo
index b2291203829d25ec2d021410eded365262caa016..22c0b9e701bfc06230d7fcb1f7b3c49e8e3d0d0f 100644
--- a/paddle/scripts/docker/cpu-demo/Dockerfile
+++ b/paddle/scripts/docker/Dockerfile.cpu-demo
@@ -7,4 +7,5 @@ ENV WITH_DEMO=ON
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/cpu-devel/Dockerfile b/paddle/scripts/docker/Dockerfile.cpu-devel
similarity index 94%
rename from paddle/scripts/docker/cpu-devel/Dockerfile
rename to paddle/scripts/docker/Dockerfile.cpu-devel
index 1bfa202d0c574035ddc20d91a18103a9930b9e90..b40f3c0a30ba36571883a9881f6146e630cca187 100644
--- a/paddle/scripts/docker/cpu-devel/Dockerfile
+++ b/paddle/scripts/docker/Dockerfile.cpu-devel
@@ -7,4 +7,5 @@ ENV WITH_DEMO=OFF
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.cpu-noavx b/paddle/scripts/docker/Dockerfile.cpu-noavx
new file mode 100644
index 0000000000000000000000000000000000000000..5cb5ac7dc4e6811ffdcacae7188dae078adc4030
--- /dev/null
+++ b/paddle/scripts/docker/Dockerfile.cpu-noavx
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=OFF
+ENV IS_DEVEL=OFF
+ENV WITH_DEMO=OFF
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.cpu-noavx-demo b/paddle/scripts/docker/Dockerfile.cpu-noavx-demo
new file mode 100644
index 0000000000000000000000000000000000000000..bec401960efb2329a54e0e80043eba7d9ab36d9c
--- /dev/null
+++ b/paddle/scripts/docker/Dockerfile.cpu-noavx-demo
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=OFF
+ENV IS_DEVEL=ON
+ENV WITH_DEMO=ON
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.cpu-noavx-devel b/paddle/scripts/docker/Dockerfile.cpu-noavx-devel
new file mode 100644
index 0000000000000000000000000000000000000000..b7c3eaed97aa5f11c80a9082fc7733ffd475e965
--- /dev/null
+++ b/paddle/scripts/docker/Dockerfile.cpu-noavx-devel
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=OFF
+ENV IS_DEVEL=ON
+ENV WITH_DEMO=OFF
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/gpu/Dockerfile b/paddle/scripts/docker/Dockerfile.gpu
similarity index 94%
rename from paddle/scripts/docker/gpu/Dockerfile
rename to paddle/scripts/docker/Dockerfile.gpu
index 62d6f1f98769b57f9ac6a87eaf4d058eae79e2c5..b7f5b6d93df50638fbb5e04c61aeed112371ef5b 100644
--- a/paddle/scripts/docker/gpu/Dockerfile
+++ b/paddle/scripts/docker/Dockerfile.gpu
@@ -7,4 +7,5 @@ ENV WITH_DEMO=OFF
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/gpu-demo/Dockerfile b/paddle/scripts/docker/Dockerfile.gpu-demo
similarity index 94%
rename from paddle/scripts/docker/gpu-demo/Dockerfile
rename to paddle/scripts/docker/Dockerfile.gpu-demo
index f3b8cd568db6072548e3e6db23648c4d76bfe006..2d1411de09f2ac37aa129f51d5d4e98baa22023b 100644
--- a/paddle/scripts/docker/gpu-demo/Dockerfile
+++ b/paddle/scripts/docker/Dockerfile.gpu-demo
@@ -7,4 +7,5 @@ ENV WITH_DEMO=ON
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/gpu-devel/Dockerfile b/paddle/scripts/docker/Dockerfile.gpu-devel
similarity index 94%
rename from paddle/scripts/docker/gpu-devel/Dockerfile
rename to paddle/scripts/docker/Dockerfile.gpu-devel
index 2e600f34d03ed05c038b6ccd8d93bccb1a8a92f7..eb13f4304fa06203fcf319b6b1cf4adf087cb044 100644
--- a/paddle/scripts/docker/gpu-devel/Dockerfile
+++ b/paddle/scripts/docker/Dockerfile.gpu-devel
@@ -7,4 +7,5 @@ ENV WITH_DEMO=OFF
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.gpu-noavx b/paddle/scripts/docker/Dockerfile.gpu-noavx
new file mode 100644
index 0000000000000000000000000000000000000000..0944b0e152af3ba3e4794091c6a76e05b888573b
--- /dev/null
+++ b/paddle/scripts/docker/Dockerfile.gpu-noavx
@@ -0,0 +1,11 @@
+FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=ON
+ENV IS_DEVEL=OFF
+ENV WITH_DEMO=OFF
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.gpu-noavx-demo b/paddle/scripts/docker/Dockerfile.gpu-noavx-demo
new file mode 100644
index 0000000000000000000000000000000000000000..2da2a55d696a38016b0eb13cd263977026cb1f2b
--- /dev/null
+++ b/paddle/scripts/docker/Dockerfile.gpu-noavx-demo
@@ -0,0 +1,11 @@
+FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=ON
+ENV IS_DEVEL=ON
+ENV WITH_DEMO=ON
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.gpu-noavx-devel b/paddle/scripts/docker/Dockerfile.gpu-noavx-devel
new file mode 100644
index 0000000000000000000000000000000000000000..9f551462f206aaf59fca7ee5bfe258f83cfdd0ca
--- /dev/null
+++ b/paddle/scripts/docker/Dockerfile.gpu-noavx-devel
@@ -0,0 +1,11 @@
+FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=ON
+ENV IS_DEVEL=ON
+ENV WITH_DEMO=OFF
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.m4 b/paddle/scripts/docker/Dockerfile.m4
index 89a1147103ce396bffa0bc683aaec433f0c1e6f1..129d21b36abd9443e62276c75da3eeb19fa246de 100644
--- a/paddle/scripts/docker/Dockerfile.m4
+++ b/paddle/scripts/docker/Dockerfile.m4
@@ -7,4 +7,5 @@ ENV WITH_DEMO=PADDLE_WITH_DEMO
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=PADDLE_WITH_AVX
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh
index 1f74e1f1af22ab7531c0ad546d9e734d0b4b2541..33689e736cda76ea5731d847260b399fc8c6e484 100644
--- a/paddle/scripts/docker/build.sh
+++ b/paddle/scripts/docker/build.sh
@@ -26,7 +26,7 @@ cd paddle
 mkdir build
 cd build
 cmake .. -DWITH_DOC=OFF -DWITH_GPU=${WITH_GPU} -DWITH_SWIG_PY=ON\
-   -DCUDNN_ROOT=/usr/ -DWITH_STYLE_CHECK=OFF
+   -DCUDNN_ROOT=/usr/ -DWITH_STYLE_CHECK=OFF -DWITH_AVX=${WITH_AVX}
 make -j `nproc`
 # because durning make install, there are several warning, so set +e, do not cause abort
 make install
diff --git a/paddle/scripts/docker/cpu-demo/build.sh b/paddle/scripts/docker/cpu-demo/build.sh
deleted file mode 100644
index 1f74e1f1af22ab7531c0ad546d9e734d0b4b2541..0000000000000000000000000000000000000000
--- a/paddle/scripts/docker/cpu-demo/build.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-function abort(){
-    echo "An error occurred. Exiting..." 1>&2
-    exit 1
-}
-
-trap 'abort' 0
-set -e
-if [ ${USE_UBUNTU_MIRROR} == "ON" ]; then
-    sed -i 's#http://archive\.ubuntu\.com/ubuntu/#mirror://mirrors\.ubuntu\.com/mirrors\.txt#g'\
-      /etc/apt/sources.list
-fi
-apt-get update
-apt-get install -y cmake libprotobuf-dev protobuf-compiler git \
-    libgoogle-glog-dev libgflags-dev libatlas-dev libatlas3-base g++ m4 python-pip\
-    python-protobuf python-numpy python-dev swig
-
-if [ ${WITH_GPU} == 'ON' ]; then
-  ln -s /usr/lib/x86_64-linux-gnu/libcudnn.so /usr/lib/libcudnn.so
-fi
-
-cd ~
-git clone https://github.com/baidu/Paddle.git paddle
-cd paddle
-mkdir build
-cd build
-cmake .. -DWITH_DOC=OFF -DWITH_GPU=${WITH_GPU} -DWITH_SWIG_PY=ON\
-   -DCUDNN_ROOT=/usr/ -DWITH_STYLE_CHECK=OFF
-make -j `nproc`
-# because durning make install, there are several warning, so set +e, do not cause abort
-make install
-echo 'export LD_LIBRARY_PATH=/usr/lib64:${LD_LIBRARY_PATH}' >> /etc/profile
-pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS} /usr/local/opt/paddle/share/wheels/*.whl
-paddle version  # print version after build
-
-if [ ${WITH_DEMO} == "ON" ]; then
-  apt-get install -y wget unzip perl python-matplotlib tar xz-utils bzip2 gzip coreutils\
-	          sed grep graphviz libjpeg-dev zlib1g-dev
-  pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS}  BeautifulSoup docopt \
-    PyYAML pillow
-fi
-if [ ${IS_DEVEL} == "OFF" ]; then  # clean build packages.
-  cd ~
-  rm -rf paddle
-fi
-apt-get clean -y
-trap : 0
diff --git a/paddle/scripts/docker/cpu-devel/build.sh b/paddle/scripts/docker/cpu-devel/build.sh
deleted file mode 100644
index 1f74e1f1af22ab7531c0ad546d9e734d0b4b2541..0000000000000000000000000000000000000000
--- a/paddle/scripts/docker/cpu-devel/build.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-function abort(){
-    echo "An error occurred. Exiting..." 1>&2
-    exit 1
-}
-
-trap 'abort' 0
-set -e
-if [ ${USE_UBUNTU_MIRROR} == "ON" ]; then
-    sed -i 's#http://archive\.ubuntu\.com/ubuntu/#mirror://mirrors\.ubuntu\.com/mirrors\.txt#g'\
-      /etc/apt/sources.list
-fi
-apt-get update
-apt-get install -y cmake libprotobuf-dev protobuf-compiler git \
-    libgoogle-glog-dev libgflags-dev libatlas-dev libatlas3-base g++ m4 python-pip\
-    python-protobuf python-numpy python-dev swig
-
-if [ ${WITH_GPU} == 'ON' ]; then
-  ln -s /usr/lib/x86_64-linux-gnu/libcudnn.so /usr/lib/libcudnn.so
-fi
-
-cd ~
-git clone https://github.com/baidu/Paddle.git paddle
-cd paddle
-mkdir build
-cd build
-cmake .. -DWITH_DOC=OFF -DWITH_GPU=${WITH_GPU} -DWITH_SWIG_PY=ON\
-   -DCUDNN_ROOT=/usr/ -DWITH_STYLE_CHECK=OFF
-make -j `nproc`
-# because durning make install, there are several warning, so set +e, do not cause abort
-make install
-echo 'export LD_LIBRARY_PATH=/usr/lib64:${LD_LIBRARY_PATH}' >> /etc/profile
-pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS} /usr/local/opt/paddle/share/wheels/*.whl
-paddle version  # print version after build
-
-if [ ${WITH_DEMO} == "ON" ]; then
-  apt-get install -y wget unzip perl python-matplotlib tar xz-utils bzip2 gzip coreutils\
-	          sed grep graphviz libjpeg-dev zlib1g-dev
-  pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS}  BeautifulSoup docopt \
-    PyYAML pillow
-fi
-if [ ${IS_DEVEL} == "OFF" ]; then  # clean build packages.
-  cd ~
-  rm -rf paddle
-fi
-apt-get clean -y
-trap : 0
diff --git a/paddle/scripts/docker/cpu/build.sh b/paddle/scripts/docker/cpu/build.sh
deleted file mode 100644
index 1f74e1f1af22ab7531c0ad546d9e734d0b4b2541..0000000000000000000000000000000000000000
--- a/paddle/scripts/docker/cpu/build.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-function abort(){
-    echo "An error occurred. Exiting..." 1>&2
-    exit 1
-}
-
-trap 'abort' 0
-set -e
-if [ ${USE_UBUNTU_MIRROR} == "ON" ]; then
-    sed -i 's#http://archive\.ubuntu\.com/ubuntu/#mirror://mirrors\.ubuntu\.com/mirrors\.txt#g'\
-      /etc/apt/sources.list
-fi
-apt-get update
-apt-get install -y cmake libprotobuf-dev protobuf-compiler git \
-    libgoogle-glog-dev libgflags-dev libatlas-dev libatlas3-base g++ m4 python-pip\
-    python-protobuf python-numpy python-dev swig
-
-if [ ${WITH_GPU} == 'ON' ]; then
-  ln -s /usr/lib/x86_64-linux-gnu/libcudnn.so /usr/lib/libcudnn.so
-fi
-
-cd ~
-git clone https://github.com/baidu/Paddle.git paddle
-cd paddle
-mkdir build
-cd build
-cmake .. -DWITH_DOC=OFF -DWITH_GPU=${WITH_GPU} -DWITH_SWIG_PY=ON\
-   -DCUDNN_ROOT=/usr/ -DWITH_STYLE_CHECK=OFF
-make -j `nproc`
-# because durning make install, there are several warning, so set +e, do not cause abort
-make install
-echo 'export LD_LIBRARY_PATH=/usr/lib64:${LD_LIBRARY_PATH}' >> /etc/profile
-pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS} /usr/local/opt/paddle/share/wheels/*.whl
-paddle version  # print version after build
-
-if [ ${WITH_DEMO} == "ON" ]; then
-  apt-get install -y wget unzip perl python-matplotlib tar xz-utils bzip2 gzip coreutils\
-	          sed grep graphviz libjpeg-dev zlib1g-dev
-  pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS}  BeautifulSoup docopt \
-    PyYAML pillow
-fi
-if [ ${IS_DEVEL} == "OFF" ]; then  # clean build packages.
-  cd ~
-  rm -rf paddle
-fi
-apt-get clean -y
-trap : 0
diff --git a/paddle/scripts/docker/generate.sh b/paddle/scripts/docker/generate.sh
index 009c4a8a56558be0eab848dd41b8aac2ca08047a..8a50aefd34955fcc54c25c833154997472449f93 100644
--- a/paddle/scripts/docker/generate.sh
+++ b/paddle/scripts/docker/generate.sh
@@ -2,33 +2,60 @@
 set -e
 cd `dirname $0`
 m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=OFF -DPADDLE_WITH_DEMO=OFF \
-   -DPADDLE_BASE_IMAGE=ubuntu:14.04\
-   Dockerfile.m4 > cpu/Dockerfile
-cp build.sh cpu/
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=ON\
+   Dockerfile.m4 > Dockerfile.cpu
+
+m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=OFF -DPADDLE_WITH_DEMO=OFF \
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=OFF\
+   Dockerfile.m4 > Dockerfile.cpu-noavx
 
 m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=OFF \
-   -DPADDLE_BASE_IMAGE=ubuntu:14.04\
-   Dockerfile.m4 > cpu-devel/Dockerfile
-cp build.sh cpu-devel/
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=OFF\
+   Dockerfile.m4 > Dockerfile.cpu-noavx-devel
+
+m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=OFF \
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=ON\
+   Dockerfile.m4 > Dockerfile.cpu-devel
+
 
 m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=ON \
-   -DPADDLE_BASE_IMAGE=ubuntu:14.04\
-   Dockerfile.m4 > cpu-demo/Dockerfile
-cp build.sh cpu-demo/
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=ON\
+   Dockerfile.m4 > Dockerfile.cpu-demo
+
+m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=ON \
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=OFF\
+   Dockerfile.m4 > Dockerfile.cpu-noavx-demo
+
+
+m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=OFF -DPADDLE_WITH_DEMO=OFF \
+   -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
+   -DPADDLE_WITH_AVX=ON \
+   Dockerfile.m4 > Dockerfile.gpu
 
 m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=OFF -DPADDLE_WITH_DEMO=OFF \
    -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
-   Dockerfile.m4 > gpu/Dockerfile
-cp build.sh gpu/
+   -DPADDLE_WITH_AVX=OFF \
+   Dockerfile.m4 > Dockerfile.gpu-noavx
+
 
 m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=OFF \
    -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
-   Dockerfile.m4 > gpu-devel/Dockerfile
-cp build.sh gpu-devel/
+   -DPADDLE_WITH_AVX=ON \
+   Dockerfile.m4 > Dockerfile.gpu-devel
+
+m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=OFF \
+   -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
+   -DPADDLE_WITH_AVX=OFF \
+   Dockerfile.m4 > Dockerfile.gpu-noavx-devel
 
 m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=ON \
    -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
-   Dockerfile.m4 > gpu-demo/Dockerfile
-cp build.sh gpu-demo/
+   -DPADDLE_WITH_AVX=ON \
+   Dockerfile.m4 > Dockerfile.gpu-demo
+
 
+m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=ON \
+   -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
+   -DPADDLE_WITH_AVX=OFF \
+   Dockerfile.m4 > Dockerfile.gpu-noavx-demo
 
diff --git a/paddle/scripts/docker/gpu-demo/build.sh b/paddle/scripts/docker/gpu-demo/build.sh
deleted file mode 100644
index 1f74e1f1af22ab7531c0ad546d9e734d0b4b2541..0000000000000000000000000000000000000000
--- a/paddle/scripts/docker/gpu-demo/build.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-function abort(){
-    echo "An error occurred. Exiting..." 1>&2
-    exit 1
-}
-
-trap 'abort' 0
-set -e
-if [ ${USE_UBUNTU_MIRROR} == "ON" ]; then
-    sed -i 's#http://archive\.ubuntu\.com/ubuntu/#mirror://mirrors\.ubuntu\.com/mirrors\.txt#g'\
-      /etc/apt/sources.list
-fi
-apt-get update
-apt-get install -y cmake libprotobuf-dev protobuf-compiler git \
-    libgoogle-glog-dev libgflags-dev libatlas-dev libatlas3-base g++ m4 python-pip\
-    python-protobuf python-numpy python-dev swig
-
-if [ ${WITH_GPU} == 'ON' ]; then
-  ln -s /usr/lib/x86_64-linux-gnu/libcudnn.so /usr/lib/libcudnn.so
-fi
-
-cd ~
-git clone https://github.com/baidu/Paddle.git paddle
-cd paddle
-mkdir build
-cd build
-cmake .. -DWITH_DOC=OFF -DWITH_GPU=${WITH_GPU} -DWITH_SWIG_PY=ON\
-   -DCUDNN_ROOT=/usr/ -DWITH_STYLE_CHECK=OFF
-make -j `nproc`
-# because durning make install, there are several warning, so set +e, do not cause abort
-make install
-echo 'export LD_LIBRARY_PATH=/usr/lib64:${LD_LIBRARY_PATH}' >> /etc/profile
-pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS} /usr/local/opt/paddle/share/wheels/*.whl
-paddle version  # print version after build
-
-if [ ${WITH_DEMO} == "ON" ]; then
-  apt-get install -y wget unzip perl python-matplotlib tar xz-utils bzip2 gzip coreutils\
-	          sed grep graphviz libjpeg-dev zlib1g-dev
-  pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS}  BeautifulSoup docopt \
-    PyYAML pillow
-fi
-if [ ${IS_DEVEL} == "OFF" ]; then  # clean build packages.
-  cd ~
-  rm -rf paddle
-fi
-apt-get clean -y
-trap : 0
diff --git a/paddle/scripts/docker/gpu-devel/build.sh b/paddle/scripts/docker/gpu-devel/build.sh
deleted file mode 100644
index 1f74e1f1af22ab7531c0ad546d9e734d0b4b2541..0000000000000000000000000000000000000000
--- a/paddle/scripts/docker/gpu-devel/build.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-function abort(){
-    echo "An error occurred. Exiting..." 1>&2
-    exit 1
-}
-
-trap 'abort' 0
-set -e
-if [ ${USE_UBUNTU_MIRROR} == "ON" ]; then
-    sed -i 's#http://archive\.ubuntu\.com/ubuntu/#mirror://mirrors\.ubuntu\.com/mirrors\.txt#g'\
-      /etc/apt/sources.list
-fi
-apt-get update
-apt-get install -y cmake libprotobuf-dev protobuf-compiler git \
-    libgoogle-glog-dev libgflags-dev libatlas-dev libatlas3-base g++ m4 python-pip\
-    python-protobuf python-numpy python-dev swig
-
-if [ ${WITH_GPU} == 'ON' ]; then
-  ln -s /usr/lib/x86_64-linux-gnu/libcudnn.so /usr/lib/libcudnn.so
-fi
-
-cd ~
-git clone https://github.com/baidu/Paddle.git paddle
-cd paddle
-mkdir build
-cd build
-cmake .. -DWITH_DOC=OFF -DWITH_GPU=${WITH_GPU} -DWITH_SWIG_PY=ON\
-   -DCUDNN_ROOT=/usr/ -DWITH_STYLE_CHECK=OFF
-make -j `nproc`
-# because durning make install, there are several warning, so set +e, do not cause abort
-make install
-echo 'export LD_LIBRARY_PATH=/usr/lib64:${LD_LIBRARY_PATH}' >> /etc/profile
-pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS} /usr/local/opt/paddle/share/wheels/*.whl
-paddle version  # print version after build
-
-if [ ${WITH_DEMO} == "ON" ]; then
-  apt-get install -y wget unzip perl python-matplotlib tar xz-utils bzip2 gzip coreutils\
-	          sed grep graphviz libjpeg-dev zlib1g-dev
-  pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS}  BeautifulSoup docopt \
-    PyYAML pillow
-fi
-if [ ${IS_DEVEL} == "OFF" ]; then  # clean build packages.
-  cd ~
-  rm -rf paddle
-fi
-apt-get clean -y
-trap : 0
diff --git a/paddle/scripts/docker/gpu/build.sh b/paddle/scripts/docker/gpu/build.sh
deleted file mode 100644
index 1f74e1f1af22ab7531c0ad546d9e734d0b4b2541..0000000000000000000000000000000000000000
--- a/paddle/scripts/docker/gpu/build.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-function abort(){
-    echo "An error occurred. Exiting..." 1>&2
-    exit 1
-}
-
-trap 'abort' 0
-set -e
-if [ ${USE_UBUNTU_MIRROR} == "ON" ]; then
-    sed -i 's#http://archive\.ubuntu\.com/ubuntu/#mirror://mirrors\.ubuntu\.com/mirrors\.txt#g'\
-      /etc/apt/sources.list
-fi
-apt-get update
-apt-get install -y cmake libprotobuf-dev protobuf-compiler git \
-    libgoogle-glog-dev libgflags-dev libatlas-dev libatlas3-base g++ m4 python-pip\
-    python-protobuf python-numpy python-dev swig
-
-if [ ${WITH_GPU} == 'ON' ]; then
-  ln -s /usr/lib/x86_64-linux-gnu/libcudnn.so /usr/lib/libcudnn.so
-fi
-
-cd ~
-git clone https://github.com/baidu/Paddle.git paddle
-cd paddle
-mkdir build
-cd build
-cmake .. -DWITH_DOC=OFF -DWITH_GPU=${WITH_GPU} -DWITH_SWIG_PY=ON\
-   -DCUDNN_ROOT=/usr/ -DWITH_STYLE_CHECK=OFF
-make -j `nproc`
-# because durning make install, there are several warning, so set +e, do not cause abort
-make install
-echo 'export LD_LIBRARY_PATH=/usr/lib64:${LD_LIBRARY_PATH}' >> /etc/profile
-pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS} /usr/local/opt/paddle/share/wheels/*.whl
-paddle version  # print version after build
-
-if [ ${WITH_DEMO} == "ON" ]; then
-  apt-get install -y wget unzip perl python-matplotlib tar xz-utils bzip2 gzip coreutils\
-	          sed grep graphviz libjpeg-dev zlib1g-dev
-  pip ${PIP_GENERAL_ARGS} install ${PIP_INSTALL_ARGS}  BeautifulSoup docopt \
-    PyYAML pillow
-fi
-if [ ${IS_DEVEL} == "OFF" ]; then  # clean build packages.
-  cd ~
-  rm -rf paddle
-fi
-apt-get clean -y
-trap : 0