diff --git a/images/jellyfin/Dockerfile b/images/jellyfin/Dockerfile
index 472469e..9930104 100644
--- a/images/jellyfin/Dockerfile
+++ b/images/jellyfin/Dockerfile
@@ -23,14 +23,17 @@ ENV LC_ALL en_GB.UTF-8
 ENV LANG en_GB.UTF-8
 ENV LANGUAGE en_GB:en
 
-VOLUME /srv/cache /srv/config /srv/media
+ENV JELLYFIN_DATA_DIR	/srv/data
+ENV JELLYFIN_CONFIG_DIR	/srv/config
+ENV JELLYFIN_LOG_DIR	/srv/logs
+ENV JELLYFIN_CACHE_DIR	/srv/cache
+
+VOLUME /srv/data /srv/config /srv/logs /srv/cache /srv/media
 
 USER 90:90
 
 # Default port number: 8096
 # Note to self: Consider mounting a tmpfs to /srv/cache in the Nomad config
 ENTRYPOINT [ "/usr/bin/jellyfin", \
-	"--datadir", "/srv/config", \
-	"--cachedir", "/srv/cache", \
 	"--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg", \
 	"--webdir", "/usr/share/jellyfin/web" ]