diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0258846a2da32f700ea9230ae0ee72cf4b874a45..da71bb98525b81604b0088827dd3345023cccdff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ build:
   script:
     - mkdir -p /kaniko/.docker
     - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64)\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context ${CI_PROJECT_DIR}/lmod --cache=true --cache-copy-layers=true --destination ${CI_REGISTRY_IMAGE}:lmod-${CI_COMMIT_TAG} --destination ${CI_REGISTRY_IMAGE}:lmod-latest
-    - /kaniko/executor --context ${CI_PROJECT_DIR}/venv --cache=true --cache-copy-layers=true --destination ${CI_REGISTRY_IMAGE}:venv-${CI_COMMIT_TAG} --destination ${CI_REGISTRY_IMAGE}:venv-latest
+    - /kaniko/executor --context ${CI_PROJECT_DIR}/lmod --destination ${CI_REGISTRY_IMAGE}:lmod-${CI_COMMIT_TAG} --destination ${CI_REGISTRY_IMAGE}:lmod-latest
+    - /kaniko/executor --context ${CI_PROJECT_DIR}/venv --destination ${CI_REGISTRY_IMAGE}:venv-${CI_COMMIT_TAG} --destination ${CI_REGISTRY_IMAGE}:venv-latest
   rules:
     - if: $CI_COMMIT_TAG
diff --git a/venv/Dockerfile b/venv/Dockerfile
index 5a697c4371a750c893942904dd7de95cd90c7b40..d91fc4520dbbf075ffaf8d727b9bcaad80570804 100644
--- a/venv/Dockerfile
+++ b/venv/Dockerfile
@@ -22,11 +22,12 @@ RUN apt update && \
     cat /tmp/requirements_apt.txt | xargs apt install -yq && \
     apt clean && \
     rm -rf /var/lib/apt/lists/* && \
-    pip install -r /tmp/requirements_pip.txt && \
     chown -R ${USERNAME}:users ${HOME} && \
-    rm /tmp/requirements_pip.txt && \
+    python3 -m venv /home/${USERNAME}/venv && \
     rm /tmp/requirements_apt.txt
 
+RUN /home/${USERNAME}/venv/bin/pip3 install -r /tmp/requirements_pip.txt && rm /tmp/requirements_pip.txt
+
 RUN echo ${USERNAME}:$(uuidgen) | chpasswd
 
 COPY entrypoint.sh ${HOME}/entrypoint.sh
@@ -35,4 +36,6 @@ RUN chown -R ${USERNAME}:users ${HOME}
 
 USER jovyan
 
+WORKDIR ${HOME}
+
 ENTRYPOINT ["/home/jovyan/entrypoint.sh"]
diff --git a/venv/requirements_apt.txt b/venv/requirements_apt.txt
index cf9dd0c7d3f8be1c24c9c72eefe66d38a64d5d05..724317fce4a8eb21e69790e89d960aa38be299b3 100644
--- a/venv/requirements_apt.txt
+++ b/venv/requirements_apt.txt
@@ -3,6 +3,7 @@ ca-certificates
 curl
 python3
 python3-pip
+python3-venv
 libc6
 libstdc++6
 rsync