diff --git a/Dockerfile b/Dockerfile
index 8133e5e4..fdcb6a30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,12 +9,11 @@ RUN apt-get update && \
             git && \
     apt-get clean && apt-get purge
 
+# FIXME: Remove this if pip install with setup.py can do it instead?
 COPY install-s2i.bash /usr/local/bin/install-s2i.bash
 RUN /usr/local/bin/install-s2i.bash
 
-RUN pip3 install --upgrade pip wheel
-
 RUN mkdir /tmp/src
 ADD . /tmp/src
-RUN pip3 install /tmp/src
+RUN pip3 install --no-cache-dir /tmp/src