diff --git a/build.gradle b/build.gradle
index b48c65ff..b82dc219 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'application'
+    id 'org.openjfx.javafxplugin' version '0.0.10'
     id 'extra-java-module-info'
-    id 'com.dua3.javafxgradle7plugin' version '0.0.9'
     id 'org.beryx.jlink' version '2.24.0'
 }
 
@@ -29,7 +29,7 @@ tasks.withType(AbstractArchiveTask) {
 }
 
 javafx {
-    version = "16"
+    version = "17"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ]
 }
 
diff --git a/buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java b/buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java
index 6d7c6931..c0bcdacf 100644
--- a/buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java
+++ b/buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java
@@ -59,7 +59,7 @@ abstract public class ExtraModuleInfoTransform implements TransformAction<ExtraM
         String originalJarName = originalJar.getName();
 
         //Recreate jackson jars as open, non-synthetic modules
-        if (isModule(originalJar) && !originalJarName.contains("jackson")) {
+        if ((isModule(originalJar) && !originalJarName.contains("jackson")) || originalJarName.startsWith("javafx-")) {
             outputs.file(originalJar);
         } else if (moduleInfo.containsKey(originalJarName)) {
             addModuleDescriptor(originalJar, getModuleJar(outputs, originalJar), moduleInfo.get(originalJarName));