diff --git a/scb-engine/pom.xml b/scb-engine/pom.xml
index a7c8bce5..d87d4f4c 100644
--- a/scb-engine/pom.xml
+++ b/scb-engine/pom.xml
@@ -232,7 +232,7 @@
                     <dependency>
                         <groupId>org.elasticsearch</groupId>
                         <artifactId>elasticsearch</artifactId>
-                        <version>6.4.3</version>
+                        <version>6.8.2</version>
                     </dependency>
                 </dependencies>
             </dependencyManagement>
diff --git a/scb-engine/src/main/java/io/securecodebox/engine/history/HistoryCleanupConfig.java b/scb-engine/src/main/java/io/securecodebox/engine/history/HistoryCleanupConfig.java
new file mode 100644
index 00000000..5c414932
--- /dev/null
+++ b/scb-engine/src/main/java/io/securecodebox/engine/history/HistoryCleanupConfig.java
@@ -0,0 +1,14 @@
+package io.securecodebox.engine.history;
+
+import org.camunda.bpm.engine.impl.cfg.AbstractProcessEnginePlugin;
+import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class HistoryCleanupConfig  extends AbstractProcessEnginePlugin {
+    @Override
+    public void preInit(ProcessEngineConfigurationImpl processEngineConfiguration) {
+        processEngineConfiguration.setHistoryCleanupBatchWindowStartTime("20:00");
+        processEngineConfiguration.setHistoryCleanupBatchWindowEndTime("24:00");
+    }
+}
\ No newline at end of file
diff --git a/scb-persistenceproviders/elasticsearch-persistenceprovider/pom.xml b/scb-persistenceproviders/elasticsearch-persistenceprovider/pom.xml
index b7e489d7..f02b6182 100644
--- a/scb-persistenceproviders/elasticsearch-persistenceprovider/pom.xml
+++ b/scb-persistenceproviders/elasticsearch-persistenceprovider/pom.xml
@@ -31,7 +31,7 @@
     <version>0.0.1-SNAPSHOT</version>
 
     <properties>
-        <elasticsearch.version>6.8.1</elasticsearch.version>
+        <elasticsearch.version>6.8.2</elasticsearch.version>
     </properties>
 
 
diff --git a/scb-scanprocesses/amass-process/src/main/resources/bpmn/amass_process.bpmn b/scb-scanprocesses/amass-process/src/main/resources/bpmn/amass_process.bpmn
index 6a705ddf..926d9b15 100644
--- a/scb-scanprocesses/amass-process/src/main/resources/bpmn/amass_process.bpmn
+++ b/scb-scanprocesses/amass-process/src/main/resources/bpmn/amass_process.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2">
-  <bpmn:process id="amass-process" name="Amass Subdomain Scan" isExecutable="true" camunda:versionTag="2" camunda:historyTimeToLive="30">
+  <bpmn:process id="amass-process" name="Amass Subdomain Scan" isExecutable="true" camunda:versionTag="2" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_Configure" name="target configured" camunda:formKey="embedded:app:forms/default/configure-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/arachni-process/src/main/resources/bpmn/arachni_process.bpmn b/scb-scanprocesses/arachni-process/src/main/resources/bpmn/arachni_process.bpmn
index bc63b4f2..7acdaef9 100644
--- a/scb-scanprocesses/arachni-process/src/main/resources/bpmn/arachni_process.bpmn
+++ b/scb-scanprocesses/arachni-process/src/main/resources/bpmn/arachni_process.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2">
-  <bpmn:process id="arachni-process" name="Arachni Webapplication Scan" isExecutable="true" camunda:versionTag="4" camunda:historyTimeToLive="30">
+  <bpmn:process id="arachni-process" name="Arachni Webapplication Scan" isExecutable="true" camunda:versionTag="4" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_Configure" name="target configured" camunda:formKey="embedded:app:forms/arachni/configure-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__artifactId__.bpmn b/scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__artifactId__.bpmn
index 586bbbbb..e95c0137 100644
--- a/scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__artifactId__.bpmn
+++ b/scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__artifactId__.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2">
-  <bpmn:process id="$processTopic" name="$processName" isExecutable="true" camunda:versionTag="1" camunda:historyTimeToLive="30">
+  <bpmn:process id="$processTopic" name="$processName" isExecutable="true" camunda:versionTag="1" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_Configure" name="target configured" camunda:formKey="embedded:app:forms/default/configure-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${dollar}{checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/combined-amass-nmap-process/src/main/resources/bpmn/combined_amass_nmap_process.bpmn b/scb-scanprocesses/combined-amass-nmap-process/src/main/resources/bpmn/combined_amass_nmap_process.bpmn
index cdc8693f..f960bc8a 100644
--- a/scb-scanprocesses/combined-amass-nmap-process/src/main/resources/bpmn/combined_amass_nmap_process.bpmn
+++ b/scb-scanprocesses/combined-amass-nmap-process/src/main/resources/bpmn/combined_amass_nmap_process.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3">
-  <bpmn:process id="amass-nmap-process" name="Combined Amass-Nmap Scan" isExecutable="true" camunda:historyTimeToLive="30">
+  <bpmn:process id="amass-nmap-process" name="Combined Amass-Nmap Scan" isExecutable="true" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_Configure" name="target configured" camunda:formKey="embedded:app:forms/amass-nmap/configure-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/combined-nmap-nikto-process/src/main/resources/bpmn/combined-nmap-nikto-process.bpmn b/scb-scanprocesses/combined-nmap-nikto-process/src/main/resources/bpmn/combined-nmap-nikto-process.bpmn
index 71e11bd0..9d53c240 100644
--- a/scb-scanprocesses/combined-nmap-nikto-process/src/main/resources/bpmn/combined-nmap-nikto-process.bpmn
+++ b/scb-scanprocesses/combined-nmap-nikto-process/src/main/resources/bpmn/combined-nmap-nikto-process.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3">
-  <bpmn:process id="combined-nmap-nikto-process" name="Nmap-Nikto Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="30">
+  <bpmn:process id="combined-nmap-nikto-process" name="Nmap-Nikto Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_ConfigurePortscan" name="target configured" camunda:formKey="embedded:app:forms/configure-nmap-nikto-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/combined-nmap-ssh-process/src/main/resources/bpmn/combined-nmap-ssh-process.bpmn b/scb-scanprocesses/combined-nmap-ssh-process/src/main/resources/bpmn/combined-nmap-ssh-process.bpmn
index 1771c977..fdcaea7d 100644
--- a/scb-scanprocesses/combined-nmap-ssh-process/src/main/resources/bpmn/combined-nmap-ssh-process.bpmn
+++ b/scb-scanprocesses/combined-nmap-ssh-process/src/main/resources/bpmn/combined-nmap-ssh-process.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="2.2.4">
-  <bpmn:process id="combined-nmap-ssh-process" name="Nmap-SSH Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="30">
+  <bpmn:process id="combined-nmap-ssh-process" name="Nmap-SSH Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_Configure" name="target configured" camunda:formKey="embedded:app:forms/ssh/configure-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/nikto-process/src/main/resources/bpmn/nikto_scan.bpmn b/scb-scanprocesses/nikto-process/src/main/resources/bpmn/nikto_scan.bpmn
index c243395e..e8572405 100644
--- a/scb-scanprocesses/nikto-process/src/main/resources/bpmn/nikto_scan.bpmn
+++ b/scb-scanprocesses/nikto-process/src/main/resources/bpmn/nikto_scan.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.12.0">
-  <bpmn:process id="nikto-process" name="Nikto Webserver Scan" isExecutable="true" camunda:versionTag="1" camunda:historyTimeToLive="30">
+  <bpmn:process id="nikto-process" name="Nikto Webserver Scan" isExecutable="true" camunda:versionTag="1" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_ConfigurePortscan" name="target configured" camunda:formKey="embedded:app:forms/nikto/configure-webserver-scanner-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process.bpmn b/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process.bpmn
index d840ebdf..fd405508 100644
--- a/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process.bpmn
+++ b/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3">
-  <bpmn:process id="nmap-process" name="NMAP Port Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="30">
+  <bpmn:process id="nmap-process" name="NMAP Port Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_ConfigurePortscan" name="target configured" camunda:formKey="embedded:app:forms/nmap/configure-port-scanner-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process_raw.bpmn b/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process_raw.bpmn
index f55471c6..4ae88e43 100644
--- a/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process_raw.bpmn
+++ b/scb-scanprocesses/nmap-process/src/main/resources/bpmn/nmap_process_raw.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2">
-  <bpmn:process id="raw-nmap-process" name="NMAP Port Scan - Raw" isExecutable="false" camunda:versionTag="4" camunda:historyTimeToLive="30">
+  <bpmn:process id="raw-nmap-process" name="NMAP Port Scan - Raw" isExecutable="false" camunda:versionTag="4" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_ConfigurePortscan" name="target configured" camunda:formKey="embedded:app:forms/nmap/configure-port-scanner-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/ssh-process/src/main/resources/bpmn/ssh_process.bpmn b/scb-scanprocesses/ssh-process/src/main/resources/bpmn/ssh_process.bpmn
index ef222bab..a76f8ea8 100644
--- a/scb-scanprocesses/ssh-process/src/main/resources/bpmn/ssh_process.bpmn
+++ b/scb-scanprocesses/ssh-process/src/main/resources/bpmn/ssh_process.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.12.0">
-  <bpmn:process id="ssh-process" name="SSH Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="30">
+  <bpmn:process id="ssh-process" name="SSH Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_Configure" name="target configured" camunda:formKey="embedded:app:forms/ssh/configure-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/wordpress-process/src/main/resources/bpmn/wordpress_process.bpmn b/scb-scanprocesses/wordpress-process/src/main/resources/bpmn/wordpress_process.bpmn
index bc86da49..01758e99 100644
--- a/scb-scanprocesses/wordpress-process/src/main/resources/bpmn/wordpress_process.bpmn
+++ b/scb-scanprocesses/wordpress-process/src/main/resources/bpmn/wordpress_process.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.12.0">
-  <bpmn:process id="wordpress-process" name="WordPress Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="30">
+  <bpmn:process id="wordpress-process" name="WordPress Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="StartEvent_Configure" name="target configured" camunda:formKey="embedded:app:forms/wordpress/configure-target.html">
       <bpmn:extensionElements>
         <camunda:executionListener delegateExpression="${checkForAutomatedRunListener}" event="start" />
diff --git a/scb-scanprocesses/zap-process/src/main/resources/bpmn/zap_process.bpmn b/scb-scanprocesses/zap-process/src/main/resources/bpmn/zap_process.bpmn
index ba461e17..2106fe14 100644
--- a/scb-scanprocesses/zap-process/src/main/resources/bpmn/zap_process.bpmn
+++ b/scb-scanprocesses/zap-process/src/main/resources/bpmn/zap_process.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="2.0.1">
-  <bpmn:process id="zap-process" name="ZAP Webapplication Scan" isExecutable="true" camunda:versionTag="1" camunda:historyTimeToLive="30">
+  <bpmn:process id="zap-process" name="ZAP Webapplication Scan" isExecutable="true" camunda:versionTag="1" camunda:historyTimeToLive="1">
     <bpmn:endEvent id="EndEvent_FinishedWebserverScan" name="ZAP Scan finished">
       <bpmn:incoming>SequenceFlow_SummaryCreated</bpmn:incoming>
     </bpmn:endEvent>