diff --git a/cavis-full/build.gradle b/cavis-full/build.gradle
index b6f082a52..c09fed04e 100644
--- a/cavis-full/build.gradle
+++ b/cavis-full/build.gradle
@@ -36,8 +36,8 @@ dependencies {
             }
     }
 */
-    if(withCpu()) api project(path: ":cavis-native:cavis-native-lib", configuration: "cpuSupportCompileClasspath")
-    if(withCuda()) api project(path: ":cavis-native:cavis-native-lib", configuration: "cudaSupportCompileClasspath")
+    //if(withCpu()) api project(path: ":cavis-native:cavis-native-lib", configuration: "cpuSupportCompileClasspath")
+    //if(withCuda()) api project(path: ":cavis-native:cavis-native-lib", configuration: "cudaSupportCompileClasspath")
 
     /*
     api (project(':cavis-native:cavis-native-lib')) {
diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle
index a83faf398..8614fc9df 100644
--- a/cavis-native/cavis-native-lib/build.gradle
+++ b/cavis-native/cavis-native-lib/build.gradle
@@ -428,6 +428,11 @@ chipList.each { thisChip ->
     }
 }
 
+chipList.each{ thisChip ->
+    configurations {
+        implementation.extendsFrom findByName("${thisChip}SupportImplementation")
+    }
+}
 
 
 tasks.withType(JavaCompile) {