diff --git a/helm/templates/standalone-deployment.yaml b/helm/templates/standalone-deployment.yaml
index dc0c8dbfc..abb615884 100644
--- a/helm/templates/standalone-deployment.yaml
+++ b/helm/templates/standalone-deployment.yaml
@@ -47,8 +47,8 @@ spec:
             - name: {{ $key }}
               value: {{ tpl $value $ | quote }}
             {{- end }}
-            {{- if .Values.parseable.localModeSecret }}
-            {{- range $secret := .Values.parseable.localModeSecret }}
+            {{- if and .Values.parseable.localModeSecret .Values.parseable.localModeSecret.enabled }}
+            {{- range $secret := .Values.parseable.localModeSecret.secrets }}
             {{- range $key := $secret.keys }}
             {{- $envPrefix := $secret.prefix | default "" | upper }}
             {{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -59,8 +59,10 @@ spec:
                   key: {{ $key }}
             {{- end }}
             {{- end }}
-            {{- else }}
-            {{- range $secret := .Values.parseable.s3ModeSecret }}
+            {{- end }}
+
+            {{- 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 "-" "_" }}
@@ -72,7 +74,9 @@ spec:
             {{- end }}
             {{- end }}
             {{- 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 "-" "_" }}
@@ -83,6 +87,7 @@ spec:
                   key: {{ $key }}
             {{- end }}
             {{- end }}
+            {{- end }}
           ports:
             - containerPort: 8000
           {{- with .Values.readinessProbe }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 949ae2365..83aa6d251 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -77,46 +77,45 @@ parseable:
   ## blobModeSecret if store is set to blob-store
   ## s3ModeSecret if store is set to s3-store
   localModeSecret:
-    - type: env
-      name: parseable-env-secret
-      prefix: P_
-      keys:
-      - addr
-      - username
-      - password
-      - staging.dir
-      - fs.dir
-  # blobModeSecret:
-  #   - type: env
-  #     name: parseable-env-secret
-  #     prefix: p_
-  #     keys:
-  #     - addr
-  #     - username
-  #     - password
-  #     - azr.access_key
-  #     - azr.account
-  #     - azr.container
-  #     - azr.url
-  # s3ModeSecret:
-  #   - type: env
-  #     name: parseable-env-secret
-  #     prefix: P_
-  #     keys:
-  #     ## Comment / uncomment the following lines as required
-  #     # - tls.cert.path
-  #     # - tls.key.path
-  #     # - storage.upload.interval
-  #     - addr
-  #     - username
-  #     - password
-  #     - staging.dir
-  #     - fs.dir
-  #     - s3.url
-  #     - s3.access.key
-  #     - s3.secret.key
-  #     - s3.bucket
-  #     - s3.region
+    enabled: false
+    secrets:
+      - name: parseable-env-secret
+        prefix: P_
+        keys:
+          - addr
+          - username
+          - password
+          - staging.dir
+          - fs.dir
+  blobModeSecret:
+    enabled: false
+    secrets:
+      - name: parseable-env-secret
+        prefix: P_
+        keys:
+          - addr
+          - username
+          - password
+          - azr.access_key
+          - azr.account
+          - azr.container
+          - azr.url
+  s3ModeSecret:
+    enabled: false
+    secrets:
+      - name: parseable-env-secret
+        prefix: P_
+        keys:
+          - addr
+          - username
+          - password
+          - staging.dir
+          - fs.dir
+          - s3.url
+          - s3.access.key
+          - s3.secret.key
+          - s3.bucket
+          - s3.region
   serviceAccount:
     create: true
     name: "parseable"