diff --git a/integration-tests/templates/datastore_server-all/etc/service.properties b/integration-tests/templates/datastore_server-all/etc/service.properties
index 887d52b1d63311d1362779bf224da6906267a7d9..434c11170050d49d591655453079b953d3a840ba 100644
--- a/integration-tests/templates/datastore_server-all/etc/service.properties
+++ b/integration-tests/templates/datastore_server-all/etc/service.properties
@@ -77,14 +77,12 @@ inputs=raw-data,image-analysis
 # ---------------------------------------------------------------------------
 # The directory to watch for incoming data.
 raw-data.incoming-dir = ../data/out-raw
-# The group the samples extracted by this thread belong to. If commented out or empty, then samples
-# are considered associated to a database instance (not group private). 
-raw-data.group-code = CISD
 
 # The extractor plugin class to use for data set information extraction
 raw-data.data-set-info-extractor = ch.systemsx.cisd.etlserver.threev.DataSetInfoExtractorForDataAcquisition
 # Separator used to extract the barcode in the data set file name
 raw-data.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
+raw-data.data-set-info-extractor.group-code = CISD
 raw-data.data-set-info-extractor.index-of-data-producer-code = 0
 raw-data.data-set-info-extractor.index-of-data-production-date = 1
 raw-data.data-set-info-extractor.data-production-date-format = yyyyMMddHHmm
@@ -115,13 +113,11 @@ raw-data.storage-processor.file-extractor = ch.systemsx.cisd.etlserver.imsb.HCSI
 # image-analysis thread
 # ---------------------------------------------------------------------------
 image-analysis.incoming-dir = ../data/out-analysis
-# The group the samples extracted by this thread belong to. If commented out or empty, then samples
-# are considered associated to a database instance (not group private). 
-image-analysis.group-code = CISD
 
 image-analysis.data-set-info-extractor = ch.systemsx.cisd.etlserver.threev.DataSetInfoExtractorForImageAnalysis
 # Separator used to extract the barcode in the data set file name
 image-analysis.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
+image-analysis.data-set-info-extractor.group-code = CISD
 image-analysis.data-set-info-extractor.indices-of-parent-data-set-code-entities = 0 -1
 image-analysis.data-set-info-extractor.data-set-code-entities-glue = -
 # ...........................................................................