diff --git a/helm/templates/ingestor-statefulset.yaml b/helm/templates/ingestor-statefulset.yaml
index bc9b3d803..af6173189 100644
--- a/helm/templates/ingestor-statefulset.yaml
+++ b/helm/templates/ingestor-statefulset.yaml
@@ -52,6 +52,14 @@ spec:
               exit 1
       terminationGracePeriodSeconds: 10
       serviceAccountName: {{ include "parseable.serviceAccountName" . }}
+      {{- with .Values.parseable.highAvailability.ingestor.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.parseable.highAvailability.ingestor.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: {{ .Chart.Name }}
         securityContext:
diff --git a/helm/templates/querier-statefulset.yaml b/helm/templates/querier-statefulset.yaml
index 85b1c7f1a..e6f9f336c 100644
--- a/helm/templates/querier-statefulset.yaml
+++ b/helm/templates/querier-statefulset.yaml
@@ -37,6 +37,10 @@ spec:
     spec:
       terminationGracePeriodSeconds: 10
       serviceAccountName: {{ include "parseable.serviceAccountName" . }}
+      {{- with .Values.parseable.toleration }}
+      tolerations:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: {{ .Chart.Name }}
         securityContext:
@@ -55,6 +59,8 @@ spec:
           {{- if .Values.parseable.persistence.querier.enabled }}
           - name: P_HOT_TIER_DIR
             value: "/parseable/hot-tier"
+          - name: P_MAX_DISK_USAGE_PERCENT
+            value: "95.0"
           {{- end }}
           {{- range $key, $value :=  .Values.parseable.env }}
           - name: {{ $key }}
@@ -113,7 +119,7 @@ spec:
           {{- end }}
         ports:
           - containerPort: 8000
-        {{- with .Values.readinessProbe }}
+        {{- with .Values.parseable.readinessProbe }}
         readinessProbe:
           {{ toYaml . | nindent 12 }}
         {{- end }}
@@ -159,6 +165,15 @@ spec:
       resources:
         requests:
           storage: {{ .Values.parseable.persistence.querier.size | quote }}
+  - metadata:
+      name: stage-volume
+    spec:
+      accessModes:
+      - {{ .Values.parseable.persistence.querier.accessMode | quote }}
+      storageClassName: {{ .Values.parseable.persistence.querier.storageClass | quote }}
+      resources:
+        requests:
+          storage: 5Gi
   {{- end }}
   {{- if .Values.parseable.sidecar.enabled}}
     {{- .Values.parseable.sidecar.volumeClaimTemplates | toYaml | nindent 4 }}
diff --git a/helm/templates/standalone-deployment.yaml b/helm/templates/standalone-deployment.yaml
index b12ceb98a..2c28052ef 100644
--- a/helm/templates/standalone-deployment.yaml
+++ b/helm/templates/standalone-deployment.yaml
@@ -145,11 +145,7 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.parseable.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.parseable.tolerations }}
+      {{- with .Values.parseable.toleration }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 3b8a55151..329568372 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -12,6 +12,8 @@ parseable:
     ingestor: 
       port: 8000
       podAnnotations: {}
+      nodeSelector: {}
+      tolerations: []
       labels:
         app: parseable
         component: ingestor
@@ -79,7 +81,7 @@ parseable:
       enabled: false
       storageClass: ""
       accessMode: ReadWriteOnce
-      size: 20Gi
+      size: 100Gi
   ## comment out the secrets depending upon deployment option
   ## localModeSecret if store is set to local
   ## blobModeSecret if store is set to blob-store
@@ -151,6 +153,7 @@ parseable:
     httpGet:
       path: /api/v1/readiness
       port: 8000
+  toleration: []
   resources:
     limits:
       cpu: 500m