diff --git a/datastore_server/dist/datastore_server.sh b/datastore_server/dist/datastore_server.sh
index cf66a0bdb54ed3a01bd95d1e7e73be4f639cc6a5..b8e1260d79029a930fea1afa517181089be27f57 100755
--- a/datastore_server/dist/datastore_server.sh
+++ b/datastore_server/dist/datastore_server.sh
@@ -145,7 +145,7 @@ command=$1
 # Build classpath from $LIB_FOLDER and $EXT_LIB_FOLDER content. First JAR is datastore_server.jar because it has to appear before cifex.jar
 CP=`echo $LIB_FOLDER/datastore_server.jar $LIB_FOLDER/*.jar $EXT_LIB_FOLDER/*.jar | sed 's/ /:/g'`
 
-CMD="${JAVA_BIN} ${JAVA_OPTS} -classpath $CP ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"
+CMD="${JAVA_BIN} ${JAVA_OPTS} ${JAVA_MEM_OPTS} -classpath $CP ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"
 
 # ensure that we ignore a possible prefix "--" for any command 
 command="${command#--*}"
diff --git a/datastore_server/dist/etc/datastore_server.conf b/datastore_server/dist/etc/datastore_server.conf
index 54bf425c8be27671a3f5d38b5207173a199ab5c3..65b8ef5079bbf3b6989a8d73d6beda1cbdcefa6b 100644
--- a/datastore_server/dist/etc/datastore_server.conf
+++ b/datastore_server/dist/etc/datastore_server.conf
@@ -8,10 +8,15 @@
 #JAVA_HOME=${JAVA_HOME:=/usr/java/latest}
 
 #
-# Options to the JRE
+# General options to the JRE
 #
 JAVA_OPTS=${JAVA_OPTS:=-server -d64 -Djavax.net.ssl.trustStore=etc/openBIS.keystore}
 
+#
+# Memory options to the JRE
+#
+JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
+
 #
 # Maximal number of log files to keep
 #
diff --git a/openbis/dist/server/openbis.conf b/openbis/dist/server/openbis.conf
index 6c5055b8023ca0d4c43cc2916239c0558d00efc9..58b74599d9e15f52effd131dfcc90abb6dbede31 100644
--- a/openbis/dist/server/openbis.conf
+++ b/openbis/dist/server/openbis.conf
@@ -15,4 +15,4 @@ JAVA_OPTS=${JAVA_OPTS:=-server -d64 -Djavax.net.ssl.trustStore=etc/openBIS.keyst
 #
 # Memory options to the JRE
 #
-JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m"
+JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"