diff --git a/cavis-full/build.gradle b/cavis-full/build.gradle
index e722d42bf..c360cfe56 100644
--- a/cavis-full/build.gradle
+++ b/cavis-full/build.gradle
@@ -36,14 +36,17 @@ dependencies {
             }
     }
 */
+    if(withCpu()) api project(path: ":cavis-native:cavi-native-lib", configuration: "cpuSupportCompileClasspath")
+    if(withCuda()) api project(path: ":cavis-native:cavi-native-lib", configuration: "cudaSupportCompileClasspath")
 
+    /*
     api (project(':cavis-native:cavis-native-lib')) {
         capabilities {
             if(withCpu()) requireCapability("net.brutex.cavis.cavis-native:cavis-native-lib-cpu-support")
             //if(withCuda()) requireCapability("net.brutex.cavis.cavis-native:cavis-native-lib-cuda-support")
         }
     }
-
+*/
 }
 
 
diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle
index 989bc7c25..a83faf398 100644
--- a/cavis-native/cavis-native-lib/build.gradle
+++ b/cavis-native/cavis-native-lib/build.gradle
@@ -315,7 +315,6 @@ chipList.each { thisChip ->
         classOrPackageNames = ["org.nd4j.nativeblas.${thisChip}.Nd4j${thisChip.capitalize()}Presets"]
         outputDirectory = file("${buildDir}/generated/sources/javacpp/${thisChip}/${javacppPlatform}${javacppPlatformExtension}/")
 
-
         classPath = sourceSets.getByName("${thisChip}Support").getRuntimeClasspath()
         classPath += ["${buildDir}/classes/java/${thisChip}Support/"]
     }