diff --git a/integration-tests/templates/test_openbis_sync/core-plugins/openbis1/1/dss/drop-boxes/entity-reg/dropbox.py b/integration-tests/templates/test_openbis_sync/core-plugins/openbis1/1/dss/drop-boxes/entity-reg/dropbox.py
index d091a18799f6199d35235a5ff0878d1108e0a46f..42ddb292c447003df44b9b929f100c7b2eb9f97c 100644
--- a/integration-tests/templates/test_openbis_sync/core-plugins/openbis1/1/dss/drop-boxes/entity-reg/dropbox.py
+++ b/integration-tests/templates/test_openbis_sync/core-plugins/openbis1/1/dss/drop-boxes/entity-reg/dropbox.py
@@ -2,6 +2,7 @@ import glob
 import os
 from datetime import datetime
 from ch.systemsx.cisd.openbis.dss.generic.shared.utils import ExcelFileReader
+from ch.systemsx.cisd.openbis.generic.shared.basic.dto import DataSetKind
 
 def process(transaction):
     print "Starting..."
@@ -43,6 +44,7 @@ def createDsWithPermId(transaction, sample, code, ds_type):
 
 def registerContainerDS(transaction, experiment, comp_ds_code):
     container = transaction.createNewDataSet("HCS_IMAGE_CONTAINER_RAW", "CONTAINER_DS1")
+    container.setDataSetKind(DataSetKind.CONTAINER)
     container.setExperiment(experiment)
     container.setContainedDataSetCodes([comp_ds_code])
 
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java
index 9e6e4de7918a7f935290267dcef71254dfc682de..b75cd7fdebcb0e940dc837f29100053b90ba0dd7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java
@@ -679,6 +679,7 @@ public class ImagingDataSetRegistrationTransaction extends DataSetRegistrationTr
                         factory.featureVectorContainerDatasetFactory, containerDatasetTypeCode);
         containerDataSet.setContainedDataSetCodes(Collections.singletonList(mainDataset
                 .getDataSetCode()));
+        containerDataSet.setDataSetKind(DataSetKind.CONTAINER);
 
         containerDataSet.setOriginalDataSet(mainDataset);