diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3430cac5a..b333dc19d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -5,12 +5,8 @@ COPY requirements-dev.txt /freqtrade/
 RUN apt-get update \
     && apt-get -y install git sudo vim \
     && apt-get clean \
-    && pip install autopep8--no-cache-dir \
-    # Install ALL dependencies
-    && pip install -r requirements-dev.txt --no-cache-dir \
-    # Install documentation dependencies (to enable mkdocs)
-    && pip install -r docs/requirements-docs.txt --no-cache-dir \
-    && useradd -m ftuser \
+    && pip install autopep8 -r docs/requirements-docs.txt -r requirements-dev.txt --no-cache-dir \
+    && useradd -u 1000 -U -m ftuser \
     && mkdir -p /home/ftuser/.vscode-server /home/ftuser/.vscode-server-insiders /home/ftuser/commandhistory \
     && echo "export PROMPT_COMMAND='history -a'" >> /home/ftuser/.bashrc \
     && echo "export HISTFILE=~/commandhistory/.bash_history" >> /home/ftuser/.bashrc \
diff --git a/docker/docker-compose-jupyter.yml b/docker/docker-compose-jupyter.yml
index 14e45983d..11a01705c 100644
--- a/docker/docker-compose-jupyter.yml
+++ b/docker/docker-compose-jupyter.yml
@@ -1,7 +1,7 @@
 ---
 version: '3'
 services:
-  freqtrade:
+  ft_jupyterlab:
     build:
       context: ..
       dockerfile: docker/Dockerfile.jupyter
diff --git a/docs/docker_quickstart.md b/docs/docker_quickstart.md
index ad82aea3f..dd89ff2e7 100644
--- a/docs/docker_quickstart.md
+++ b/docs/docker_quickstart.md
@@ -178,7 +178,7 @@ Freqtrade provides a docker-compose file which starts up a jupyter lab server.
 You can run this server using the following command:
 
 ``` bash
-docker-compose -f docker/docker-compose-jupyter.yml up
+docker-compose --rm -f docker/docker-compose-jupyter.yml up
 ```
 
 This will create a dockercontainer running jupyter lab, which will be accessible using `https://127.0.0.1:8888/lab`.