diff --git a/core-plugin-openbis/build.gradle b/core-plugin-openbis/build.gradle
index 350a7a0dbd157f34c5a43aa4bf9c2962b6cdddf4..1441cd030bba38a20e3f245ff75ea2143762a550 100644
--- a/core-plugin-openbis/build.gradle
+++ b/core-plugin-openbis/build.gradle
@@ -514,7 +514,8 @@ task serverApplicationServerJavadocZip(type: Zip, dependsOn: serverApplicationSe
     from serverApplicationServerJavadoc.destinationDir
 }
 
-task clientsAndApis(type: Zip, dependsOn: [dssClientZip, queryApiZip, apiV3Zip, dropboxApiZip, screeningApiZip, pybisZip, obisZip,
+// TODO: Add dropboxApiZip
+task clientsAndApis(type: Zip, dependsOn: [dssClientZip, queryApiZip, apiV3Zip, screeningApiZip, pybisZip, obisZip,
                                            dropboxJavaDocZip, dynamicApiJavadocZip, libOpenbisCommonJavadocZip,
                                            serverOriginalDataStoreJavadocZip, serverApplicationServerJavadocZip]) {
     baseName 'openBIS-clients-and-APIs'
diff --git a/core-plugin-openbis/query-api.gradle b/core-plugin-openbis/query-api.gradle
index bf53ad8a8dbeceb9b6288e7de25816e8c427991b..460047ee7a5496ba54fc480d45ddf03d2e421f36 100644
--- a/core-plugin-openbis/query-api.gradle
+++ b/core-plugin-openbis/query-api.gradle
@@ -262,20 +262,21 @@ task apiV3Zip(type: Zip, dependsOn: [apiV3JarBatteriesIncluded, apiV3Sources, ap
 
 /////////// DROPBOX API V2 ////////////////////
 
-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'
-}
+// 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'
+//}
 
 configurations.create('dropboxApiJavadoc')
 dependencies {