diff --git a/openbis_standard_technologies/query-api.gradle b/openbis_standard_technologies/query-api.gradle
index 3d223468d9dc0a2e8d07ebb315e4ffe832fd85b5..12589b97c39207dad0f2afb1664d71db6ee58565 100644
--- a/openbis_standard_technologies/query-api.gradle
+++ b/openbis_standard_technologies/query-api.gradle
@@ -107,7 +107,8 @@ task apiV3Jar(type: Jar) {
           exclude "ch/systemsx/cisd/common/api/server/**/*.class"
           include "ch/systemsx/cisd/openbis/common/api/**/*.class"
           exclude "ch/systemsx/cisd/openbis/common/api/server/**/*.class"
-          include "ch/ethz/sis/openbis/generic/shared/api/v3/**/*.class"
+          include "ch/ethz/sis/openbis/generic/asapi/v3/**/*.class"
+          include "ch/ethz/sis/openbis/generic/dssapi/v3/**/*.class"
           include "ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.class"
           include "*.INFO"
   }
@@ -145,7 +146,8 @@ task apiV3Sources(type: Jar) {
           exclude "ch/systemsx/cisd/common/api/server/**/*.java"
           include "ch/systemsx/cisd/openbis/common/api/**/*.java"
           exclude "ch/systemsx/cisd/openbis/common/api/server/**/*.java"
-          include "ch/ethz/sis/openbis/generic/shared/api/v3/**/*.java"
+          include "ch/ethz/sis/openbis/generic/asapi/v3/**/*.java"
+          include "ch/ethz/sis/openbis/generic/dssapi/v3/**/*.java"
           include "ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.java"
     }
 }