diff --git a/charts/nuts-node/Chart.yaml b/charts/nuts-node/Chart.yaml
index 2a441fe290..3d3b693a5e 100644
--- a/charts/nuts-node/Chart.yaml
+++ b/charts/nuts-node/Chart.yaml
@@ -15,7 +15,7 @@ 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: 0.0.1
+version: 0.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/nuts-node/templates/deployment.yaml b/charts/nuts-node/templates/deployment.yaml
index c6b8d296b0..20ed3ed176 100644
--- a/charts/nuts-node/templates/deployment.yaml
+++ b/charts/nuts-node/templates/deployment.yaml
@@ -71,6 +71,12 @@ spec:
             httpGet:
               path: /status
               port: http
+          startupProbe:
+            httpGet:
+              path: /status
+              port: http
+            failureThreshold: 300
+            periodSeconds: 10
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/charts/nuts-node/templates/nuts-data-pv.yaml b/charts/nuts-node/templates/nuts-data-pv.yaml
index 0943e571da..ffdd0d0d61 100644
--- a/charts/nuts-node/templates/nuts-data-pv.yaml
+++ b/charts/nuts-node/templates/nuts-data-pv.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.nuts.data.persistedVolume.enabled }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -8,13 +9,15 @@ metadata:
     "helm.sh/resource-policy": keep
 spec:
   persistentVolumeReclaimPolicy: Retain
-  storageClassName: ""
+  storageClassName: {{ .Values.nuts.data.persistedVolume.storageClassName | default "" }}
   capacity:
     storage: {{ .Values.nuts.data.persistedVolume.capacity | default "100Mi" }}
   accessModes: {{ required "Please define `nuts.data.persistedVolume.accessModes` in `values.yaml`" .Values.nuts.data.persistedVolume.accessModes }}
   hostPath:
     path: {{ .Values.nuts.data.persistedVolume.mountPath | default "/opt/nuts/data" }}
 ---
+{{ end }}
+{{ if .Values.nuts.data.persistedVolumeClaim.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -22,8 +25,10 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 spec:
-  storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
-  accessModes: {{ required "Please define `nuts.data.persistedVolume.accessModes` in `values.yaml`" .Values.nuts.data.persistedVolume.accessModes }}
+  storageClassName: {{ .Values.nuts.data.persistedVolumeClaim.storageClassName | default "" }}
+  accessModes: {{ required "Please define `nuts.data.persistedVolumeClaim.accessModes` in `values.yaml`" .Values.nuts.data.persistedVolumeClaim.accessModes }}
   resources:
     requests:
-      storage: {{ .Values.nuts.data.persistedVolume.capacity | default "100Mi" }}
+      storage: {{ .Values.nuts.data.persistedVolumeClaim.capacity | default "100Mi" }}
+---
+{{ end }}
diff --git a/charts/nuts-node/values.yaml b/charts/nuts-node/values.yaml
index 18d605e7ef..9575945971 100644
--- a/charts/nuts-node/values.yaml
+++ b/charts/nuts-node/values.yaml
@@ -102,10 +102,18 @@ nuts:
   # Config for the NUTS data mount inside Kubernetes
   data:
     persistedVolume:
+      enabled: true
       capacity: 100Mi
       mountPath: /opt/nuts/data
       accessModes:
         - ReadWriteOnce
+      storageClassName: ""
+    persistedVolumeClaim:
+      enabled: true
+      capacity: 100Mi
+      storageClassName: ""
+      accessModes:
+        - ReadWriteOnce
 
   ssl:
     # Every key below will be loaded as a Secret and mounted as a file at /opt/nuts/ssl
@@ -135,4 +143,4 @@ nuts:
       VR0RBBMwEYIPbm9kZS5udXRzLmxvY2FsMAoGCCqGSM49BAMCA0gAMEUCIACXbFuP
       tPeduokCmVQAIavaUj2JlTmcIBDHvC6wZihEAiEA0fcogH7MjPrE/6bDaxZtNh0Q
       K6QDx9YVt/Mo6MFBgQY=
-      -----END CERTIFICATE-----
\ No newline at end of file
+      -----END CERTIFICATE-----