diff --git a/containers/xos/Dockerfile.base b/containers/xos/Dockerfile.base
index 9ea3553..e2dfd9b 100644
--- a/containers/xos/Dockerfile.base
+++ b/containers/xos/Dockerfile.base
@@ -44,6 +44,7 @@
 
 # Upgrade requests from apt installed version
 RUN pip install --no-deps -U -I requests==2.11.1 \
+ && pip install --no-deps -U -I pip==9.0.1 setuptools==36.0.1 \
  && pip install --no-deps -r /tmp/pip_requirements.txt \
  && pip freeze > /var/xos/pip_freeze_pip_up_`date -u +%Y%m%dT%H%M%S`