diff --git a/Dockerfile b/Dockerfile
index efa9fc3..8af6868 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,42 +1,44 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && apt-get upgrade -y && \
   apt-get install -y \
     libapr1-dev \
     libaprutil1-dev \
     libpq-dev \
     libsvn-dev \
     libsystemd-dev \
     postgresql-client \
     wait-for-it \
     ngrep && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/*
 
+RUN useradd -md /srv/softwareheritage -s /bin/bash swh
+USER swh
+
+RUN python3 -m venv /srv/softwareheritage/venv
+ENV PATH="/srv/softwareheritage/venv/bin:${PATH}"
 RUN pip install --upgrade pip setuptools wheel
+RUN pip install gunicorn
+
 RUN pip install \
         swh-deposit \
         swh-indexer \
         swh-journal \
         swh-lister \
         swh-loader-debian \
         swh-loader-dir \
         swh-loader-git \
         swh-loader-mercurial \
         swh-loader-pypi \
         swh-loader-svn \
         swh-loader-tar \
         swh-storage \
         swh-objstorage \
         swh-scheduler \
         swh-vault \
         swh-web
 
-RUN pip install gunicorn
-
-COPY utils/pgsql.sh /swh-utils/pgsql.sh
-
-RUN useradd -ms /bin/bash swh
-
+COPY utils/*.sh /srv/softwareheritage/utils/
 RUN mkdir -p /srv/softwareheritage/objects
diff --git a/utils/pyutils.sh b/utils/pyutils.sh
index 01fb18b..289eb40 100755
--- a/utils/pyutils.sh
+++ b/utils/pyutils.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 setup_pip () {
-	export PATH=${HOME}/.local/bin:${PATH}
+  echo Using pip from $(which pip)
 
-	if [[ -d /src ]] ; then
+  if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
-        pip install -e $srcrepo
+      pip install $srcrepo
     done
   fi
 
   echo Installed Python packages:
   pip list
-
 }