diff --git a/dependencies/parsers/gulp b/dependencies/parsers/gulp
index 5f97f32086c281ebda5ab6084ae2c7eba16b516f..3b199d1f17f9cdf94e08fc5a3b46e2895147463d 160000
--- a/dependencies/parsers/gulp
+++ b/dependencies/parsers/gulp
@@ -1 +1 @@
-Subproject commit 5f97f32086c281ebda5ab6084ae2c7eba16b516f
+Subproject commit 3b199d1f17f9cdf94e08fc5a3b46e2895147463d
diff --git a/dependencies/parsers/siesta b/dependencies/parsers/siesta
index 0feea3bb5aeb2847cde41c4d642c6b5af8e38cd5..7505b8b16035ec22025875bb6dfbe22f812ddcdd 160000
--- a/dependencies/parsers/siesta
+++ b/dependencies/parsers/siesta
@@ -1 +1 @@
-Subproject commit 0feea3bb5aeb2847cde41c4d642c6b5af8e38cd5
+Subproject commit 7505b8b16035ec22025875bb6dfbe22f812ddcdd
diff --git a/dependencies/parsers/turbomole b/dependencies/parsers/turbomole
index 3811ced85fb7d68ca579d5ca8d93e800f48c53a5..4802d6d8ab942d2431a39d37e2ffefaf5c6ef478 160000
--- a/dependencies/parsers/turbomole
+++ b/dependencies/parsers/turbomole
@@ -1 +1 @@
-Subproject commit 3811ced85fb7d68ca579d5ca8d93e800f48c53a5
+Subproject commit 4802d6d8ab942d2431a39d37e2ffefaf5c6ef478
diff --git a/dependencies/python_common b/dependencies/python_common
index d8ee02926a9f37317c880ba3caa31f5140e7730e..0e0c20ab4adea61ad31f8a7e96876434008fb490 160000
--- a/dependencies/python_common
+++ b/dependencies/python_common
@@ -1 +1 @@
-Subproject commit d8ee02926a9f37317c880ba3caa31f5140e7730e
+Subproject commit 0e0c20ab4adea61ad31f8a7e96876434008fb490
diff --git a/ops/helm/nomad/templates/api-deployment.yaml b/ops/helm/nomad/templates/api-deployment.yaml
index 02c8becafaad1bce9a5d7163089a51380130067a..150971da23d12e495f4484bca316b03a6409cb9a 100644
--- a/ops/helm/nomad/templates/api-deployment.yaml
+++ b/ops/helm/nomad/templates/api-deployment.yaml
@@ -145,7 +145,7 @@ spec:
           path: {{ .Values.volumes.public }}
           type: Directory
       - name: staging-volume
-        {{ if (eq .Values.worker.routing "worker") }}
+        {{ if (eq .Values.worker.storage "memory") }}
         emptyDir:
           medium: 'Memory'
         {{ else }}
diff --git a/ops/helm/nomad/templates/nomad-configmap.yml b/ops/helm/nomad/templates/nomad-configmap.yml
index 88c66dbe140c98cfad78101ba2533196f57a8b26..6f9e4a1bc664d581c426fe544a7b62ad00804997 100644
--- a/ops/helm/nomad/templates/nomad-configmap.yml
+++ b/ops/helm/nomad/templates/nomad-configmap.yml
@@ -47,4 +47,7 @@ data:
       user: "{{ .Values.mail.user }}"
       password: "{{ .Values.mail.password }}"
       from_address: "{{ .Values.mail.from }}"
-    celery_routing: "{{ .Values.worker.routing }}"
+    celery:
+      routing: "{{ .Values.worker.routing }}"
+      timeout: 7200
+
diff --git a/ops/helm/nomad/templates/worker-deployment.yaml b/ops/helm/nomad/templates/worker-deployment.yaml
index ba73e5e3926f0003e3b83dcd189f0fb59f271425..84ab687ceecca6d21c3d5d726a48ef0659923f2a 100644
--- a/ops/helm/nomad/templates/worker-deployment.yaml
+++ b/ops/helm/nomad/templates/worker-deployment.yaml
@@ -79,7 +79,7 @@ spec:
           path: {{ .Values.volumes.public }}
           type: Directory
       - name: staging-volume
-        {{ if (eq .Values.worker.routing "worker") }}
+        {{ if (eq .Values.worker.storage "memory") }}
         emptyDir:
           medium: 'Memory'
         {{ else }}
diff --git a/ops/helm/nomad/values.yaml b/ops/helm/nomad/values.yaml
index 5af34b6548030ad218472df37705ed42b49dd351..53478bdbd1395a7e43eb4f7448d46959afbe5355 100644
--- a/ops/helm/nomad/values.yaml
+++ b/ops/helm/nomad/values.yaml
@@ -49,6 +49,7 @@ worker:
   console_loglevel: INFO
   logstash_loglevel: INFO
   routing: "queue"
+  storage: "disk"
 
 ## Everthing concerning the nomad gui
 gui:
diff --git a/ops/scripts/nomad.migration.values.yaml b/ops/scripts/nomad.migration.values.yaml
index 1d6104b872a3d8ca818f3c9f670c2c67f7e0182e..50ea2c2dc05fc5d143c6d6fe571b950485d39812 100644
--- a/ops/scripts/nomad.migration.values.yaml
+++ b/ops/scripts/nomad.migration.values.yaml
@@ -4,6 +4,9 @@ proxy:
     host: "labdev-nomad.esc.rzg.mpg.de"
     path: "/fairdi/nomad/migration"
 
+api:
+  disableReset: false
+
 worker:
   replicas: 3
   routing: "worker"
@@ -15,6 +18,6 @@ uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/migration/upload'
 volumes:
   prefixSize: 2
   public: /nomad/fairdi/migration/fs/public
-  staging: /nomad/fairdi/migration/fs/staging
+  staging: /scratch/fairdi/migration/fs/staging
   tmp: /nomad/fairdi/migration/fs/tmp
   nomad: /nomad