diff --git a/core-plugin-openbis/build.gradle b/core-plugin-openbis/build.gradle
index 1441cd030bba38a20e3f245ff75ea2143762a550..5918280fb0ccd3091643274639f71428c33d0125 100644
--- a/core-plugin-openbis/build.gradle
+++ b/core-plugin-openbis/build.gradle
@@ -501,6 +501,12 @@ task serverOriginalDataStoreJavadocZip(type: Zip, dependsOn: serverOriginalDataS
     from serverOriginalDataStoreJavadoc.destinationDir
 }
 
+task commonbaseZip(type: Zip, dependsOn: [project(':lib-commonbase').tasks.jar]) {
+    baseName 'openBIS-API-commonbase'
+    from project(':lib-commonbase').tasks.jar.archiveFile
+    into 'openBIS-API-commonbase'
+}
+
 task serverApplicationServerJavadoc(type: Javadoc) {
     source project(':server-application-server').files('source/java').getAsFileTree().matching {
         include "**/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/**/*.java"
@@ -514,26 +520,27 @@ task serverApplicationServerJavadocZip(type: Zip, dependsOn: serverApplicationSe
     from serverApplicationServerJavadoc.destinationDir
 }
 
-// TODO: Add dropboxApiZip
 task clientsAndApis(type: Zip, dependsOn: [dssClientZip, queryApiZip, apiV3Zip, screeningApiZip, pybisZip, obisZip,
                                            dropboxJavaDocZip, dynamicApiJavadocZip, libOpenbisCommonJavadocZip,
-                                           serverOriginalDataStoreJavadocZip, serverApplicationServerJavadocZip]) {
+                                           serverOriginalDataStoreJavadocZip, serverApplicationServerJavadocZip, dropboxApiZip, commonbaseZip]) {
     baseName 'openBIS-clients-and-APIs'
-    from dssClientZip.archivePath
-    from queryApiZip.archivePath
-    from apiV3Zip.archivePath
-    from screeningApiZip.archivePath
-    from pybisZip.archivePath
-    from obisZip.archivePath
-    from dropboxJavaDocZip.archivePath
-    from dynamicApiJavadocZip.archivePath
-    from libOpenbisCommonJavadocZip.archivePath
-    from serverOriginalDataStoreJavadocZip.archivePath
-    from serverApplicationServerJavadocZip.archivePath
+    from dssClientZip.archiveFile
+    from queryApiZip.archiveFile
+    from apiV3Zip.archiveFile
+    from dropboxApiZip.archiveFile
+    from screeningApiZip.archiveFile
+    from pybisZip.archiveFile
+    from obisZip.archiveFile
+    from dropboxJavaDocZip.archiveFile
+    from dynamicApiJavadocZip.archiveFile
+    from libOpenbisCommonJavadocZip.archiveFile
+    from serverOriginalDataStoreJavadocZip.archiveFile
+    from serverApplicationServerJavadocZip.archiveFile
+    from commonbaseZip.archiveFile
     from('dist/client/readme.txt')
     rename { filename ->
         if (filename.startsWith('pybis-')) {
-            def contentOfSetUpFile = zipTree(pybisZip.archivePath).getFiles().findAll { it.path.endsWith('src/python/setup.cfg') }.iterator().next().text
+            def contentOfSetUpFile = zipTree(pybisZip.archiveFile).getFiles().findAll { it.path.endsWith('src/python/setup.cfg') }.iterator().next().text
             def pybisVersion = (contentOfSetUpFile =~ /version.*=.*(.*)/)[0][1]
             'pybis-' + pybisVersion + '.zip'
         } else {
diff --git a/core-plugin-openbis/query-api.gradle b/core-plugin-openbis/query-api.gradle
index 460047ee7a5496ba54fc480d45ddf03d2e421f36..c46b86aea6715f297d2714511ebda956c43cfb64 100644
--- a/core-plugin-openbis/query-api.gradle
+++ b/core-plugin-openbis/query-api.gradle
@@ -252,31 +252,30 @@ task apiV3JavaDocZip(type: Zip, dependsOn: apiV3JavaDoc) {
 
 task apiV3Zip(type: Zip, dependsOn: [apiV3JarBatteriesIncluded, apiV3Sources, apiV3JavaDocZip]) {
     baseName 'openBIS-API-V3'
-    from apiV3Jar.archivePath
-    from apiV3JarBatteriesIncluded.archivePath
-    from apiV3Sources.archivePath
-    from apiV3JavaDocZip.archivePath
+    from apiV3Jar.archiveFile
+    from apiV3JarBatteriesIncluded.archiveFile
+    from apiV3Sources.archiveFile
+    from apiV3JavaDocZip.archiveFile
     from configurations.apiV3Dependencies
     into 'openBIS-API-V3'
 }
 
 /////////// DROPBOX API V2 ////////////////////
 
-// TODO: Add dropboxApiJar and dropboxApiZip
-//task dropboxApiJar(type: Jar) {
-//    baseName 'openBIS-API-dropbox'
-//    includeEmptyDirs false
-//    from project(':server-original-data-store').compileJava.outputs.getFiles().getAsFileTree().matching {
-//        include "ch/systemsx/cisd/etlserver/registrator/api/v2/*.class"
-//        include "ch/systemsx/cisd/etlserver/registrator/api/v2/impl/*.class"
-//    }
-//}
-//
-//task dropboxApiZip(type: Zip, dependsOn: [dropboxApiJar]) {
-//    baseName 'openBIS-API-dropbox'
-//    from dropboxApiJar.archivePath
-//    into 'openBIS-API-dropbox'
-//}
+task dropboxApiJar(type: Jar) {
+    baseName 'openBIS-API-dropbox'
+    includeEmptyDirs false
+    from project(':server-original-data-store').compileJava.outputs.getFiles().getAsFileTree().matching {
+        include "ch/systemsx/cisd/etlserver/registrator/api/v2/*.class"
+        include "ch/systemsx/cisd/etlserver/registrator/api/v2/impl/*.class"
+    }
+}
+
+task dropboxApiZip(type: Zip, dependsOn: [dropboxApiJar]) {
+    baseName 'openBIS-API-dropbox'
+    from dropboxApiJar.archiveFile
+    into 'openBIS-API-dropbox'
+}
 
 configurations.create('dropboxApiJavadoc')
 dependencies {