diff --git a/app.properties b/app.properties
index 79a4dc52..33adfd4b 100644
--- a/app.properties
+++ b/app.properties
@@ -68,7 +68,6 @@ mac.application.category: public.app-category.utilities
 deb.application.categories: AudioVideo;Video;Utility;FileTools;
 deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*;
 deb.application.class: net-filebot-Main
-deb.application.depends: openjdk-11-jre, libmediainfo0v5, libchromaprint-tools, p7zip-full, p7zip-rar
 deb.jna.depends: libjnidispatch.so
 
 # Package Options
diff --git a/installer/deb-universal/control/control b/installer/deb-universal/control/control
index 87e72846..fd0fec94 100644
--- a/installer/deb-universal/control/control
+++ b/installer/deb-universal/control/control
@@ -7,5 +7,5 @@ Description: @{package.synopsis}
 Homepage: @{package.homepage}
 Section: utils
 Priority: extra
-Depends: openjdk-8-jre | openjdk-11-jre, openjfx, libjna-jni, libmediainfo0v5, libchromaprint-tools, p7zip-full, p7zip-rar
+Depends: openjdk-@{jvm.version}-jre, openjfx, libjna-jni, libmediainfo0v5, libchromaprint-tools, p7zip-full, p7zip-rar
 Enhances: nautilus-actions
diff --git a/installer/deb-universal/filebot.sh b/installer/deb-universal/filebot.sh
index 005f702f..b8e7f8b2 100644
--- a/installer/deb-universal/filebot.sh
+++ b/installer/deb-universal/filebot.sh
@@ -9,5 +9,6 @@ fi
 # select application data folder
 APP_DATA="$HOME/.filebot"
 LIBRARY_PATH="/usr/lib/$(uname -m)-linux-gnu/jni"
+MODULE_PATH="/usr/share/openjfx/lib"
 
-java -Dapplication.deployment=deb -Djna.boot.library.name=jnidispatch.system -Dnet.filebot.Archive.extractor=SevenZipExecutable @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"
+java -Dapplication.deployment=deb --module-path "$MODULE_PATH" --add-modules ALL-MODULE-PATH -Djna.boot.library.name=jnidispatch.system -Dnet.filebot.Archive.extractor=SevenZipExecutable @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"
diff --git a/installer/deb/control/control b/installer/deb/control/control
index c326134e..8f794f05 100644
--- a/installer/deb/control/control
+++ b/installer/deb/control/control
@@ -7,5 +7,5 @@ Description: @{package.synopsis}
 Homepage: @{package.homepage}
 Section: utils
 Priority: extra
-Depends: @{deb.application.depends}
+Depends: openjdk-@{jvm.version}-jre, libmediainfo0v5, libchromaprint-tools, p7zip-full, p7zip-rar
 Enhances: nautilus-actions