diff --git a/docker-compose.yaml b/docker-compose.yaml
index e51e8c3..853ecb5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -96,7 +96,11 @@ services:
   ## Frontends
   ##
   octoprint:
-    image: octoprint/octoprint:1-minimal
+    image: octoprint:latest
+    build:
+      args:
+        VERSION: 1.7-minimal
+      context: dockerfiles/octoprint
     container_name: octoprint
     restart: unless-stopped
     depends_on:
diff --git a/dockerfiles/octoprint.Dockerfile b/dockerfiles/octoprint.Dockerfile
deleted file mode 100644
index 050df53..0000000
--- a/dockerfiles/octoprint.Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-ARG VERSION=minimal
-FROM octoprint/octoprint:${VERSION}
-
-RUN apt update \
- && apt install -y something \
- && apt clean
-
-RUN pip install "https://github.com/OllisGit/OctoPrint-PrintJobHistory/releases/latest/download/master.zip" \
- && pip install "https://github.com/eyal0/OctoPrint-PrintTimeGenius/archive/master.zip" \
- && pip install "https://github.com/OllisGit/OctoPrint-FilamentManager/releases/latest/download/master.zip" \
- && pip install "https://github.com/jneilliii/OctoPrint-PrusaSlicerThumbnails/archive/master.zip" \
- && pip install "https://github.com/thijsbekke/OctoPrint-Pushover/archive/master.zip" \
- && pip install "https://github.com/jneilliii/OctoPrint-TabOrder/archive/master.zip" \
- && pip install "https://github.com/1r0b1n0/OctoPrint-Tempsgraph/archive/master.zip" \
- && pip install "https://github.com/jneilliii/OctoPrint-TerminalCommandsExtended/archive/master.zip" \
- && pip install "https://github.com/birkbjo/OctoPrint-Themeify/archive/master.zip" \
- && pip install "https://github.com/BillyBlaze/OctoPrint-TouchUI/archive/master.zip" \
diff --git a/dockerfiles/octoprint/Dockerfile b/dockerfiles/octoprint/Dockerfile
new file mode 100644
index 0000000..c8da839
--- /dev/null
+++ b/dockerfiles/octoprint/Dockerfile
@@ -0,0 +1,5 @@
+ARG VERSION=minimal
+FROM octoprint/octoprint:${VERSION}
+
+COPY plugins.txt /tmp/plugins.txt
+RUN pip install -r /tmp/plugins.txt
diff --git a/dockerfiles/octoprint/plugins.txt b/dockerfiles/octoprint/plugins.txt
new file mode 100644
index 0000000..4ca6b3a
--- /dev/null
+++ b/dockerfiles/octoprint/plugins.txt
@@ -0,0 +1,10 @@
+https://github.com/OllisGit/OctoPrint-PrintJobHistory/releases/latest/download/master.zip
+https://github.com/eyal0/OctoPrint-PrintTimeGenius/archive/master.zip
+https://github.com/OllisGit/OctoPrint-FilamentManager/releases/latest/download/master.zip
+https://github.com/jneilliii/OctoPrint-PrusaSlicerThumbnails/archive/master.zip
+https://github.com/thijsbekke/OctoPrint-Pushover/archive/master.zip
+https://github.com/jneilliii/OctoPrint-TabOrder/archive/master.zip
+https://github.com/1r0b1n0/OctoPrint-Tempsgraph/archive/master.zip
+https://github.com/jneilliii/OctoPrint-TerminalCommandsExtended/archive/master.zip
+https://github.com/birkbjo/OctoPrint-Themeify/archive/master.zip
+https://github.com/BillyBlaze/OctoPrint-TouchUI/archive/master.zip