diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 5be3525..1d48814 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -1,9 +1,9 @@
 FROM couchbase:latest
 
 RUN echo "* soft nproc 20000\n"\
-"* hard nproc 20000\n"\
-"* soft nofile 200000\n"\
-"* hard nofile 200000\n" >> /etc/security/limits.conf
+    "* hard nproc 20000\n"\
+    "* soft nofile 200000\n"\
+    "* hard nofile 200000\n" >> /etc/security/limits.conf
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive &&\ 
     apt-get install -y wget &&\
@@ -18,9 +18,12 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive &&\
     export FLASK_ENV=development
 
 RUN addgroup --gid 33333 gitpod && \
-     useradd --no-log-init --create-home --home-dir /home/gitpod --shell /bin/bash --uid 33333 --gid 33333 gitpod && \
-     usermod -a -G gitpod,couchbase,sudo gitpod && \
-     echo 'gitpod ALL=(ALL) NOPASSWD:ALL'>> /etc/sudoers
+    useradd --no-log-init --create-home --home-dir /home/gitpod --shell /bin/bash --uid 33333 --gid 33333 gitpod && \
+    usermod -a -G gitpod,couchbase,sudo gitpod && \
+    echo 'gitpod ALL=(ALL) NOPASSWD:ALL'>> /etc/sudoers
 
 COPY startcb.sh /opt/couchbase/bin/startcb.sh
 USER gitpod
+ENV PYTHONUSERBASE=/workspace/.pip-modules
+ENV PATH=$PYTHONUSERBASE/bin:$PATH
+ENV PIP_USER=yes