diff --git a/Dockerfile.develop b/docker/Dockerfile.develop
similarity index 99%
rename from Dockerfile.develop
rename to docker/Dockerfile.develop
index 8f6871c55..cb49984e2 100644
--- a/Dockerfile.develop
+++ b/docker/Dockerfile.develop
@@ -2,6 +2,7 @@ FROM freqtradeorg/freqtrade:develop
 
 # Install dependencies
 COPY requirements-dev.txt /freqtrade/
+
 RUN pip install numpy --no-cache-dir \
   && pip install -r requirements-dev.txt --no-cache-dir
 
diff --git a/docker/Dockerfile.jupyter b/docker/Dockerfile.jupyter
new file mode 100644
index 000000000..b7499eeef
--- /dev/null
+++ b/docker/Dockerfile.jupyter
@@ -0,0 +1,7 @@
+FROM freqtradeorg/freqtrade:develop_plot
+
+
+RUN pip install jupyterlab --no-cache-dir
+
+# Empty the ENTRYPOINT to allow all commands
+ENTRYPOINT []
diff --git a/docker/Dockerfile.plot b/docker/Dockerfile.plot
new file mode 100644
index 000000000..9313a34b9
--- /dev/null
+++ b/docker/Dockerfile.plot
@@ -0,0 +1,9 @@
+FROM freqtradeorg/freqtrade:develop
+
+# Install dependencies
+COPY requirements-plot.txt /freqtrade/
+
+RUN pip install -r requirements-plot.txt --no-cache-dir
+
+# Empty the ENTRYPOINT to allow all commands
+ENTRYPOINT []
diff --git a/Dockerfile.technical b/docker/Dockerfile.technical
similarity index 100%
rename from Dockerfile.technical
rename to docker/Dockerfile.technical
diff --git a/docker/docker-compose-jupyter.yml b/docker/docker-compose-jupyter.yml
new file mode 100644
index 000000000..4b396d0f5
--- /dev/null
+++ b/docker/docker-compose-jupyter.yml
@@ -0,0 +1,16 @@
+---
+version: '3'
+services:
+  freqtrade:
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile.jupyter
+    restart: unless-stopped
+    container_name: freqtrade
+    ports:
+      - "18889:8888"
+    volumes:
+      - "./user_data:/freqtrade/user_data"
+    # Default command used when running `docker compose up`
+    command: >
+      jupyter lab --port=8888 --ip 0.0.0.0 --allow-root