diff --git a/server/src/main/resources/server-reference.conf b/server/src/main/resources/server-reference.conf
index 9588062e4..346fc071e 100644
--- a/server/src/main/resources/server-reference.conf
+++ b/server/src/main/resources/server-reference.conf
@@ -21,6 +21,8 @@ crossdata-server.akka.remote.netty.tcp.port = ${?crossdata_server_akka_remote_ne
 crossdata-server.akka.remote.netty.tcp.maximum-frame-size = 16MiB
 crossdata-server.akka.cluster.seed-nodes = ["akka.tcp://CrossdataServerCluster@127.0.0.1:13420"]
 crossdata-server.akka.cluster.server-nodes = ${?crossdata_server_akka_cluster_seed_nodes}
+crossdata-server.akka.contrib.cluster.receptionist.response-tunnel-receive-timeout = 60s
+crossdata-server.akka.contrib.cluster.receptionist.response-tunnel-receive-timeout = ${?crossdata_server_akka_contrib_cluster_receptionist_response_tunnel_receive_timeout}
 crossdata-server.config.cluster.name = "CrossdataServerCluster"
 crossdata-server.config.cluster.actor = "crossdata-server"
 crossdata-server.config.akka.number.server-actor-min = 5
@@ -37,19 +39,20 @@ crossdata-server.config.akka.number.server-actor-min = ${?crossdata_server_confi
 crossdata-server.config.spark.app.name = "CrossdataServer"
 crossdata-server.config.spark.master = "local[*]"
 crossdata-server.config.spark.master = ${?crossdata_server_config_spark_master}
-crossdata-server.config.spark.driver.memory = 2G
-crossdata-server.config.spark.driver.memory = ${?crossdata_server_config_spark_driver_memory}
-crossdata-server.config.spark.executor.memory = 2G
-crossdata-server.config.spark.executor.memory = ${?crossdata_server_config_spark_executor_memory}
-crossdata-server.config.spark.cores.max = 4
-crossdata-server.config.spark.cores.max = ${?crossdata_server_config_spark_cores_max}
+#crossdata-server.config.spark.executor.memory = 2G
+#crossdata-server_config_spark_executor_memory = ${?crossdata_server_config_spark_executor_memory}
+#crossdata-server.config.spark.cores.max = 4
+#crossdata-server.config.spark.cores.max = ${?crossdata_server_config_spark_cores_max}
 crossdata-server.config.spark.mesos.coarse = true
 crossdata-server.config.spark.mesos.coarse = ${?crossdata_server_config_spark_mesos_coarse}
-crossdata-server.config.spark.sql.shuffle.partitions = 200
-crossdata-server.config.spark.sql.shuffle.partitions = ${?crossdata_server_config_spark_sql_shuffle_partitions}
 crossdata-server.config.spark.akka.heartbeat.interval = 5000
 crossdata-server.config.spark.jars = "server/target/crossdata-server-${project.version}-jar-with-dependencies.jar"
 crossdata-server.config.spark.jars = ${?crossdata_server_config_spark_jars}
+crossdata-server.config.spark.driver.maxResultSize = 1G
+crossdata-server.config.spark.driver.maxResultSize = ${?crossdata_server_config_spark_driver_maxResultSize}
+crossdata-server.config.spark.scheduler.mode = "FAIR"
+crossdata-server.config.spark.scheduler.mode = ${?crossdata_server_config_spark_scheduler_mode}
+
 
 ################################
 #                              #
@@ -60,7 +63,7 @@ crossdata-server.config.spark.metrics.conf="server/src/main/resources/xdmetrics.
 
 ################################
 #                              #
-#      Common options          #
+#      Akka options            #
 #                              #
 ################################
 crossdata-server.akka.cluster.seed-node-timeout = 5s
@@ -83,9 +86,11 @@ crossdata-server.akka.remote.default-remote-dispatcher.fork-join-executor.parall
 crossdata-server.akka.contrib.cluster.receptionist.name = receptionist
 crossdata-server.akka.contrib.cluster.receptionist.role = ""
 crossdata-server.akka.contrib.cluster.receptionist.number-of-contacts = 3
-crossdata-server.akka.contrib.cluster.receptionist.response-tunnel-receive-timeout = 60s
-crossdata-server.akka.contrib.cluster.receptionist.response-tunnel-receive-timeout = ${?crossdata_server_akka_contrib_cluster_receptionist_response_tunnel_receive_timeout}
 
 crossdata-server.akka.loggers = ["akka.event.slf4j.Slf4jLogger"]
 crossdata-server.akka.loglevel = "INFO"
 crossdata-server.akka.loglevel = ${?crossdata_server_akka_loglevel}
+
+crossdata-server.akka.cluster.failure-detector.threshold = 12
+crossdata-server.akka.cluster.acceptable-heartbeat-pause = 5s
+crossdata-server.akka.cluster.heartbeat-interval = 2s
\ No newline at end of file
diff --git a/server/src/test/resources/server-reference.conf b/server/src/test/resources/server-reference.conf
index 0ddf7f3dc..50253067a 100644
--- a/server/src/test/resources/server-reference.conf
+++ b/server/src/test/resources/server-reference.conf
@@ -21,13 +21,15 @@ crossdata-server.akka.remote.netty.tcp.port = ${?crossdata_server_akka_remote_ne
 crossdata-server.akka.remote.netty.tcp.maximum-frame-size = 16MiB
 crossdata-server.akka.cluster.seed-nodes = ["akka.tcp://CrossdataServerCluster@127.0.0.1:13420"]
 crossdata-server.akka.cluster.server-nodes = ${?crossdata_server_akka_cluster_seed_nodes}
+crossdata-server.akka.contrib.cluster.receptionist.response-tunnel-receive-timeout = 60s
+crossdata-server.akka.contrib.cluster.receptionist.response-tunnel-receive-timeout = ${?crossdata_server_akka_contrib_cluster_receptionist_response_tunnel_receive_timeout}
 crossdata-server.config.cluster.name = "CrossdataServerCluster"
 crossdata-server.config.cluster.actor = "crossdata-server"
 crossdata-server.config.akka.number.server-actor-min = 5
 crossdata-server.config.akka.number.server-actor-min = ${?crossdata_server_config_akka_number_server_actor_min}
 crossdata-server.config.akka.number.server-actor-max = 10
 crossdata-server.config.akka.number.server-actor-min = ${?crossdata_server_config_akka_number_server_actor_max}
-
+#crossdata-server.config.jobs.finished.ttl_ms = 3600000
 
 ################################
 #                              #
@@ -37,17 +39,20 @@ crossdata-server.config.akka.number.server-actor-min = ${?crossdata_server_confi
 crossdata-server.config.spark.app.name = "CrossdataServer"
 crossdata-server.config.spark.master = "local[*]"
 crossdata-server.config.spark.master = ${?crossdata_server_config_spark_master}
-crossdata-server.config.spark.driver.memory = 2G
-crossdata-server.config.spark.driver.memory = ${?crossdata_server_config_spark_driver_memory}
-crossdata-server.config.spark.executor.memory = 2G
-crossdata-server_config_spark_executor_memory = ${?crossdata_server_config_spark_executor_memory}
-crossdata-server.config.spark.cores.max = 4
-crossdata-server.config.spark.cores.max = ${?crossdata_server_config_spark_cores_max}
+#crossdata-server.config.spark.executor.memory = 2G
+#crossdata-server_config_spark_executor_memory = ${?crossdata_server_config_spark_executor_memory}
+#crossdata-server.config.spark.cores.max = 4
+#crossdata-server.config.spark.cores.max = ${?crossdata_server_config_spark_cores_max}
 crossdata-server.config.spark.mesos.coarse = true
 crossdata-server.config.spark.mesos.coarse = ${?crossdata_server_config_spark_mesos_coarse}
 crossdata-server.config.spark.akka.heartbeat.interval = 5000
 crossdata-server.config.spark.jars = "server/target/crossdata-server-${project.version}-jar-with-dependencies.jar"
 crossdata-server.config.spark.jars = ${?crossdata_server_config_spark_jars}
+crossdata-server.config.spark.driver.maxResultSize = 1G
+crossdata-server.config.spark.driver.maxResultSize = ${?crossdata_server_config_spark_driver_maxResultSize}
+crossdata-server.config.spark.scheduler.mode = "FAIR"
+crossdata-server.config.spark.scheduler.mode = ${?crossdata_server_config_spark_scheduler_mode}
+
 
 ################################
 #                              #
@@ -58,7 +63,7 @@ crossdata-server.config.spark.metrics.conf="server/src/main/resources/xdmetrics.
 
 ################################
 #                              #
-#      Common options          #
+#      Akka options            #
 #                              #
 ################################
 crossdata-server.akka.cluster.seed-node-timeout = 5s
@@ -81,9 +86,11 @@ crossdata-server.akka.remote.default-remote-dispatcher.fork-join-executor.parall
 crossdata-server.akka.contrib.cluster.receptionist.name = receptionist
 crossdata-server.akka.contrib.cluster.receptionist.role = ""
 crossdata-server.akka.contrib.cluster.receptionist.number-of-contacts = 3
-crossdata-server.akka.contrib.cluster.receptionist.response-tunnel-receive-timeout = 60s
-crossdata-server.akka.contrib.cluster.receptionist.response-tunnel-receive-timeout = ${?crossdata_server_akka_contrib_cluster_receptionist_response_tunnel_receive_timeout}
 
 crossdata-server.akka.loggers = ["akka.event.slf4j.Slf4jLogger"]
 crossdata-server.akka.loglevel = "INFO"
 crossdata-server.akka.loglevel = ${?crossdata_server_akka_loglevel}
+
+crossdata-server.akka.cluster.failure-detector.threshold = 12
+crossdata-server.akka.cluster.acceptable-heartbeat-pause = 5s
+crossdata-server.akka.cluster.heartbeat-interval = 1s
\ No newline at end of file