diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties
index da1ee5438d956bfa6d86dd349e04f56db0ea3c1d..e361bc9d3828e892e7c39ad30b8b9aaa8c092df0 100644
--- a/datastore_server/etc/service.properties
+++ b/datastore_server/etc/service.properties
@@ -50,7 +50,7 @@ notify-successful-registration = false
 server-url = http://localhost:8888
 
 # Time out for accessing openBIS server. Default value is 5 minutes.
-server-timeout-in-minutes = 1
+server-timeout-in-minutes = 10
 
 # The location of the jars accessable to web start clients
 webstart-jar-path = targets/dist/datastore_server/lib
@@ -202,27 +202,12 @@ validator.site.value-range = [0,Infinity)
 
 # Comma separated names of processing threads. Each thread should have configuration properties prefixed with its name.
 # E.g. 'code-extractor' property for the thread 'my-etl' should be specified as 'my-etl.code-extractor'
-inputs=jython-thread
-#main-thread, tsv-thread, csv-thread, simple-thread, hdf5-thread, dss-system-test-thread
+inputs=main-thread, tsv-thread, csv-thread, simple-thread, hdf5-thread, dss-system-test-thread
+
 # True if incoming directories should be created on server startup if they don't exist. 
 # Default - false (server will fail at startup if one of incoming directories doesn't exist). 
 incoming-dir-create = true
 
-
-jython-thread.incoming-dir = ${root-dir}/incoming-jython
-#jython-thread.incoming-dir = /Volumes/200Mb-disk/incoming-dir
-#jython-thread.staging-dir =  /Volumes/200Mb-disk/staging-dir
-#jython-thread.incoming-dir = /Volumes/small-test-disk/incoming-dir
-#jython-thread.staging-dir =  /Volumes/small-test-disk/staging-dir
-jython-thread.top-level-data-set-handler = ch.systemsx.cisd.etlserver.registrator.JythonTopLevelDataSetHandler
-jython-thread.incoming-data-completeness-condition = auto-detection
-jython-thread.strip-file-extension = true
-jython-thread.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
-#jython-thread.script-path = /Users/kaloyane/cisd/testbed/dss/virtual-datasets-dropbox.py
-#jython-thread.script-path = /Users/kaloyane/cisd/testbed/dss/simple-dropbox.py
-jython-thread.script-path = /Users/kaloyane/cisd/testbed/dss/dataset-update.py
-
-
 # ---------------------------------------------------------------------------
 # Dataset uploader 'main-thread' configuration
 # ---------------------------------------------------------------------------
@@ -397,8 +382,7 @@ archiver.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.Rs
 # local:
 #archiver.destination = openbis:tmp/dest
 # remote:
-archiver.destination = localhost:/tmp/dss-backup
-archiver.find-executable = /opt/local/bin/find
+archiver.destination = /Users/openbis/dest
 # indicates if data should be synchronized when local copy differs from one in archive (default: true)
 archiver.synchronize-archive = true
 
@@ -458,9 +442,7 @@ post-registration.pathinfo-feeding.class = ch.systemsx.cisd.etlserver.path.PathI
 #
 # when set to 'true' an internal ftp server will be started. it provides users with an alternative 
 # way to interact with their data (i.e. via an FTP client).  
-ftp.server.enable=true
-ftp.server.activemode.enable=true
-ftp.server.activemode.port=2125
+#ftp.server.enable=false
 #
 # port where the FTP server will be started. Optional parameter, default value is 2121
 #ftp.server.port=2121
@@ -471,7 +453,7 @@ ftp.server.activemode.port=2125
 #ftp.server.passivemode.port.range=2130-2140
 #
 # Similar to the global 'use-ssl' parameter. When set to 'true' all 'keystore' properties become mandatory.
-ftp.server.use-ssl=false
+#ftp.server.use-ssl=true
 #
 # maximum number of threads used by the internal FTP server. Defaults to 25.
 #ftp.server.maxThreads=25