diff --git a/cavis-native/cavis-native-cuda-presets/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java b/cavis-native/cavis-native-cuda-presets/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java
index 1fc3c7404..2a875e1ed 100644
--- a/cavis-native/cavis-native-cuda-presets/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java
+++ b/cavis-native/cavis-native-cuda-presets/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java
@@ -128,7 +128,7 @@ import java.util.List;
                                 "cnpy/cnpy.h"
                         },
                                 compiler = {"cpp11", "nowarnings"},
-                                library = "jnind4jcuda",
+                                library = "jni_nd4jcuda",
                                 link = "nd4jcuda"),
 
                 @Platform(value = "linux", preload = "gomp@.1", preloadpath = {"/lib64/", "/lib/", "/usr/lib64/", "/usr/lib/", "/usr/local/cuda/lib64"}),
diff --git a/cavis-native/cavis-native-jcublas/build.gradle b/cavis-native/cavis-native-jcublas/build.gradle
index a3cd25c10..990fe5ede 100644
--- a/cavis-native/cavis-native-jcublas/build.gradle
+++ b/cavis-native/cavis-native-jcublas/build.gradle
@@ -41,6 +41,7 @@ dependencies {
 tasks.named("compileJava").configure {
     dependsOn ":cavis-native:cavis-native-lib:javacppCudaSupportBuildParser",
             ":cavis-native:cavis-native-lib:compileCudaGeneratedJava"
+            ":cavis-native:cavis-native-lib:cudaJar"
 
 }
 
diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle
index 2ec858b2a..1cf81e860 100644
--- a/cavis-native/cavis-native-lib/build.gradle
+++ b/cavis-native/cavis-native-lib/build.gradle
@@ -290,20 +290,19 @@ chipList.each { String thisChip ->
 
 
     // Generates jnijavacpp.cpp and jniNativeLibrary.cpp, compiles and links it
-    tasks.register("javacpp${thisChip.capitalize()}SupportBuildCompiler", org.bytedeco.gradle.javacpp.BuildTask) {
+    tasks.register("javacpp${thisChip.capitalize()}SupportBuildCompiler", org.bytedeco.gradle.javacpp.BuildTask) {org.bytedeco.gradle.javacpp.BuildTask it ->
         if (project.hasProperty("skip-native") && project.getProperty("skip-native").equals("true")) {
             enabled = false
         }
-        def thisTask = (org.bytedeco.gradle.javacpp.BuildTask) it
 
-        thisTask.linkPath = ["${projectDir}/blasbuild/${thisChip}/${avxExtension}/output"]
-        thisTask.includePath = ["${projectDir}/src/main/cpp/blas/",
+        linkPath = ["${projectDir}/blasbuild/${thisChip}/${avxExtension}/output"]
+        includePath = ["${projectDir}/src/main/cpp/blas/",
                        "${projectDir}/blasbuild/${thisChip}/${avxExtension}/src/main/include/",
                        "${projectDir}/blasbuild/${thisChip}/${avxExtension}/flatbuffers-src/include",
                        "${projectDir}/blasbuild/${thisChip}/${avxExtension}/cpu_features-src/include",
                        "${projectDir}/blasbuild/${thisChip}/${avxExtension}/mkldnn-src/include"]
 
-        thisTask.properties = getBuildPlatform( thisChip, thisTask )
+        properties = getBuildPlatform( thisChip, it )
 
         if(thisChip.equals('cuda') && osdetector.os.startsWith("win") && project.hasProperty("skip-native")
                 && !project.getProperty("skip-native").equals("true") && !VISUAL_STUDIO_INSTALL_DIR.isEmpty()) {
@@ -339,16 +338,16 @@ chipList.each { String thisChip ->
         }
 
 
-        thisTask.buildPath = ["${buildDir}/generated/sources/javacpp/${thisChip}/${javacppPlatform}${javacppPlatformExtension}/"]
-        thisTask.copyLibs = true
-        thisTask.deleteJniFiles(false)
-        outputName = "jnind4j${thisChip}"
-        thisTask.outputDirectory = file("${buildDir}/generated/sources/javacpp/${thisChip}/${javacppPlatform}${javacppPlatformExtension}/")
-        thisTask.classOrPackageNames= ["org.nd4j.nativeblas.Nd4j${thisChip.capitalize()}"]
+        buildPath = ["${buildDir}/generated/sources/javacpp/${thisChip}/${javacppPlatform}${javacppPlatformExtension}/"]
+        copyLibs = true
+        deleteJniFiles(false)
+        //outputName = "jnind4j${thisChip}"
+        outputDirectory = file("${buildDir}/generated/sources/javacpp/${thisChip}/${javacppPlatform}${javacppPlatformExtension}/")
+        classOrPackageNames= ["org.nd4j.nativeblas.Nd4j${thisChip.capitalize()}"]
 
-        thisTask.configDirectory = file("${buildDir}/classes/java/${thisChip}Support/META-INF/native-image/${javacppPlatform}")
-        thisTask.classPath = sourceSets.named("${thisChip}Generated").get().compileClasspath.collect()
-        thisTask.classPath += "${buildDir}/classes/java/main/"
+        configDirectory = file("${buildDir}/classes/java/${thisChip}Support/META-INF/native-image/${javacppPlatform}")
+        classPath = sourceSets.named("${thisChip}Generated").get().compileClasspath.collect()
+        classPath += "${buildDir}/classes/java/main/"
     }
 
     // Create Jar with classifier