diff --git a/integration-tests/templates/datastore_server_yeastx/etc/service.properties b/integration-tests/templates/datastore_server_yeastx/etc/service.properties
index 78fa9d31e8c326ec38b9820bb011864969b9b284..f6175eac840b1502d329aeb9a4b7cf878c1d87e2 100644
--- a/integration-tests/templates/datastore_server_yeastx/etc/service.properties
+++ b/integration-tests/templates/datastore_server_yeastx/etc/service.properties
@@ -59,12 +59,6 @@ mail.smtp.host = file://${root}
 # Valid only when auto-detection method is used to determine if an incoming data are ready to be processed.
 quiet-period = 3
 
-# Specifies what should happen if an error occurs during dataset processing. 
-# By default this flag is set to false and user has to modify the 'faulty paths file' 
-# each time the faulty dataset should be processed again.
-# Set this flag to true if the processing should be repeated after some time without any manual intervention.
-reprocess-faulty-datasets = true
-
 # ------------------------
 
 inputs=main-thread, eicml-uploader, fiaml-uploader, quantml-uploader
@@ -86,6 +80,7 @@ main-thread.incoming-dir = ${root}/incoming
 # The default value is 'marker-file'.
 main-thread.incoming-data-completeness-condition = auto-detection
 main-thread.incoming-dir.format = 
+main-thread.reprocess-faulty-datasets = true
 
 sample-name-property-code = samplename
 experiment-name-property-code = name
@@ -142,7 +137,7 @@ main-thread.storage-processor.processor.processor = ch.systemsx.cisd.etlserver.D
 eicml-uploader.incoming-dir = ${root}/incoming-eicml
 eicml-uploader.incoming-data-completeness-condition = auto-detection
 eicml-uploader.incoming-dir.format = 
-
+eicml-uploader.reprocess-faulty-datasets = false
 
 # The extractor class to use for code extraction
 eicml-uploader.data-set-info-extractor = ch.systemsx.cisd.yeastx.etl.DataSetInfoExtractorYeastX
@@ -173,7 +168,7 @@ eicml-uploader.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultS
 fiaml-uploader.incoming-dir = ${root}/incoming-fiaml
 fiaml-uploader.incoming-data-completeness-condition = auto-detection
 fiaml-uploader.incoming-dir.format = 
-
+fiaml-uploader.reprocess-faulty-datasets = false
 
 # The extractor class to use for code extraction
 fiaml-uploader.data-set-info-extractor = ch.systemsx.cisd.yeastx.etl.DataSetInfoExtractorYeastX
@@ -204,6 +199,7 @@ fiaml-uploader.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultS
 quantml-uploader.incoming-dir = ${root}/incoming-quantml
 quantml-uploader.incoming-data-completeness-condition = auto-detection
 quantml-uploader.incoming-dir.format = 
+quantml-uploader.reprocess-faulty-datasets = false
 
 # The extractor class to use for code extraction
 quantml-uploader.data-set-info-extractor = ch.systemsx.cisd.yeastx.quant.QuantMLDataSetInfoExtractor