diff --git a/client/sources-linux/build-docker.sh b/client/sources-linux/build-docker.sh
index 2f4437b6..e68f54b2 100755
--- a/client/sources-linux/build-docker.sh
+++ b/client/sources-linux/build-docker.sh
@@ -16,24 +16,25 @@ set -e
 echo "[+] Install python packages"
 
 python -m pip install --upgrade setuptools
-python -m pip install pycparser==2.17
-python -m pip install -q six packaging appdirs
+python -m pip install --upgrade -q six packaging appdirs
 
 CC=/gccwrap CFLAGS_ABORT="-D_FORTIFY_SOURCE=2 -fstack-protector" \
- python -m pip install -q pynacl --no-binary :all:
+ python -m pip install --upgrade -q pynacl --no-binary :all:
 
 CC=/gccwrap CFLAGS_FILTER="-Wno-error=sign-conversion" \
- python -m pip install -q cryptography --no-binary :all:
+ python -m pip install --upgrade -q cryptography --no-binary :all:
 
-python -m pip install \
+python -m pip install --upgrade \
        rpyc pycryptodome pyaml rsa netaddr tinyec pyyaml ecdsa \
        paramiko pylzma pydbus python-ptrace psutil scandir \
        scapy impacket colorama pyOpenSSL python-xlib msgpack-python \
        u-msgpack-python poster \
        --no-binary :all:
 
+python -m pip install --upgrade --force-reinstall pycparser==2.17
+
 echo "[+] Compile pykcp"
-python -m pip install $PYKCP
+python -m pip install --upgrade --force $PYKCP
 
 echo "[+] Compile pyuv"
 
@@ -43,10 +44,10 @@ if [ "$TOOLCHAIN_ARCH" == "x86" ]; then
     CFLAGS_PYUV="$CFLAGS_PYUV -D_GNU_SOURCE -DS_ISSOCK(m)='(((m) & S_IFMT) == S_IFSOCK)'"
     
     CC=/gccwrap CFLAGS_FILTER="-D_FILE_OFFSET_BITS=64" CFLAGS="$CFLAGS_PYUV" \
-      python -m pip install pyuv --no-binary :all:
+      python -m pip install pyuv --upgrade --no-binary :all:
 else
     CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_GNU_SOURCE -DS_ISSOCK(m)='(((m) & S_IFMT) == S_IFSOCK)'" \
-	  python -m pip install pyuv --no-binary :all:
+	  python -m pip install pyuv --upgrade --no-binary :all:
 fi
 
 cd /usr/lib/python2.7
@@ -87,7 +88,7 @@ for target in $TARGETS; do rm -f $TEMPLATES/$target; done
 
 cd $SRC
 
-make clean
+make distclean
 make -j $MAKEFLAGS
 make clean
 make -j DEBUG=1 $MAKEFLAGS
@@ -95,7 +96,6 @@ make clean
 make -j UNCOMPRESSED=1 $MAKEFLAGS
 make clean
 make -j DEBUG=1 UNCOMPRESSED=1 $MAKEFLAGS
-make distclean
 
 for object in $TARGETS; do
     if [ -z "$object" ]; then
diff --git a/client/sources/build-docker.sh b/client/sources/build-docker.sh
index cfe4d47b..511a973c 100755
--- a/client/sources/build-docker.sh
+++ b/client/sources/build-docker.sh
@@ -19,15 +19,18 @@ echo "[+] Install python packages"
 for PYTHON in $PYTHON32 $PYTHON64; do
     $PYTHON -m pip install -q --upgrade pip
     $PYTHON -m pip install -q --upgrade setuptools
-    $PYTHON -m pip install -q pycparser==2.17
-    $PYTHON -m pip install $PACKAGES
-    $PYTHON -m pip install --no-binary :all: $PACKAGES_BUILD
+    $PYTHON -m pip install --upgrade $PACKAGES
+    $PYTHON -m pip install --upgrade --no-binary :all: $PACKAGES_BUILD
     $PYTHON -m pip install --upgrade --force $PYKCP
 done
 
 echo "[+] Install psutil"
 $PYTHON32 -m pip install --no-binary :all: psutil==4.3.1
-$PYTHON64 -m pip install --no-binary :all: psutil
+$PYTHON64 -m pip install --upgrade --no-binary :all: psutil
+
+for PYTHON in $PYTHON32 $PYTHON64; do
+    $PYTHON -m pip install -q --force pycparser==2.17
+done
 
 echo "[+] Compile pupymemexec /32"
 $CL32 \