diff --git a/charts/openmetadata/templates/deployment.yaml b/charts/openmetadata/templates/deployment.yaml
index 9689961e..bb4deeba 100644
--- a/charts/openmetadata/templates/deployment.yaml
+++ b/charts/openmetadata/templates/deployment.yaml
@@ -37,24 +37,38 @@ spec:
             {{- toYaml . | nindent 10 }}
           {{- end }}
         envFrom:
+          - secretRef:
+              name: {{ include "OpenMetadata.fullname" . }}-config-secret
+          - secretRef:
+              name: {{ include "OpenMetadata.fullname" . }}-omd-secret
+          {{- if .Values.openmetadata.config.database.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-db-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.elasticsearch.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-search-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.authorizer.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-authorizer-secret
-          - secretRef:
-              name: {{ include "OpenMetadata.fullname" . }}-omd-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.secretsManager.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-secretsmanager-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.web.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-web-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.authentication.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-authentication-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.eventMonitor.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-eventmonitor-secret
-          - secretRef:
-              name: {{ include "OpenMetadata.fullname" . }}-config-secret
+          {{- end }}
           {{- if .Values.openmetadata.config.pipelineServiceClientConfig.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-pipeline-secret
@@ -116,25 +130,39 @@ spec:
           {{- with .Values.extraEnvs }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
-          envFrom:
+        envFrom:
+          - secretRef:
+              name: {{ include "OpenMetadata.fullname" . }}-config-secret
+          - secretRef:
+              name: {{ include "OpenMetadata.fullname" . }}-omd-secret
+          {{- if .Values.openmetadata.config.database.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-db-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.elasticsearch.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-search-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.authorizer.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-authorizer-secret
-          - secretRef:
-              name: {{ include "OpenMetadata.fullname" . }}-omd-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.secretsManager.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-secretsmanager-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.web.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-web-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.authentication.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-authentication-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.eventMonitor.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-eventmonitor-secret
-          - secretRef:
-              name: {{ include "OpenMetadata.fullname" . }}-config-secret
+          {{- end }}
           {{- if .Values.openmetadata.config.pipelineServiceClientConfig.enabled }}
           - secretRef:
               name: {{ include "OpenMetadata.fullname" . }}-pipeline-secret
@@ -153,9 +181,9 @@ spec:
               name: {{ include "OpenMetadata.fullname" $ }}-fernetkey-secret
           {{- end }}
           {{- end }}
-          {{- with .Values.envFrom }}
-            {{- toYaml . | nindent 10 }}
-          {{- end }}
+        {{- with .Values.envFrom }}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
         {{- if .Values.sidecars }}