diff --git a/charts/accounts-ui/templates/deployment.yaml b/charts/accounts-ui/templates/deployment.yaml
index 399d4d882..f74c06689 100644
--- a/charts/accounts-ui/templates/deployment.yaml
+++ b/charts/accounts-ui/templates/deployment.yaml
@@ -74,7 +74,7 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
-          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+          {{- if (include "settings.objstoreSecretName" .) }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: {{ $infra.objstore.mountPath }}/sa.json
           {{- end }}
diff --git a/charts/billing/templates/aggregator/cronjob.yaml b/charts/billing/templates/aggregator/cronjob.yaml
index 6ca01319b..ca87abe44 100644
--- a/charts/billing/templates/aggregator/cronjob.yaml
+++ b/charts/billing/templates/aggregator/cronjob.yaml
@@ -44,7 +44,7 @@ spec:
               resources:
                 {{- toYaml .Values.resources | nindent 16 }}
               env:
-              {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+              {{- if (include "settings.objstoreSecretName" .) }}
                 - name: GOOGLE_APPLICATION_CREDENTIALS
                   value: {{ $infra.objstore.mountPath }}/sa.json
               {{- end }}
diff --git a/charts/billing/templates/aggregator/statefulset.yaml b/charts/billing/templates/aggregator/statefulset.yaml
index 49e41f996..6a48887e7 100644
--- a/charts/billing/templates/aggregator/statefulset.yaml
+++ b/charts/billing/templates/aggregator/statefulset.yaml
@@ -65,7 +65,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: metadata.name
-          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+          {{- if (include "settings.objstoreSecretName" .) }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: {{ $infra.objstore.mountPath }}/sa.json
           {{- end }}
diff --git a/charts/billing/templates/processor/statefulset.yaml b/charts/billing/templates/processor/statefulset.yaml
index a9b026e72..400b20ffe 100644
--- a/charts/billing/templates/processor/statefulset.yaml
+++ b/charts/billing/templates/processor/statefulset.yaml
@@ -65,7 +65,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: metadata.name
-          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+          {{- if (include "settings.objstoreSecretName" .) }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: {{ $infra.objstore.mountPath }}/sa.json
           {{- end }}
diff --git a/charts/marketplace-api/templates/deployment.yaml b/charts/marketplace-api/templates/deployment.yaml
index 450dab494..ab711d188 100644
--- a/charts/marketplace-api/templates/deployment.yaml
+++ b/charts/marketplace-api/templates/deployment.yaml
@@ -68,7 +68,7 @@ spec:
           {{- with .Values.env }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+          {{- if (include "settings.objstoreSecretName" .) }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: {{ $infra.objstore.mountPath }}/sa.json
           {{- end }}
diff --git a/charts/platform-links/templates/deployment.yaml b/charts/platform-links/templates/deployment.yaml
index 0eb0da946..59eb51fd1 100644
--- a/charts/platform-links/templates/deployment.yaml
+++ b/charts/platform-links/templates/deployment.yaml
@@ -89,7 +89,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+          {{- if (include "settings.objstoreSecretName" .) }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: {{ $infra.objstore.mountPath }}/sa.json
           {{- end }}