diff --git a/build.gradle b/build.gradle
index 98181b2e2..7668d2e54 100644
--- a/build.gradle
+++ b/build.gradle
@@ -300,7 +300,8 @@ project.ext {
     useBundledJavaFx = fullVersion
     bundledJdkJavaFx = ModuleFinder.ofSystem().find("javafx.base").isPresent()
     // Define a custom JavaFX SDK location
-    // customJavaFxPath = null
+    // customJavaFxLibsPath = file("C:\\Projects\\jfx\\build\\sdk/lib")
+    // customJavaFxJmodsPath = file("C:\\Projects\\jfx\\build\\jmods")
 
     // Other
     deeplApiKey = findProperty('DEEPL_API_KEY') != null ? findProperty('DEEPL_API_KEY') : ""
diff --git a/dist/jpackage.gradle b/dist/jpackage.gradle
index 003697fea..e754d3eac 100644
--- a/dist/jpackage.gradle
+++ b/dist/jpackage.gradle
@@ -47,9 +47,12 @@ jlink {
         options.addAll('--strip-native-debug-symbols', 'exclude-debuginfo-files')
     }
 
-    if (useBundledJavaFx && !bundledJdkJavaFx) {
+    if (hasProperty("customJavaFxJmodsPath")) {
+        addExtraModulePath(customJavaFxJmodsPath.toString())
+    } else if (useBundledJavaFx && !bundledJdkJavaFx) {
         addExtraModulePath(layout.projectDirectory.dir("javafx/${platformName}/${arch}").toString())
     }
+
     if (useBundledJna) {
         addExtraModulePath(layout.projectDirectory.dir("jna/${platformName}/${arch}").toString())
     }
diff --git a/gradle/gradle_scripts/javafx.gradle b/gradle/gradle_scripts/javafx.gradle
index 99ceeb529..d40e04ce0 100644
--- a/gradle/gradle_scripts/javafx.gradle
+++ b/gradle/gradle_scripts/javafx.gradle
@@ -18,14 +18,18 @@ configurations {
     javafx
 }
 
-if (hasProperty("customJavaFxPath")) {
+if (hasProperty("customJavaFxLibsPath")) {
     repositories {
         flatDir {
-            dirs customJavaFxPath
+            dirs customJavaFxLibsPath
         }
     }
     dependencies {
-        javafx fileTree(dir: customJavaFxPath, include: '*.jar')
+        javafx files("$customJavaFxLibsPath/javafx.base.jar")
+        javafx files("$customJavaFxLibsPath/javafx.controls.jar")
+        javafx files("$customJavaFxLibsPath/javafx.graphics.jar")
+        javafx files("$customJavaFxLibsPath/javafx.media.jar")
+        javafx files("$customJavaFxLibsPath/javafx.web.jar")
     }
 } else if (!bundledJdkJavaFx) {
     // Always use maven version for development