diff --git a/helm/templates/ingestor-statefulset.yaml b/helm/templates/ingestor-statefulset.yaml
index 91ca793c0..50324cb7e 100644
--- a/helm/templates/ingestor-statefulset.yaml
+++ b/helm/templates/ingestor-statefulset.yaml
@@ -54,7 +54,9 @@ spec:
                 apiVersion: v1
                 fieldPath: metadata.name
           {{- end }}
-          {{- range $secret := .Values.parseable.s3ModeSecret }}
+          
+          {{- if and .Values.parseable.s3ModeSecret .Values.parseable.s3ModeSecret.enabled }}
+          {{- range $secret := .Values.parseable.s3ModeSecret.secrets }}
           {{- range $key := $secret.keys }}
           {{- $envPrefix := $secret.prefix | default "" | upper }}
           {{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -65,7 +67,10 @@ spec:
                 key: {{ $key }}
           {{- end }}
           {{- end }}
-          {{- range $secret := .Values.parseable.blobModeSecret }}
+          {{- end }}
+
+          {{- if and .Values.parseable.blobModeSecret .Values.parseable.blobModeSecret.enabled }}
+          {{- range $secret := .Values.parseable.blobModeSecret.secrets }}
           {{- range $key := $secret.keys }}
           {{- $envPrefix := $secret.prefix | default "" | upper }}
           {{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -76,6 +81,7 @@ spec:
                 key: {{ $key }}
           {{- end }}
           {{- end }}
+          {{- end }}
           - name: P_MODE
             value: "ingest"
         ports:
diff --git a/helm/templates/querier-statefulset.yaml b/helm/templates/querier-statefulset.yaml
index d48ce1035..98845faaa 100644
--- a/helm/templates/querier-statefulset.yaml
+++ b/helm/templates/querier-statefulset.yaml
@@ -52,11 +52,15 @@ spec:
               fieldRef:
                 apiVersion: v1
                 fieldPath: metadata.name
+          - name: P_MODE
+            value: "query"
           {{- range $key, $value :=  .Values.parseable.env }}
           - name: {{ $key }}
             value: {{ tpl $value $ | quote }}
           {{- end }}
-          {{- range $secret := .Values.parseable.s3ModeSecret }}
+
+          {{- if and .Values.parseable.s3ModeSecret .Values.parseable.s3ModeSecret.enabled }}
+          {{- range $secret := .Values.parseable.s3ModeSecret.secrets }}
           {{- range $key := $secret.keys }}
           {{- $envPrefix := $secret.prefix | default "" | upper }}
           {{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -67,13 +71,10 @@ spec:
                 key: {{ $key }}
           {{- end }}
           {{- end }}
-          - name: P_MODE
-            value: "query"
-          {{- if .Values.parseable.persistence.querier.enabled }}
-          - name: P_HOT_TIER_DIR
-            value: "/parseable/hot-tier"
           {{- end }}
-          {{- range $secret := .Values.parseable.blobModeSecret }}
+
+          {{- if and .Values.parseable.blobModeSecret .Values.parseable.blobModeSecret.enabled }}
+          {{- range $secret := .Values.parseable.blobModeSecret.secrets }}
           {{- range $key := $secret.keys }}
           {{- $envPrefix := $secret.prefix | default "" | upper }}
           {{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -84,6 +85,7 @@ spec:
                 key: {{ $key }}
           {{- end }}
           {{- end }}
+          {{- end }}
         ports:
           - containerPort: 8000
         {{- with .Values.readinessProbe }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 83aa6d251..49f6759ad 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -297,6 +297,7 @@ vector:
 fluent-bit:
   enabled: true
   kind: DaemonSet
+  serverHost: parseable.parseable.svc.cluster.local
   replicaCount: 1
   image:
     repository: parseable/fluent-bit
@@ -382,7 +383,7 @@ fluent-bit:
       [OUTPUT]
           Name parseable
           Match kube.*
-          Server_Host parseable.parseable.svc.cluster.local
+          Server_Host {{ .Values.serverHost }}
           Username admin
           Password admin
           Server_Port 80
@@ -392,7 +393,7 @@ fluent-bit:
       [OUTPUT]
           Name parseable
           Match k8s_events
-          Server_Host parseable.parseable.svc.cluster.local
+          Server_Host {{ .Values.serverHost }}
           Server_Port 80
           Username admin
           Password admin