diff --git a/helm/templates/ingestor-statefulset.yaml b/helm/templates/ingestor-statefulset.yaml
index 48b69d960..12e9303f9 100644
--- a/helm/templates/ingestor-statefulset.yaml
+++ b/helm/templates/ingestor-statefulset.yaml
@@ -32,7 +32,7 @@ spec:
         {{- .Values.parseable.highAvailability.ingestor.labels | toYaml | nindent 8 }}
         {{- include "parseable.ingestorLabelsSelector" . | nindent 8 }}
     spec:
-      terminationGracePeriodSeconds: 10 
+      terminationGracePeriodSeconds: 10
       serviceAccountName: {{ include "parseable.serviceAccountName" . }}
       containers:
       - name: {{ .Chart.Name }}
@@ -42,7 +42,7 @@ spec:
         imagePullPolicy: {{ .Values.parseable.image.pullPolicy }}
         args:
           - /usr/bin/parseable
-          - s3-store 
+          - {{ .Values.parseable.store }}
           - --ingestor-endpoint=$(HOSTNAME).{{ include "parseable.fullname" . }}-ingestor-headless.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.parseable.highAvailability.ingestor.port }}
         env:
           {{- range $key, $value :=  .Values.parseable.highAvailability.ingestor.env }}
@@ -65,6 +65,17 @@ spec:
                 key: {{ $key }}
           {{- end }}
           {{- end }}
+          {{- range $secret := .Values.parseable.blobModeSecret }}
+          {{- range $key := $secret.keys }}
+          {{- $envPrefix := $secret.prefix | default "" | upper }}
+          {{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
+          - name: {{ $envPrefix }}{{ $envKey }}
+            valueFrom:
+              secretKeyRef:
+                name: {{ $secret.name }}
+                key: {{ $key }}
+          {{- end }}
+          {{- end }}
           - name: P_MODE
             value: "ingest"
         ports:
diff --git a/helm/templates/querier-statefulset.yaml b/helm/templates/querier-statefulset.yaml
index 4d6187548..d48ce1035 100644
--- a/helm/templates/querier-statefulset.yaml
+++ b/helm/templates/querier-statefulset.yaml
@@ -35,7 +35,7 @@ spec:
         {{- .Values.parseable.podLabels | toYaml | nindent 8 }}
         {{- include "parseable.querierLabelsSelector" . | nindent 8 }}
     spec:
-      terminationGracePeriodSeconds: 10 
+      terminationGracePeriodSeconds: 10
       serviceAccountName: {{ include "parseable.serviceAccountName" . }}
       containers:
       - name: {{ .Chart.Name }}
@@ -45,8 +45,13 @@ spec:
         imagePullPolicy: {{ .Values.parseable.image.pullPolicy }}
         args: 
         - /usr/bin/parseable
-        - s3-store
+        - {{ .Values.parseable.store }}
         env:
+          - name: HOSTNAME
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.name
           {{- range $key, $value :=  .Values.parseable.env }}
           - name: {{ $key }}
             value: {{ tpl $value $ | quote }}
@@ -60,11 +65,6 @@ spec:
               secretKeyRef:
                 name: {{ $secret.name }}
                 key: {{ $key }}
-          - name: HOSTNAME
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.name
           {{- end }}
           {{- end }}
           - name: P_MODE
@@ -73,6 +73,17 @@ spec:
           - name: P_HOT_TIER_DIR
             value: "/parseable/hot-tier"
           {{- end }}
+          {{- range $secret := .Values.parseable.blobModeSecret }}
+          {{- range $key := $secret.keys }}
+          {{- $envPrefix := $secret.prefix | default "" | upper }}
+          {{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
+          - name: {{ $envPrefix }}{{ $envKey }}
+            valueFrom:
+              secretKeyRef:
+                name: {{ $secret.name }}
+                key: {{ $key }}
+          {{- end }}
+          {{- end }}
         ports:
           - containerPort: 8000
         {{- with .Values.readinessProbe }}
diff --git a/helm/templates/standalone-deployment.yaml b/helm/templates/standalone-deployment.yaml
index 860bf1712..dc0c8dbfc 100644
--- a/helm/templates/standalone-deployment.yaml
+++ b/helm/templates/standalone-deployment.yaml
@@ -36,17 +36,18 @@ spec:
           imagePullPolicy: {{ .Values.parseable.image.pullPolicy }}
           # Uncomment to debug
           # command: [ "/bin/sh", "-c", "sleep 1000000" ]
-          {{- if .Values.parseable.local }}
-          args: ["/usr/bin/parseable", "local-store"]
-          {{- else }}
-          args: ["/usr/bin/parseable", "s3-store"]
-          {{- end }}
+          args: ["/usr/bin/parseable", {{ .Values.parseable.store | quote }}]
           env:
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.name
             {{- range $key, $value :=  .Values.parseable.env }}
             - name: {{ $key }}
               value: {{ tpl $value $ | quote }}
             {{- end }}
-            {{- if .Values.parseable.local }}
+            {{- if .Values.parseable.localModeSecret }}
             {{- range $secret := .Values.parseable.localModeSecret }}
             {{- range $key := $secret.keys }}
             {{- $envPrefix := $secret.prefix | default "" | upper }}
@@ -56,14 +57,9 @@ spec:
                 secretKeyRef:
                   name: {{ $secret.name }}
                   key: {{ $key }}
-            - name: HOSTNAME
-              valueFrom:
-                fieldRef:
-                  apiVersion: v1
-                  fieldPath: metadata.name
             {{- end }}
             {{- end }}
-            {{- else}}
+            {{- else }}
             {{- range $secret := .Values.parseable.s3ModeSecret }}
             {{- range $key := $secret.keys }}
             {{- $envPrefix := $secret.prefix | default "" | upper }}
@@ -76,6 +72,17 @@ spec:
             {{- end }}
             {{- end }}
             {{- end }}
+            {{- range $secret := .Values.parseable.blobModeSecret }}
+            {{- range $key := $secret.keys }}
+            {{- $envPrefix := $secret.prefix | default "" | upper }}
+            {{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
+            - name: {{ $envPrefix }}{{ $envKey }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $secret.name }}
+                  key: {{ $key }}
+            {{- end }}
+            {{- end }}
           ports:
             - containerPort: 8000
           {{- with .Values.readinessProbe }}
@@ -118,4 +125,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- end }}
+{{- end }}  # Closing for "if eq .Values.parseable.highAvailability.enabled false"
diff --git a/helm/values.yaml b/helm/values.yaml
index f8d91844d..a3448f749 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -3,9 +3,9 @@ parseable:
     repository: containers.parseable.com/parseable/parseable
     tag: v1.5.5
     pullPolicy: Always
-  ## Set to true if you want to deploy Parseable in local mode (store logs
-  ## on local mount point instead of S3 bucket)
-  local: false
+  ## object store can be local, s3 or blob.
+  ## local needs to be false if set to object store.
+  store: local-store
   ## Set to true if you want to deploy Parseable in a HA mode (multiple ingestors)
   ## Please note that highAvailability is not supported in local mode
   highAvailability:
@@ -72,6 +72,10 @@ parseable:
       storageClass: ""
       accessMode: ReadWriteOnce
       size: 1Gi
+  ## comment out the secrets depending upon deployment option
+  ## localModeSecret if store is set to local
+  ## blobModeSecret if store is set to blob-store
+  ## s3ModeSecret if store is set to s3-store
   localModeSecret:
     - type: env
       name: parseable-env-secret
@@ -82,25 +86,37 @@ parseable:
       - password
       - staging.dir
       - fs.dir
-  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
+  # 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
   serviceAccount:
     create: true
     name: "parseable"