diff --git a/.github/workflows/build-and-publish-bindings.yml b/.github/workflows/build-and-publish-bindings.yml
index f9bc73e..4508d89 100644
--- a/.github/workflows/build-and-publish-bindings.yml
+++ b/.github/workflows/build-and-publish-bindings.yml
@@ -20,13 +20,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: wget -O $RUNNER_TEMP/jdk.tar.gz https://download.java.net/java/early_access/jextract/22/5/openjdk-22-jextract+5-33_linux-x64_bin.tar.gz
+      - run: wget -O $RUNNER_TEMP/jdk.tar.gz https://download.java.net/java/early_access/jextract/25/2/openjdk-25-jextract+2-4_linux-x64_bin.tar.gz
       - run: tar -xf $RUNNER_TEMP/jdk.tar.gz
-      - run: echo "JEXTRACT_HOME=$(pwd)/jextract-22" >> $GITHUB_ENV
+      - run: echo "JEXTRACT_HOME=$(pwd)/jextract-25" >> $GITHUB_ENV
       - uses: actions/setup-java@v4
         id: install-jdk
         with:
-          java-version: 21
+          java-version: 25
           distribution: temurin
 
       - name: Setup Gradle
@@ -56,4 +56,4 @@ jobs:
         run: ./gradlew -PwgpuVersion=${{ inputs.wgpuVersion }} :lib:publish
         env:
           GITHUB_USER: ${{ github.actor }}
-          GITHUB_TOKEN: ${{ secrets.PKG_PUBLISHING_AUTH_TOKEN }}
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.PKG_PUBLISHING_AUTH_TOKEN }}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..c61a118 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/lib/build.gradle b/lib/build.gradle
index cc4ecb5..cbbe3c3 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -20,13 +20,13 @@ def jextractHome = project.hasProperty('jextract.home')
         : null
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
 }
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 
@@ -42,9 +42,7 @@ sourceSets {
     }
 }
 
-tasks.compileJava {
-    options.compilerArgs.add("--enable-preview")
-}
+// FFM is stable in Java 25, no preview flags needed
 
 task invokeJextract(type: Exec){
     doFirst {
@@ -96,7 +94,7 @@ publishing {
         mavenLocal()
         maven {
             name = "GHPackages"
-            url = uri("https://maven.pkg.github.com/MyWorldLLC/Packages")
+            url = uri("https://maven.pkg.github.com/zzuegg/webgpu-java")
             credentials {
                 username = System.getenv("GITHUB_USER") ?: project.findProperty("gpr.user")
                 password = System.getenv("GITHUB_TOKEN") ?: project.findProperty("gpr.password")
diff --git a/natives/build.gradle b/natives/build.gradle
index 9cf46a1..9132169 100644
--- a/natives/build.gradle
+++ b/natives/build.gradle
@@ -1,9 +1,7 @@
 plugins {
-    id 'de.undercouch.download' version '4.1.1'
+    id 'de.undercouch.download' version '5.6.0'
 }
 
-apply plugin: 'de.undercouch.download'
-
 configurations {
     headers
 }
@@ -23,11 +21,12 @@ task unzip(type: Copy) {
     into "bin/$wgpuVersion/$os-$arch-$type"
 }
 
-task copyWgpuHeaders(type: Copy) {
-    from "bin/$wgpuVersion/$os-$arch-$type/webgpu.h"
-    into 'build/headers/'
-}
+  task copyWgpuHeaders(type: Copy) {                              
+      from "bin/$wgpuVersion/$os-$arch-$type/include/webgpu/webgpu.h"
+      into 'build/headers/'               
+  }
+
 
 artifacts {
     headers file('build/headers/webgpu.h')
-}
\ No newline at end of file
+}