diff --git a/build.gradle b/build.gradle
index 624fe7101..9377f4d8a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -124,7 +124,7 @@ project.ext {
     website = 'https://xpipe.io'
     sourceWebsite = isStage ? 'https://github.com/xpipe-io/xpipe-ptb' : 'https://github.com/xpipe-io/xpipe'
     authors = 'Christopher Schnick'
-    javafxVersion = '24-ea+5'
+    devJavafxVersion = '25-ea+10'
     platformName = getPlatformName()
     jvmRunArgs = [
             "--add-opens", "java.base/java.lang=io.xpipe.app",
@@ -165,8 +165,12 @@ project.ext {
         signingPassword = ''
     }
     deeplApiKey = findProperty('DEEPL_API_KEY')
-    customJavaFxPath = null
+
+    // Define a custom JavaFX SDK location
+    // customJavaFxPath = null
+
     bundleCds = ci && fullVersion
+
     windowsSchemaCanonicalVersion = getWindowsSchemaCanonicalVersion()
 }
 
diff --git a/dist/build.gradle b/dist/build.gradle
index b5d431707..d2d513958 100644
--- a/dist/build.gradle
+++ b/dist/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'org.beryx.jlink' version '3.1.1'
     id "org.asciidoctor.jvm.convert" version "4.0.4"
     id 'org.jreleaser' version '1.15.0'
-    id("com.netflix.nebula.ospackage") version "11.11.1"
+    id("com.netflix.nebula.ospackage") version "11.11.2"
     id 'org.gradle.crypto.checksum' version '1.4.0'
     id 'signing'
 }
diff --git a/gradle/gradle_scripts/javafx.gradle b/gradle/gradle_scripts/javafx.gradle
index 243b8d91c..140cf91bc 100644
--- a/gradle/gradle_scripts/javafx.gradle
+++ b/gradle/gradle_scripts/javafx.gradle
@@ -18,7 +18,7 @@ configurations {
     javafx
 }
 
-if (customJavaFxPath != null) {
+if (rootProject.hasProperty("customJavaFxPath")) {
     repositories {
         flatDir {
             dirs customJavaFxPath
@@ -30,10 +30,10 @@ if (customJavaFxPath != null) {
 } else {
     // Always use maven version for now
     dependencies {
-        javafx "org.openjfx:javafx-base:${javafxVersion}:${platform}"
-        javafx "org.openjfx:javafx-controls:${javafxVersion}:${platform}"
-        javafx "org.openjfx:javafx-graphics:${javafxVersion}:${platform}"
-        javafx "org.openjfx:javafx-media:${javafxVersion}:${platform}"
-        javafx "org.openjfx:javafx-web:${javafxVersion}:${platform}"
+        javafx "org.openjfx:javafx-base:${devJavafxVersion}:${platform}"
+        javafx "org.openjfx:javafx-controls:${devJavafxVersion}:${platform}"
+        javafx "org.openjfx:javafx-graphics:${devJavafxVersion}:${platform}"
+        javafx "org.openjfx:javafx-media:${devJavafxVersion}:${platform}"
+        javafx "org.openjfx:javafx-web:${devJavafxVersion}:${platform}"
     }
 }
diff --git a/gradle/gradle_scripts/lombok.gradle b/gradle/gradle_scripts/lombok.gradle
index f132bbf0b..f48ffeced 100644
--- a/gradle/gradle_scripts/lombok.gradle
+++ b/gradle/gradle_scripts/lombok.gradle
@@ -1,16 +1,16 @@
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.30'
-    annotationProcessor 'org.projectlombok:lombok:1.18.30'
-    testCompileOnly 'org.projectlombok:lombok:1.18.30'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.30'
+    compileOnly 'org.projectlombok:lombok:1.18.38'
+    annotationProcessor 'org.projectlombok:lombok:1.18.38'
+    testCompileOnly 'org.projectlombok:lombok:1.18.38'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.38'
 }
 
 testing {
     suites {
         configureEach {
             dependencies {
-                compileOnly 'org.projectlombok:lombok:1.18.30'
-                annotationProcessor 'org.projectlombok:lombok:1.18.30'
+                compileOnly 'org.projectlombok:lombok:1.18.38'
+                annotationProcessor 'org.projectlombok:lombok:1.18.38'
             }
         }
     }