diff --git a/Dockerfile_qcom b/Dockerfile_qcom
index 0b63ac5..a768309 100644
--- a/Dockerfile_qcom
+++ b/Dockerfile_qcom
@@ -6,6 +6,7 @@ ARG USER_ID=1001
 ARG GROUP_ID=1001
 
 # Keep the dependency list as short as reasonable
+# Need vim-common for stuff like xxd need by BS
 RUN apt-get update && \
     apt-get install -y bc bison bsdmainutils build-essential curl \
         flex g++-multilib gcc-multilib git gnupg gperf lib32ncurses5-dev \
@@ -18,6 +19,7 @@ RUN apt-get update && \
         rsync \
         libssl-dev \
         cpio \
+        vim-common \
         pngcrush schedtool xsltproc zip zlib1g-dev libswitch-perl git-core gnupg flex bison build-essential zip curl zlib1g-dev gcc-multilib g++-multilib libc6-dev libc6-dev-i386 libncurses5-dev lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev libxml2-utils xsltproc unzip fontconfig tofrodos python-markdown uuid-dev samba system-config-samba xmlstarlet libxml-simple-perl && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
@@ -37,6 +39,9 @@ RUN chown aosp:aosp /home/aosp/.gitconfig
 # No Dash
 RUN sudo rm /bin/sh && sudo ln -s /bin/bash /bin/sh
 
+# Using an old python version -> need specific pip
+curl -fsSL -o- https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3.5
+
 #Init gpg key for repo
 RUN sudo -u aosp -H mkdir -p  ~aosp/.repoconfig/gnupg
 RUN sudo -u aosp -H GNUPGHOME=~/.repoconfig/gnupg gpg --keyserver keyserver.ubuntu.com --recv-key 67B7E448692B382C