diff --git a/openbis_standard_technologies/dist/etc/service.properties b/openbis_standard_technologies/dist/etc/service.properties
index 2f05b85ef1629d184c5b8f8880f379340e843f0f..91ab5c5c4c68c41f9056ccefa7ba5feaef053252 100644
--- a/openbis_standard_technologies/dist/etc/service.properties
+++ b/openbis_standard_technologies/dist/etc/service.properties
@@ -15,8 +15,11 @@ incoming-root-dir = ${root-dir}
 # Cache for data set files from other Data Store Servers
 cache-workspace-folder = ../../data/dss-cache
 
-# The directory where the command queue files are located; defaults to storeroot-dir 
-commandqueue-dir =
+# The session workspace is stored in the storage root by default to have the same amount of space available that the final storage and allow atomic moves
+session-workspace-root-dir = ${storeroot-dir}/sessionWorkspace
+
+# The directory where the command queue file is located; defaults to storeroot-dir but ideally should be on the same computer as the server on a directory that survives upgrades
+commandqueue-dir = ../../datastore_commandqueue
 
 # Comma-separated list of definitions of additional queues for processing processing plugins.
 # Each entry is of the form <queue name>:<regular expression>