diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 84a4eb625059540f26d3917b1080495447776abd..2ce610870452b902311153872828d34bc0cb6cb7 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.15
+current_version = 2.0.16
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3655b3c5de18a22180818a8ed2476bf49ebf4d9..15be1b55281d197ec1b9412efda12607ce1794ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ integration-test:
     - export PREPROCESSOR_RESULTS_BUCKET=$(cat /proc/sys/kernel/random/uuid)
     - kubectl apply -f testing/pvc-redis.yaml
     # default timeout is 5 min, move to 8m for some leeway
-    - helm install my-helm-release . --wait --timeout 8m --values ./testing/values-testing.yaml --values "${SECRET_HELM_VALUES_TESTING}" --set global.storage.target.container=${PREPROCESSOR_RESULTS_BUCKET}
+    - helm install my-helm-release . --wait --timeout 10m --values ./testing/values-testing.yaml --values "${SECRET_HELM_VALUES_TESTING}" --set global.storage.target.container=${PREPROCESSOR_RESULTS_BUCKET}
     - kubectl get po -A
   script:
     - cd testing && ./run_integration_test.sh
diff --git a/Chart.lock b/Chart.lock
index 85fa5dbaf40b826cf463253e518d89f288cc5c7c..96a204893c237cb4a840e2bc50952cfe6894e76d 100644
--- a/Chart.lock
+++ b/Chart.lock
@@ -7,16 +7,16 @@ dependencies:
   version: 10.9.0
 - name: vs-cache
   repository: https://charts-public.hub.eox.at
-  version: 2.0.8
+  version: 2.0.9
 - name: vs-client
   repository: https://charts-public.hub.eox.at
-  version: 2.0.14
+  version: 2.0.17
 - name: vs-renderer
   repository: https://charts-public.hub.eox.at
-  version: 2.0.41
+  version: 2.0.47
 - name: vs-registrar
   repository: https://charts-public.hub.eox.at
-  version: 2.0.41
+  version: 2.0.47
 - name: vs-scheduler
   repository: https://charts-public.hub.eox.at
   version: 2.0.1
@@ -29,5 +29,5 @@ dependencies:
 - name: vs-preprocessor
   repository: https://charts-public.hub.eox.at
   version: 2.1.5
-digest: sha256:60e334835ec1a8ac57beb161f9c0c5af8c8992e516775aa072a3bca09e1a131c
-generated: "2022-03-21T17:36:45.301094316Z"
+digest: sha256:9d87298bd4f38565ca19c497c46eb86580dcca07dd225d10a95a654b64ff069f
+generated: "2022-04-14T16:30:06.040197953Z"
diff --git a/Chart.yaml b/Chart.yaml
index 101a0546bcd130808f7e505954ce52a95254bec9..af5704c80f9ccfe03a8f53c5fd5d1076793baab7 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -5,10 +5,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "2.0.15"
+version: "2.0.16"
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: "2.0.15"
+appVersion: "2.0.16"
 maintainers:
   - name: EOX IT Services GmbH
     url: https://eox.at
@@ -22,19 +22,19 @@ dependencies:
     repository: "https://charts.bitnami.com/bitnami"
     alias: redis
   - name: vs-cache
-    version: "2.0.8"
+    version: "2.0.9"
     repository: "https://charts-public.hub.eox.at"
     alias: cache
   - name: vs-client
-    version: "2.0.14"
+    version: "2.0.17"
     repository: "https://charts-public.hub.eox.at"
     alias: client
   - name: vs-renderer
-    version: "2.0.41"
+    version: "2.0.47"
     repository: "https://charts-public.hub.eox.at"
     alias: renderer
   - name: vs-registrar
-    version: "2.0.41"
+    version: "2.0.47"
     repository: "https://charts-public.hub.eox.at"
     alias: registrar
   - name: vs-scheduler
diff --git a/charts/vs-cache-2.0.8.tgz b/charts/vs-cache-2.0.8.tgz
deleted file mode 100644
index f827e3a9444e5aef0dbe4f4905a43bba8b0b75fe..0000000000000000000000000000000000000000
Binary files a/charts/vs-cache-2.0.8.tgz and /dev/null differ
diff --git a/charts/vs-cache-2.0.9.tgz b/charts/vs-cache-2.0.9.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..b8a21d5436e66a7de37c78edf9d74ff728a1996c
Binary files /dev/null and b/charts/vs-cache-2.0.9.tgz differ
diff --git a/charts/vs-client-2.0.14.tgz b/charts/vs-client-2.0.14.tgz
deleted file mode 100644
index 470c38761087443da233bdeb615bbdc1b915efcf..0000000000000000000000000000000000000000
Binary files a/charts/vs-client-2.0.14.tgz and /dev/null differ
diff --git a/charts/vs-client-2.0.17.tgz b/charts/vs-client-2.0.17.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..ee0d7c0f16f5da4dfe585ee0b114d99e271a1934
Binary files /dev/null and b/charts/vs-client-2.0.17.tgz differ
diff --git a/charts/vs-registrar-2.0.41.tgz b/charts/vs-registrar-2.0.41.tgz
deleted file mode 100644
index c3e3b2f0f8c45a89e188744d37d6782c7f5a0d2c..0000000000000000000000000000000000000000
Binary files a/charts/vs-registrar-2.0.41.tgz and /dev/null differ
diff --git a/charts/vs-registrar-2.0.47.tgz b/charts/vs-registrar-2.0.47.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..4b5435b0756d6b7fe57cf49f315f6c40b3bd7992
Binary files /dev/null and b/charts/vs-registrar-2.0.47.tgz differ
diff --git a/charts/vs-renderer-2.0.41.tgz b/charts/vs-renderer-2.0.41.tgz
deleted file mode 100644
index 55ab981ea0768ddfcc076c5a9264415849fc3611..0000000000000000000000000000000000000000
Binary files a/charts/vs-renderer-2.0.41.tgz and /dev/null differ
diff --git a/charts/vs-renderer-2.0.47.tgz b/charts/vs-renderer-2.0.47.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..93c60749e8af6fdbe46a651d97783e4b78078001
Binary files /dev/null and b/charts/vs-renderer-2.0.47.tgz differ