diff --git a/charts/openmetadata/README.md b/charts/openmetadata/README.md
index c0b3aed3..2463d626 100644
--- a/charts/openmetadata/README.md
+++ b/charts/openmetadata/README.md
@@ -33,6 +33,7 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 
 | Key | Type | Default | Conf/Openmetadata.yaml | 
 |-----|------|---------| ---------------------- |
+| openmetadata.config.authentication.enabled | bool | `true` | |
 | openmetadata.config.authentication.provider | string | `basic` | AUTHENTICATION_PROVIDER |
 | openmetadata.config.authentication.publicKeys | list | `[http://openmetadata:8585/api/v1/system/config/jwks]` | AUTHENTICATION_PUBLIC_KEYS |
 | openmetadata.config.authentication.authority | string | `https://accounts.google.com` | AUTHENTICATION_AUTHORITY |
@@ -86,6 +87,7 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | openmetadata.config.authentication.saml.security.keyStoreAlias.secretKey | string  | `Empty` | SAML_KEYSTORE_ALIAS |
 | openmetadata.config.authentication.saml.security.keyStorePassword.secretRef | string  | `Empty` | SAML_KEYSTORE_PASSWORD |
 | openmetadata.config.authentication.saml.security.keyStorePassword.secretKey | string  | `Empty` | SAML_KEYSTORE_PASSWORD |
+| openmetadata.config.authorizer.enabled | bool | `true` | |
 | openmetadata.config.authorizer.allowedEmailRegistrationDomains | list | `[all]` | AUTHORIZER_ALLOWED_REGISTRATION_DOMAIN |
 | openmetadata.config.authorizer.className | string | `org.openmetadata.service.security.DefaultAuthorizer` | AUTHORIZER_CLASS_NAME |
 | openmetadata.config.authorizer.containerRequestFilter | string | `org.openmetadata.service.security.JwtFilter` | AUTHORIZER_REQUEST_FILTER |
@@ -102,6 +104,7 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | openmetadata.config.airflow.sslCertificatePath | string | `/no/path` | PIPELINE_SERVICE_CLIENT_SSL_CERT_PATH |
 | openmetadata.config.airflow.verifySsl | string | `no-ssl` | PIPELINE_SERVICE_CLIENT_VERIFY_SSL |
 | openmetadata.config.clusterName | string | `openmetadata` | OPENMETADATA_CLUSTER_NAME |
+| openmetadata.config.database.enabled | bool | `true` | |
 | openmetadata.config.database.auth.password.secretRef | string | `mysql-secrets` | DB_USER_PASSWORD |
 | openmetadata.config.database.auth.password.secretKey | string | `openmetadata-mysql-password` | DB_USER_PASSWORD |
 | openmetadata.config.database.auth.username | string | `openmetadata_user` | DB_USER|
@@ -111,6 +114,7 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | openmetadata.config.database.driverClass| string | `com.mysql.cj.jdbc.Driver` | DB_DRIVER_CLASS |
 | openmetadata.config.database.host | string | `mysql` | DB_HOST |
 | openmetadata.config.database.port | int | 3306 | DB_PORT |
+| openmetadata.config.elasticsearch.enabled | bool | `true` | |
 | openmetadata.config.elasticsearch.auth.enabled | bool | `false` | |
 | openmetadata.config.elasticsearch.auth.username | string | `elasticsearch` | ELASTICSEARCH_USER |
 | openmetadata.config.elasticsearch.auth.password.secretRef | string | `elasticsearch-secrets` | ELASTICSEARCH_PASSWORD |
@@ -125,6 +129,7 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | openmetadata.config.elasticsearch.trustStore.path | string | `Empty String` | ELASTICSEARCH_TRUST_STORE_PATH |
 | openmetadata.config.elasticsearch.trustStore.password.secretRef | string | `elasticsearch-truststore-secrets` | ELASTICSEARCH_TRUST_STORE_PASSWORD |
 | openmetadata.config.elasticsearch.trustStore.password.secretKey | string | `openmetadata-elasticsearch-truststore-password` | ELASTICSEARCH_TRUST_STORE_PASSWORD |
+| openmetadata.config.eventMonitor.enabled | bool | `true` | |
 | openmetadata.config.eventMonitor.type | string | `prometheus` | EVENT_MONITOR |
 | openmetadata.config.eventMonitor.batchSize | int | `10` | EVENT_MONITOR_BATCH_SIZE |
 | openmetadata.config.eventMonitor.pathPattern | list | `[/api/v1/tables/*,/api/v1/health-check]` | EVENT_MONITOR_PATH_PATTERN |
@@ -138,7 +143,6 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | openmetadata.config.jwtTokenConfiguration.jwtissuer | string | `open-metadata.org` | JWT_ISSUER |
 | openmetadata.config.jwtTokenConfiguration.keyId | string | `Gb389a-9f76-gdjs-a92j-0242bk94356` | JWT_KEY_ID |
 | openmetadata.config.logLevel | string | `INFO` | LOG_LEVEL |
-| openmetadata.config.maskPasswordsApi | bool | `false` | MASK_PASSWORDS_API |
 | openmetadata.config.openmetadata.adminPort | int | 8586 | SERVER_ADMIN_PORT |
 | openmetadata.config.openmetadata.host | string | `openmetadata` | OPENMETADATA_SERVER_URL |
 | openmetadata.config.openmetadata.port | int | 8585 | SERVER_PORT |
@@ -154,6 +158,7 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | openmetadata.config.pipelineServiceClientConfig.sslCertificatePath | string | `/no/path` | PIPELINE_SERVICE_CLIENT_SSL_CERT_PATH |
 | openmetadata.config.pipelineServiceClientConfig.verifySsl | string | `no-ssl` | PIPELINE_SERVICE_CLIENT_VERIFY_SSL | 
 | openmetadata.config.pipelineServiceClientConfig.hostIp | string | `Empty` | PIPELINE_SERVICE_CLIENT_HOST_IP |
+| openmetadata.config.secretsManager.enabled | bool | `true` | |
 | openmetadata.config.secretsManager.provider | string | `noop` | SECRET_MANAGER |
 | openmetadata.config.secretsManager.additionalParameters.enabled | bool | `false` | |
 | openmetadata.config.secretsManager.additionalParameters.accessKeyId.secretRef | string | `aws-access-key-secret` | OM_SM_ACCESS_KEY_ID |
@@ -173,6 +178,7 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | openmetadata.config.smtpConfig.username | string | `Empty String` | SMTP_SERVER_USERNAME |
 | openmetadata.config.upgradeMigrationConfigs.force | bool | `false` |  |
 | openmetadata.config.upgradeMigrationConfigs.migrationLimitParam | int | `1200` | MIGRATION_LIMIT_PARAM |
+| openmetadata.config.web.enabled | bool | `true` | |
 | openmetadata.config.web.contentTypeOptions.enabled | bool | `false` | WEB_CONF_CONTENT_TYPE_OPTIONS_ENABLED |
 | openmetadata.config.web.csp.enabled | bool | `false` | WEB_CONF_XSS_CSP_ENABLED |
 | openmetadata.config.web.csp.policy | string | `default-src 'self` | WEB_CONF_XSS_CSP_POLICY |
@@ -250,3 +256,6 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | startupProbe.successThreshold | int | `1` |
 | tolerations | list | `[]` |
 | networkPolicy.enabled | bool |`false` |
+| podDisruptionBudget.enabled | bool | `false` |
+| podDisruptionBudget.config.maxUnavailable | String | `1` |
+| podDisruptionBudget.config.minAvailable | String | `1` |
\ No newline at end of file
diff --git a/charts/openmetadata/templates/_helpers.tpl b/charts/openmetadata/templates/_helpers.tpl
index d98c96fe..976e935b 100644
--- a/charts/openmetadata/templates/_helpers.tpl
+++ b/charts/openmetadata/templates/_helpers.tpl
@@ -65,14 +65,16 @@ Create the name of the service account to use
 {{- end }}
 
 {{/*
-Quoted Array of strings
+Quoted Array of strings with base64 encoding
 */}}
-{{- define "OpenMetadata.commaJoinedQuotedList" }}
+{{- define "OpenMetadata.commaJoinedQuotedEncodedList" }}
 {{- $list := list }}
 {{- range .value }}
-{{- $list = append $list (. | quote) }}
+{{- $list = append $list (. | quote ) }}
 {{- end }}
-{{- join "," $list }}
+{{- $list := join "," $list | toString }}
+{{- $list := printf "[%s]" $list }}
+{{- $list | b64enc }}
 {{- end -}}
 
 {{/*
@@ -105,80 +107,8 @@ OpenMetadata Configurations Environment Variables*/}}
       name: {{ .secretRef }}
       key: {{ .secretKey }}
 {{- end }}
-{{ else }}
-- name: FERNET_KEY
-  valueFrom:
-    secretKeyRef:
-      name: {{ include "OpenMetadata.fullname" . }}-secret
-      key: FERNET_KEY
-{{- end }}
-- name: EVENT_MONITOR
-  value: "{{ .Values.openmetadata.config.eventMonitor.type }}"
-- name: EVENT_MONITOR_BATCH_SIZE
-  value: "{{ .Values.openmetadata.config.eventMonitor.batchSize }}"
-- name: EVENT_MONITOR_PATH_PATTERN
-  value: '[{{ include "OpenMetadata.commaJoinedQuotedList" (dict "value" .Values.openmetadata.config.eventMonitor.pathPattern) }}]'
-- name: EVENT_MONITOR_LATENCY
-  value: '[{{ include "OpenMetadata.commaJoinedQuotedList" (dict "value" .Values.openmetadata.config.eventMonitor.latency) }}]'
-- name: MASK_PASSWORDS_API
-  value: '{{ .Values.openmetadata.config.maskPasswordsApi }}'
-- name: OPENMETADATA_CLUSTER_NAME
-  value: "{{ tpl .Values.openmetadata.config.clusterName . }}"
-- name: OM_URI
-  value: "{{ .Values.openmetadata.config.openmetadata.uri }}"
-- name: LOG_LEVEL
-  value: "{{ .Values.openmetadata.config.logLevel }}"
-- name: SERVER_HOST
-  value: "{{ .Values.openmetadata.config.openmetadata.host }}"
-- name: SERVER_PORT
-  value: "{{ .Values.openmetadata.config.openmetadata.port }}"
-- name: SERVER_ADMIN_PORT
-  value: "{{ .Values.openmetadata.config.openmetadata.adminPort }}"
-- name: AUTHENTICATION_PROVIDER
-  value: "{{ .Values.openmetadata.config.authentication.provider }}"
-- name: AUTHENTICATION_PUBLIC_KEYS
-  value: '[{{ include "OpenMetadata.commaJoinedQuotedList" (dict "value" .Values.openmetadata.config.authentication.publicKeys) }}]'
-- name: AUTHENTICATION_AUTHORITY
-  value: "{{ .Values.openmetadata.config.authentication.authority }}"
-- name: AUTHENTICATION_CLIENT_ID
-  value: "{{ .Values.openmetadata.config.authentication.clientId }}"
-- name: AUTHENTICATION_CALLBACK_URL
-  value: "{{ .Values.openmetadata.config.authentication.callbackUrl }}"
-- name: AUTHENTICATION_JWT_PRINCIPAL_CLAIMS
-  value: '[{{ include "OpenMetadata.commaJoinedQuotedList" (dict "value" .Values.openmetadata.config.authentication.jwtPrincipalClaims) }}]'
-- name: AUTHENTICATION_ENABLE_SELF_SIGNUP
-  value: "{{ .Values.openmetadata.config.authentication.enableSelfSignup }}"
-- name: AUTHORIZER_CLASS_NAME
-  value: "{{ .Values.openmetadata.config.authorizer.className }}"
-- name: AUTHORIZER_REQUEST_FILTER
-  value: "{{ .Values.openmetadata.config.authorizer.containerRequestFilter }}"
-- name: AUTHORIZER_ADMIN_PRINCIPALS
-  value: '[{{ include "OpenMetadata.commaJoinedQuotedList" (dict "value" .Values.openmetadata.config.authorizer.initialAdmins) }}]'
-- name: AUTHORIZER_PRINCIPAL_DOMAIN
-  value: "{{ .Values.openmetadata.config.authorizer.principalDomain }}"
-- name: AUTHORIZER_ENFORCE_PRINCIPAL_DOMAIN
-  value: "{{ .Values.openmetadata.config.authorizer.enforcePrincipalDomain }}"
-- name: AUTHORIZER_ENABLE_SECURE_SOCKET
-  value: "{{ .Values.openmetadata.config.authorizer.enableSecureSocketConnection }}"
-- name: AUTHORIZER_ALLOWED_REGISTRATION_DOMAIN
-  value: '[{{ include "OpenMetadata.commaJoinedQuotedList" (dict "value" .Values.openmetadata.config.authorizer.allowedEmailRegistrationDomains) }}]'
-{{- if .Values.openmetadata.config.jwtTokenConfiguration.enabled }}
-- name: RSA_PUBLIC_KEY_FILE_PATH
-  value: "{{ .Values.openmetadata.config.jwtTokenConfiguration.rsapublicKeyFilePath }}"
-- name: RSA_PRIVATE_KEY_FILE_PATH
-  value: "{{ .Values.openmetadata.config.jwtTokenConfiguration.rsaprivateKeyFilePath }}"
-- name: JWT_ISSUER
-  value: "{{ .Values.openmetadata.config.jwtTokenConfiguration.jwtissuer }}"
-- name: JWT_KEY_ID
-  value: "{{ .Values.openmetadata.config.jwtTokenConfiguration.keyId }}"
 {{- end }}
 {{- if eq .Values.openmetadata.config.authentication.provider "ldap" }}
-- name: AUTHENTICATION_LDAP_HOST
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.host }}"
-- name: AUTHENTICATION_LDAP_PORT
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.port }}"
-- name: AUTHENTICATION_LOOKUP_ADMIN_DN
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.dnAdminPrincipal }}"
 {{- if .Values.openmetadata.config.authentication.ldapConfiguration.dnAdminPassword.secretRef }}
 {{- with .Values.openmetadata.config.authentication.ldapConfiguration.dnAdminPassword }}
 - name: AUTHENTICATION_LOOKUP_ADMIN_PWD
@@ -188,20 +118,7 @@ OpenMetadata Configurations Environment Variables*/}}
       key: {{ .secretKey }}
 {{- end }}
 {{- end }}
-- name: AUTHENTICATION_USER_LOOKUP_BASEDN
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.userBaseDN }}"
-- name: AUTHENTICATION_USER_MAIL_ATTR
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.mailAttributeName }}"
-- name: AUTHENTICATION_LDAP_POOL_SIZE
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.maxPoolSize }}"
-- name: AUTHENTICATION_LDAP_SSL_ENABLED
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.sslEnabled }}"
-- name: AUTHENTICATION_LDAP_TRUSTSTORE_TYPE
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.truststoreConfigType }}"
-{{- if eq .Values.openmetadata.config.authentication.ldapConfiguration.truststoreConfigType "CustomTrustStore" }}
-- name: AUTHENTICATION_LDAP_TRUSTSTORE_PATH
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.customTrustManagerConfig.trustStoreFilePath }}"
-{{- if .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.customTrustManagerConfig.trustStoreFilePassword.secretRef }}
+{{- if and ( eq .Values.openmetadata.config.authentication.ldapConfiguration.truststoreConfigType "CustomTrustStore" ) ( .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.customTrustManagerConfig.trustStoreFilePassword.secretRef ) }}
 {{- with .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.customTrustManagerConfig.trustStoreFilePassword }}
 - name: AUTHENTICATION_LDAP_KEYSTORE_PASSWORD
   valueFrom:
@@ -210,35 +127,8 @@ OpenMetadata Configurations Environment Variables*/}}
       key: {{ .secretKey }}
 {{- end }}
 {{- end }}
-- name: AUTHENTICATION_LDAP_SSL_KEY_FORMAT
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.customTrustManagerConfig.trustStoreFileFormat }}"
-- name: AUTHENTICATION_LDAP_SSL_VERIFY_CERT_HOST
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.customTrustManagerConfig.verifyHostname }}"
-- name: AUTHENTICATION_LDAP_EXAMINE_VALIDITY_DATES
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.customTrustManagerConfig.examineValidityDates }}"
-{{- end }}
-{{- if eq .Values.openmetadata.config.authentication.ldapConfiguration.truststoreConfigType "HostName" }}
-- name: AUTHENTICATION_LDAP_ALLOW_WILDCARDS
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.hostNameConfig.allowWildCards }}"
-- name: AUTHENTICATION_LDAP_ALLOWED_HOSTNAMES
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.hostNameConfig.acceptableHostNames }}"
-{{- end }}
-{{- if eq .Values.openmetadata.config.authentication.ldapConfiguration.truststoreConfigType "JVMDefault" }}
-- name: AUTHENTICATION_LDAP_SSL_VERIFY_CERT_HOST
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.jvmDefaultConfig.verifyHostname }}"
-{{- end }}
-{{- if eq .Values.openmetadata.config.authentication.ldapConfiguration.truststoreConfigType "TrustAll" }}
-- name: AUTHENTICATION_LDAP_EXAMINE_VALIDITY_DATES
-  value: "{{ .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.trustAllConfig.examineValidityDates }}"
-{{- end }}
 {{- end }}
 {{- if eq .Values.openmetadata.config.authentication.provider "saml" }}
-- name: SAML_DEBUG_MODE
-  value: "{{ .Values.openmetadata.config.authentication.saml.debugMode }}"
-- name: SAML_IDP_ENTITY_ID
-  value: "{{ .Values.openmetadata.config.authentication.saml.idp.entityId }}"
-- name: SAML_IDP_SSO_LOGIN_URL          
-  value: "{{ .Values.openmetadata.config.authentication.saml.idp.ssoLoginUrl }}"
 {{- if .Values.openmetadata.config.authentication.saml.idp.idpX509Certificate.secretRef }}
 {{- with .Values.openmetadata.config.authentication.saml.idp.idpX509Certificate }}
 - name: SAML_IDP_CERTIFICATE
@@ -248,14 +138,6 @@ OpenMetadata Configurations Environment Variables*/}}
       key: {{ .secretKey }}
 {{- end }}
 {{- end }}
-- name: SAML_AUTHORITY_URL
-  value: "{{ .Values.openmetadata.config.authentication.saml.idp.authorityUrl }}"
-- name: SAML_IDP_NAME_ID
-  value: "{{ .Values.openmetadata.config.authentication.saml.idp.nameId }}"
-- name: SAML_SP_ENTITY_ID
-  value: "{{ .Values.openmetadata.config.authentication.saml.sp.entityId }}"
-- name: SAML_SP_ACS
-  value: "{{ .Values.openmetadata.config.authentication.saml.sp.acs }}"
 {{- if .Values.openmetadata.config.authentication.saml.sp.spX509Certificate.secretRef }}
 {{- with .Values.openmetadata.config.authentication.saml.sp.spX509Certificate }}
 - name: SAML_SP_CERTIFICATE
@@ -265,30 +147,8 @@ OpenMetadata Configurations Environment Variables*/}}
       key: {{ .secretKey }}
 {{- end }}
 {{- end }}
-- name: SAML_SP_CALLBACK
-  value: "{{ .Values.openmetadata.config.authentication.saml.sp.callback }}"
-- name: SAML_STRICT_MODE
-  value: "{{ .Values.openmetadata.config.authentication.saml.security.strictMode }}"
-- name: SAML_SP_TOKEN_VALIDITY
-  value: "{{ .Values.openmetadata.config.authentication.saml.security.tokenValidity }}"
-- name: SAML_SEND_ENCRYPTED_NAME_ID
-  value: "{{ .Values.openmetadata.config.authentication.saml.security.sendEncryptedNameId }}"
-- name: SAML_SEND_SIGNED_AUTH_REQUEST
-  value: "{{ .Values.openmetadata.config.authentication.saml.security.sendSignedAuthRequest }}"
-- name: SAML_SIGNED_SP_METADATA
-  value: "{{ .Values.openmetadata.config.authentication.saml.security.signSpMetadata }}"
-- name: SAML_WANT_MESSAGE_SIGNED
-  value: "{{ .Values.openmetadata.config.authentication.saml.security.wantMessagesSigned }}"
-- name: SAML_WANT_ASSERTION_SIGNED
-  value: "{{ .Values.openmetadata.config.authentication.saml.security.wantAssertionsSigned }}"
-- name: SAML_WANT_ASSERTION_ENCRYPTED
-  value: "{{ .Values.openmetadata.config.authentication.saml.security.wantAssertionEncrypted }}"
-- name: SAML_WANT_NAME_ID_ENCRYPTED
-  value: "{{ .Values.openmetadata.config.authentication.saml.security.wantNameIdEncrypted }}"
 {{- if or .Values.openmetadata.config.authentication.saml.security.wantAssertionEncrypted .Values.openmetadata.config.authentication.saml.security.wantNameIdEncrypted }}
 # Key Store should only be considered if either wantAssertionEncrypted or wantNameIdEncrypted will be true
-- name: SAML_KEYSTORE_FILE_PATH
-  value: "{{ .Values.openmetadata.config.authentication.saml.security.keyStoreFilePath }}"
 {{- if .Values.openmetadata.config.authentication.saml.security.keyStoreAlias.secretRef }}
 {{- with .Values.openmetadata.config.authentication.saml.security.keyStoreAlias }}
 - name: SAML_KEYSTORE_ALIAS
@@ -309,105 +169,46 @@ OpenMetadata Configurations Environment Variables*/}}
 {{- end }}
 {{- end }}
 {{- end }}
-- name: ELASTICSEARCH_HOST
-  value: "{{ .Values.openmetadata.config.elasticsearch.host }}"
-- name: SEARCH_TYPE
-  value: "{{ .Values.openmetadata.config.elasticsearch.searchType }}"
-- name: ELASTICSEARCH_PORT
-  value: "{{ .Values.openmetadata.config.elasticsearch.port }}"
-- name: ELASTICSEARCH_SCHEME
-  value: "{{ .Values.openmetadata.config.elasticsearch.scheme }}"
-- name: ELASTICSEARCH_INDEX_MAPPING_LANG
-  value: "{{ .Values.openmetadata.config.elasticsearch.searchIndexMappingLanguage }}"
-- name: ELASTICSEARCH_KEEP_ALIVE_TIMEOUT_SECS
-  value: "{{ .Values.openmetadata.config.elasticsearch.keepAliveTimeoutSecs }}"
-{{- if .Values.openmetadata.config.elasticsearch.auth.enabled -}}
-{{- with .Values.openmetadata.config.elasticsearch.auth }}
-- name: ELASTICSEARCH_USER
-  value: "{{ .username }}"
-{{- if .password.secretRef }}
+{{- if and ( .Values.openmetadata.config.elasticsearch.auth.enabled ) ( .Values.openmetadata.config.elasticsearch.auth.password.secretRef ) }}
+{{- with .Values.openmetadata.config.elasticsearch.auth.password }}
 - name: ELASTICSEARCH_PASSWORD
   valueFrom:
     secretKeyRef:
-      name: {{ .password.secretRef }}
-      key: {{ .password.secretKey }}
-{{- end }}
+      name: {{ .secretRef }}
+      key: {{ .secretKey }}
 {{- end }}
 {{- end }}
-{{- if .Values.openmetadata.config.elasticsearch.trustStore.enabled }}
-- name: ELASTICSEARCH_TRUST_STORE_PATH
-  value: {{.Values.openmetadata.config.elasticsearch.trustStore.path }}
-{{- if .Values.openmetadata.config.elasticsearch.trustStore.password.secretRef }}
-{{- with .Values.openmetadata.config.elasticsearch.trustStore }}
+{{- if and ( .Values.openmetadata.config.elasticsearch.trustStore.enabled ) ( .Values.openmetadata.config.elasticsearch.trustStore.password.secretRef ) }}
+{{- with .Values.openmetadata.config.elasticsearch.trustStore.password }}
 - name: ELASTICSEARCH_TRUST_STORE_PASSWORD
   valueFrom:
     secretKeyRef:
-      name: {{ .password.secretRef }}
-      key: {{ .password.secretKey }}
-{{- end }}
+      name: {{ .secretRef }}
+      key: {{ .secretKey }}
 {{- end }}
 {{- end }}
-- name: DB_HOST
-  value: "{{ tpl .Values.openmetadata.config.database.host . }}"
-- name: DB_PORT
-  value: "{{ .Values.openmetadata.config.database.port }}"
-{{- with .Values.openmetadata.config.database.auth }}
-- name: DB_USER
-  value: "{{ .username }}"
-{{- if .password.secretRef }}
+{{- if .Values.openmetadata.config.database.auth.password.secretRef }}
+{{- with .Values.openmetadata.config.database.auth.password }}
 - name: DB_USER_PASSWORD
   valueFrom:
     secretKeyRef:
-      name: {{ .password.secretRef }}
-      key: {{ .password.secretKey }}
-{{- end }}
-{{- end }}
-- name: OM_DATABASE
-  value: "{{ .Values.openmetadata.config.database.databaseName }}"
-- name: DB_DRIVER_CLASS
-  value: "{{ .Values.openmetadata.config.database.driverClass }}"
-- name: DB_SCHEME
-  value: "{{ .Values.openmetadata.config.database.dbScheme }}"
-- name: DB_PARAMS
-  value: "{{ .Values.openmetadata.config.database.dbParams }}"
-{{- if .Values.openmetadata.config.pipelineServiceClientConfig.enabled }}
-- name: PIPELINE_SERVICE_CLIENT_ENABLED
-  value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.enabled }}"
-- name: PIPELINE_SERVICE_CLIENT_CLASS_NAME
-  value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.className }}"
-- name: PIPELINE_SERVICE_IP_INFO_ENABLED
-  value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.ingestionIpInfoEnabled }}"
-- name: PIPELINE_SERVICE_CLIENT_ENDPOINT
-   value: "{{ tpl .Values.openmetadata.config.pipelineServiceClientConfig.apiEndpoint . }}"
-{{ if .Values.openmetadata.config.pipelineServiceClientConfig.auth.enabled }}
-{{- with .Values.openmetadata.config.pipelineServiceClientConfig.auth }}
-- name: AIRFLOW_USERNAME
-  value: "{{ .username }}"
-{{- if .password.secretRef }}
+      name: {{ .secretRef }}
+      key: {{ .secretKey }}
+{{- end }}
+{{- end }}
+{{- if and ( .Values.openmetadata.config.pipelineServiceClientConfig.enabled ) ( .Values.openmetadata.config.pipelineServiceClientConfig.auth.enabled )}}
+{{- if .Values.openmetadata.config.pipelineServiceClientConfig.auth.password.secretRef }}
+{{- with .Values.openmetadata.config.pipelineServiceClientConfig.auth.password }}
 - name: AIRFLOW_PASSWORD
   valueFrom:
     secretKeyRef:
-      name: {{ .password.secretRef }}
-      key: {{ .password.secretKey }}
-{{- end }}
-{{- end }}
-- name: PIPELINE_SERVICE_CLIENT_VERIFY_SSL
-  value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.verifySsl }}"
-- name: PIPELINE_SERVICE_CLIENT_HOST_IP
-  value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.hostIp }}"
-- name: PIPELINE_SERVICE_CLIENT_HEALTH_CHECK_INTERVAL
-  value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.healthCheckInterval }}"
-- name: PIPELINE_SERVICE_CLIENT_SSL_CERT_PATH
-  value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.sslCertificatePath }}"
-- name: SERVER_HOST_API_URL
-  value: "{{ tpl .Values.openmetadata.config.pipelineServiceClientConfig.metadataApiEndpoint . }}"
-{{- end }}
-- name: SECRET_MANAGER
-  value: "{{ .Values.openmetadata.config.secretsManager.provider }}"
+      name: {{ .secretRef }}
+      key: {{ .secretKey }}
+{{- end }}
+{{- end }}
+{{- end }}
 {{- if .Values.openmetadata.config.secretsManager.additionalParameters.enabled }}
-- name: OM_SM_REGION
-  value: "{{ .Values.openmetadata.config.secretsManager.additionalParameters.region }}"
-{{- if .Values.openmetadata.config.secretsManager.additionalParameters.accessKeyId.secretRef -}}
+{{- if .Values.openmetadata.config.secretsManager.additionalParameters.accessKeyId.secretRef }}
 {{- with .Values.openmetadata.config.secretsManager.additionalParameters.accessKeyId }}
 - name: OM_SM_ACCESS_KEY_ID
   valueFrom:
@@ -426,22 +227,7 @@ OpenMetadata Configurations Environment Variables*/}}
 {{- end }}
 {{- end }}
 {{- end }}
-{{- if .Values.openmetadata.config.smtpConfig.enableSmtpServer }}
-- name: OM_EMAIL_ENTITY
-  value: "{{ .Values.openmetadata.config.smtpConfig.emailingEntity }}"
-- name: OM_SUPPORT_URL
-  value: "{{ .Values.openmetadata.config.smtpConfig.supportUrl }}"
-- name: AUTHORIZER_ENABLE_SMTP
-  value: "{{ .Values.openmetadata.config.smtpConfig.enableSmtpServer }}"
-- name: OPENMETADATA_SERVER_URL
-  value: "{{ .Values.openmetadata.config.smtpConfig.openMetadataUrl }}"
-- name: SMTP_SERVER_ENDPOINT
-  value: "{{ .Values.openmetadata.config.smtpConfig.serverEndpoint }}"
-- name: SMTP_SERVER_PORT
-  value: "{{ .Values.openmetadata.config.smtpConfig.serverPort }}"
-- name: SMTP_SERVER_USERNAME
-  value: "{{ .Values.openmetadata.config.smtpConfig.username }}"
-{{- if .Values.openmetadata.config.smtpConfig.password.secretRef }}
+{{- if and ( .Values.openmetadata.config.smtpConfig.enableSmtpServer ) ( .Values.openmetadata.config.smtpConfig.password.secretRef )}}
 {{- with .Values.openmetadata.config.smtpConfig.password }}
 - name: SMTP_SERVER_PWD
   valueFrom:
@@ -450,48 +236,5 @@ OpenMetadata Configurations Environment Variables*/}}
       key: {{ .secretKey }}
 {{- end }}
 {{- end }}
-- name: SMTP_SERVER_STRATEGY
-  value: "{{ .Values.openmetadata.config.smtpConfig.transportationStrategy }}"
-- name: OPENMETADATA_SMTP_SENDER_MAIL
-  value: "{{ .Values.openmetadata.config.smtpConfig.senderMail }}"
-{{- end }}
-- name: WEB_CONF_URI_PATH
-  value: "{{ .Values.openmetadata.config.web.uriPath }}"
-- name: WEB_CONF_HSTS_ENABLED
-  value: "{{ .Values.openmetadata.config.web.hsts.enabled }}"
-- name: WEB_CONF_HSTS_MAX_AGE
-  value: "{{ .Values.openmetadata.config.web.hsts.maxAge }}"
-- name: WEB_CONF_HSTS_INCLUDE_SUBDOMAINS
-  value: "{{ .Values.openmetadata.config.web.hsts.includeSubDomains }}"
-- name: WEB_CONF_HSTS_PRELOAD
-  value: "{{ .Values.openmetadata.config.web.hsts.preload }}"
-- name: WEB_CONF_FRAME_OPTION_ENABLED
-  value: "{{ .Values.openmetadata.config.web.frameOptions.enabled }}"
-- name: WEB_CONF_FRAME_OPTION
-  value: "{{ .Values.openmetadata.config.web.frameOptions.option }}"
-- name: WEB_CONF_FRAME_ORIGIN
-  value: "{{ .Values.openmetadata.config.web.frameOptions.origin }}"
-- name: WEB_CONF_CONTENT_TYPE_OPTIONS_ENABLED
-  value: "{{ .Values.openmetadata.config.web.contentTypeOptions.enabled }}"
-- name: WEB_CONF_XSS_PROTECTION_ENABLED
-  value: "{{ .Values.openmetadata.config.web.xssProtection.enabled }}"
-- name: WEB_CONF_XSS_PROTECTION_ON
-  value: "{{ .Values.openmetadata.config.web.xssProtection.onXss }}"
-- name: WEB_CONF_XSS_PROTECTION_BLOCK
-  value: "{{ .Values.openmetadata.config.web.xssProtection.block }}"
-- name: WEB_CONF_XSS_CSP_ENABLED
-  value: "{{ .Values.openmetadata.config.web.csp.enabled }}"
-- name: WEB_CONF_XSS_CSP_POLICY
-  value: "{{ .Values.openmetadata.config.web.csp.policy }}"
-- name: WEB_CONF_XSS_CSP_REPORT_ONLY_POLICY
-  value: "{{ .Values.openmetadata.config.web.csp.reportOnlyPolicy }}"
-- name: WEB_CONF_REFERRER_POLICY_ENABLED
-  value: "{{ .Values.openmetadata.config.web.referrerPolicy.enabled }}"
-- name: WEB_CONF_REFERRER_POLICY_OPTION
-  value: "{{ .Values.openmetadata.config.web.referrerPolicy.option }}"
-- name: WEB_CONF_PERMISSION_POLICY_ENABLED
-  value: "{{ .Values.openmetadata.config.web.permissionPolicy.enabled }}"
-- name: WEB_CONF_PERMISSION_POLICY_OPTION
-  value: "{{ .Values.openmetadata.config.web.permissionPolicy.option }}"
 
-{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/openmetadata/templates/deployment.yaml b/charts/openmetadata/templates/deployment.yaml
index 20379e30..a221b5af 100644
--- a/charts/openmetadata/templates/deployment.yaml
+++ b/charts/openmetadata/templates/deployment.yaml
@@ -36,10 +36,60 @@ spec:
           {{- with .Values.extraVolumeMounts }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
-        {{- with .Values.envFrom }}
         envFrom:
-            {{- toYaml . | nindent 10 }}
+          - 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
+          {{- 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
+          {{- end }}
+          {{- if .Values.openmetadata.config.pipelineServiceClientConfig.enabled }}
+          - secretRef:
+              name: {{ include "OpenMetadata.fullname" . }}-pipeline-secret
           {{- end }}
+          {{- if .Values.openmetadata.config.smtpConfig.enableSmtpServer }}
+          - secretRef:
+              name: {{ include "OpenMetadata.fullname" . }}-smtp-secret
+          {{- end }}
+          {{- if .Values.openmetadata.config.jwtTokenConfiguration.enabled }}
+          - secretRef:
+              name: {{ include "OpenMetadata.fullname" . }}-jwt-secret
+          {{- end }}
+          {{- with .Values.openmetadata.config.fernetkey }}
+          {{- if not .secretRef }}
+          - secretRef:
+              name: {{ include "OpenMetadata.fullname" $ }}-fernetkey-secret
+          {{- end }}
+          {{- end }}
+        {{- with .Values.envFrom }}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         env:
         - name: MIGRATION_LIMIT_PARAM
           value: "{{ .Values.openmetadata.config.upgradeMigrationConfigs.migrationLimitParam }}"
@@ -80,8 +130,58 @@ spec:
           {{- with .Values.extraEnvs }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
-          {{- with .Values.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
+            {{- 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
+            {{- end }}
+            {{- if .Values.openmetadata.config.pipelineServiceClientConfig.enabled }}
+            - secretRef:
+                name: {{ include "OpenMetadata.fullname" . }}-pipeline-secret
+            {{- end }}
+            {{- if .Values.openmetadata.config.smtpConfig.enableSmtpServer }}
+            - secretRef:
+                name: {{ include "OpenMetadata.fullname" . }}-smtp-secret
+            {{- end }}
+            {{- if .Values.openmetadata.config.jwtTokenConfiguration.enabled }}
+            - secretRef:
+                name: {{ include "OpenMetadata.fullname" . }}-jwt-secret
+            {{- end }}
+            {{- with .Values.openmetadata.config.fernetkey }}
+            {{- if not .secretRef }}
+            - secretRef:
+                name: {{ include "OpenMetadata.fullname" $ }}-fernetkey-secret
+            {{- end }}
+            {{- end }}
+          {{- with .Values.envFrom }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
           resources:
diff --git a/charts/openmetadata/templates/secrets.yaml b/charts/openmetadata/templates/secrets.yaml
index 973baa96..caba69a0 100644
--- a/charts/openmetadata/templates/secrets.yaml
+++ b/charts/openmetadata/templates/secrets.yaml
@@ -4,8 +4,290 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "OpenMetadata.fullname" . }}-secret
+  name: {{ include "OpenMetadata.fullname" . }}-fernetkey-secret
 type: Opaque
 data:
-  FERNET_KEY: {{ .Values.openmetadata.config.fernetkey.value | b64enc | quote }}
+{{- with .Values.openmetadata.config.fernetkey }}
+  FERNET_KEY: {{ .value | b64enc | quote }}
 {{ end }}
+{{ end }}
+
+{{- if .Values.openmetadata.config.database.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-db-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config.database }}
+  DB_HOST: {{ .host | b64enc }}
+  DB_PORT: {{ .port | toString | b64enc }}
+  DB_DRIVER_CLASS: {{ .driverClass | b64enc }}
+  DB_SCHEME: {{ .dbScheme | b64enc }}
+  OM_DATABASE: {{ .databaseName | b64enc }}
+  DB_PARAMS: {{ .dbParams | b64enc | quote }}
+  DB_USER: {{ .auth.username | b64enc }}
+{{ end }}
+{{ end }}
+
+{{- if .Values.openmetadata.config.elasticsearch.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-search-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config.elasticsearch }}
+  ELASTICSEARCH_HOST: {{ .host | quote | b64enc }}
+  SEARCH_TYPE: {{ .searchType | quote | b64enc }}
+  ELASTICSEARCH_PORT: {{ .port | quote | b64enc }}
+  ELASTICSEARCH_SCHEME: {{ .scheme | quote | b64enc }}
+  ELASTICSEARCH_INDEX_MAPPING_LANG: {{ .searchIndexMappingLanguage | quote| b64enc }}
+  ELASTICSEARCH_KEEP_ALIVE_TIMEOUT_SECS: {{ .keepAliveTimeoutSecs | quote | b64enc }}
+  {{- if .trustStore.enabled }}
+  ELASTICSEARCH_TRUST_STORE_PATH: {{ .trustStore.path | b64enc }}
+  {{ end }}
+  {{- if .auth.enabled }}
+  ELASTICSEARCH_USER: {{ .auth.username | quote | b64enc }}
+  {{ end }}
+{{ end }}
+{{ end }}
+
+{{- if .Values.openmetadata.config.pipelineServiceClientConfig.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-pipeline-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config.pipelineServiceClientConfig }}
+  PIPELINE_SERVICE_CLIENT_ENABLED: {{ .enabled | quote | b64enc }}
+  PIPELINE_SERVICE_CLIENT_CLASS_NAME: {{ .className | quote | b64enc }}
+  PIPELINE_SERVICE_IP_INFO_ENABLED: {{ .ingestionIpInfoEnabled | quote | b64enc }}
+  PIPELINE_SERVICE_CLIENT_ENDPOINT: {{ .apiEndpoint | b64enc }}
+  PIPELINE_SERVICE_CLIENT_VERIFY_SSL: {{ .verifySsl | quote | b64enc }}
+  PIPELINE_SERVICE_CLIENT_HOST_IP: {{ .hostIp | b64enc }}
+  PIPELINE_SERVICE_CLIENT_HEALTH_CHECK_INTERVAL: {{ .healthCheckInterval | quote | b64enc }}
+  PIPELINE_SERVICE_CLIENT_SSL_CERT_PATH: {{ .sslCertificatePath | quote | b64enc }}
+  SERVER_HOST_API_URL: {{ .metadataApiEndpoint | b64enc }}
+  {{- if .auth.enabled }}
+  AIRFLOW_USERNAME: {{ .auth.username | b64enc }}
+  {{- end }}
+{{ end }}
+{{ end }}
+
+{{- if .Values.openmetadata.config.authorizer.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-authorizer-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config.authorizer }}
+  AUTHORIZER_CLASS_NAME: {{ .className | quote | b64enc }}
+  AUTHORIZER_REQUEST_FILTER: {{ .containerRequestFilter | quote | b64enc }}
+  AUTHORIZER_PRINCIPAL_DOMAIN: {{ .principalDomain | quote | b64enc }}
+  AUTHORIZER_ENFORCE_PRINCIPAL_DOMAIN: {{ .enforcePrincipalDomain | quote | b64enc }}
+  AUTHORIZER_ENABLE_SECURE_SOCKET: {{ .enableSecureSocketConnection | quote | b64enc }}
+{{ end }}
+  AUTHORIZER_ADMIN_PRINCIPALS: {{ include "OpenMetadata.commaJoinedQuotedEncodedList" (dict "value" .Values.openmetadata.config.authorizer.initialAdmins ) }}
+  AUTHORIZER_ALLOWED_REGISTRATION_DOMAIN: {{ include "OpenMetadata.commaJoinedQuotedEncodedList" (dict "value" .Values.openmetadata.config.authorizer.allowedEmailRegistrationDomains) }}
+{{ end }}
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-omd-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config.openmetadata }}
+  SERVER_HOST: {{ .host | b64enc }}
+  OM_URI: {{ .uri | quote | b64enc }}
+  SERVER_PORT: {{ .port | quote | b64enc }}
+  SERVER_ADMIN_PORT: {{ .adminPort | quote | b64enc }}
+{{ end }}
+
+{{- if .Values.openmetadata.config.smtpConfig.enableSmtpServer }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-smtp-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config.smtpConfig }}
+  AUTHORIZER_ENABLE_SMTP: {{ .enableSmtpServer | quote | b64enc }}
+  OM_EMAIL_ENTITY: {{ .emailingEntity | quote | b64enc }}
+  OM_SUPPORT_URL: {{ .supportUrl | quote | b64enc }}
+  SMTP_SERVER_STRATEGY: {{ .transportationStrategy | quote | b64enc }}
+  OPENMETADATA_SERVER_URL: {{ .openMetadataUrl | quote | b64enc }}
+  SMTP_SERVER_ENDPOINT: {{ .serverEndpoint | quote | b64enc }}
+  SMTP_SERVER_PORT: {{ .serverPort | quote | b64enc }}
+  OPENMETADATA_SMTP_SENDER_MAIL: {{ .senderMail | quote | b64enc }}
+  SMTP_SERVER_USERNAME: {{ .username | quote | b64enc }}
+{{ end }}
+{{ end }}
+
+{{- if .Values.openmetadata.config.secretsManager.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-secretsmanager-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config.secretsManager }}
+  SECRET_MANAGER: {{ .provider | b64enc }}
+  {{- if .additionalParameters.enabled }}
+  OM_SM_REGION: {{ .additionalParameters.region | quote | b64enc }}
+  {{ end }}
+{{ end }}
+{{ end }}
+
+{{- if .Values.openmetadata.config.jwtTokenConfiguration.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-jwt-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config.jwtTokenConfiguration }}
+  RSA_PUBLIC_KEY_FILE_PATH: {{ .rsapublicKeyFilePath | quote | b64enc }}
+  RSA_PRIVATE_KEY_FILE_PATH: {{ .rsaprivateKeyFilePath | quote | b64enc }}
+  JWT_ISSUER: {{ .jwtissuer | quote | b64enc }}
+  JWT_KEY_ID: {{ .keyId | quote | b64enc }}
+{{ end }}
+{{ end }}
+
+{{- if .Values.openmetadata.config.web.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-web-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config.web }}
+  WEB_CONF_URI_PATH: {{ .uriPath | quote | b64enc }}
+  WEB_CONF_HSTS_ENABLED: {{ .hsts.enabled | quote | b64enc }}
+  WEB_CONF_HSTS_MAX_AGE: {{ .hsts.maxAge | quote | b64enc }}
+  WEB_CONF_HSTS_INCLUDE_SUBDOMAINS: {{ .hsts.includeSubDomains | quote | b64enc }}
+  WEB_CONF_HSTS_PRELOAD: {{ .hsts.preload | quote | b64enc }}
+  WEB_CONF_FRAME_OPTION_ENABLED: {{ .frameOptions.enabled | quote | b64enc }}
+  WEB_CONF_FRAME_OPTION: {{ .frameOptions.option | quote | b64enc }}
+  WEB_CONF_FRAME_ORIGIN: {{ .frameOptions.origin | quote | b64enc }}
+  WEB_CONF_CONTENT_TYPE_OPTIONS_ENABLED: {{ .contentTypeOptions.enabled | quote | b64enc }}
+  WEB_CONF_XSS_PROTECTION_ENABLED: {{ .xssProtection.enabled | quote | b64enc }}
+  WEB_CONF_XSS_PROTECTION_ON: {{ .xssProtection.onXss | quote | b64enc }}
+  WEB_CONF_XSS_PROTECTION_BLOCK: {{ .xssProtection.block | quote | b64enc }}
+  WEB_CONF_XSS_CSP_ENABLED: {{ .csp.enabled | quote | b64enc }}
+  WEB_CONF_XSS_CSP_POLICY: {{ .csp.policy | quote | b64enc }}
+  WEB_CONF_XSS_CSP_REPORT_ONLY_POLICY: {{ .csp.reportOnlyPolicy | quote | b64enc }}
+  WEB_CONF_REFERRER_POLICY_ENABLED: {{ .referrerPolicy.enabled | quote | b64enc }}
+  WEB_CONF_REFERRER_POLICY_OPTION: {{ .referrerPolicy.option | quote | b64enc }}
+  WEB_CONF_PERMISSION_POLICY_ENABLED: {{ .permissionPolicy.enabled | quote | b64enc }}
+  WEB_CONF_PERMISSION_POLICY_OPTION: {{ .permissionPolicy.option | quote | b64enc }}
+{{ end }}
+{{ end }}
+
+{{- if .Values.openmetadata.config.authentication.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-authentication-secret
+type: Opaque
+data:
+  AUTHENTICATION_PUBLIC_KEYS: {{ include "OpenMetadata.commaJoinedQuotedEncodedList" (dict "value" .Values.openmetadata.config.authentication.publicKeys) }}
+  AUTHENTICATION_JWT_PRINCIPAL_CLAIMS: {{ include "OpenMetadata.commaJoinedQuotedEncodedList" (dict "value" .Values.openmetadata.config.authentication.jwtPrincipalClaims) }}
+{{- with .Values.openmetadata.config.authentication }}
+  AUTHENTICATION_PROVIDER: {{ .provider | quote | b64enc }}
+  AUTHENTICATION_AUTHORITY: {{ .authority | quote | b64enc }}
+  AUTHENTICATION_CLIENT_ID: {{ .clientId | quote | b64enc }}
+  AUTHENTICATION_CALLBACK_URL: {{ .callbackUrl | quote | b64enc }}
+  AUTHENTICATION_ENABLE_SELF_SIGNUP: {{ .enableSelfSignup | quote | b64enc }}
+{{- if eq .provider "ldap" }}
+  AUTHENTICATION_LDAP_HOST: {{ .ldapConfiguration.host | b64enc }}
+  AUTHENTICATION_LDAP_PORT: {{ .ldapConfiguration.port | quote | b64enc }}
+  AUTHENTICATION_LOOKUP_ADMIN_DN: {{ .ldapConfiguration.dnAdminPrincipal | quote | b64enc }}
+  AUTHENTICATION_USER_LOOKUP_BASEDN: {{ .ldapConfiguration.userBaseDN | quote | b64enc }}
+  AUTHENTICATION_USER_MAIL_ATTR: {{ .ldapConfiguration.mailAttributeName | quote | b64enc }}
+  AUTHENTICATION_LDAP_POOL_SIZE: {{ .ldapConfiguration.maxPoolSize | quote | b64enc }}
+  AUTHENTICATION_LDAP_SSL_ENABLED: {{ .ldapConfiguration.sslEnabled | quote | b64enc }}
+  AUTHENTICATION_LDAP_TRUSTSTORE_TYPE: {{ .ldapConfiguration.truststoreConfigType | quote | b64enc }}
+  {{- if eq .ldapConfiguration.truststoreConfigType "CustomTrustStore" }}
+  AUTHENTICATION_LDAP_TRUSTSTORE_PATH: {{ .ldapConfiguration.trustStoreConfig.customTrustManagerConfig.trustStoreFilePath | quote | b64enc }}
+  AUTHENTICATION_LDAP_SSL_KEY_FORMAT: {{ .ldapConfiguration.trustStoreConfig.customTrustManagerConfig.trustStoreFileFormat | quote | b64enc }}
+  AUTHENTICATION_LDAP_SSL_VERIFY_CERT_HOST: {{ .ldapConfiguration.trustStoreConfig.customTrustManagerConfig.verifyHostname | quote | b64enc }}
+  AUTHENTICATION_LDAP_EXAMINE_VALIDITY_DATES: {{ .ldapConfiguration.trustStoreConfig.customTrustManagerConfig.examineValidityDates | quote | b64enc }}
+  {{ end }}
+  {{- if eq .ldapConfiguration.truststoreConfigType "HostName" }}
+  AUTHENTICATION_LDAP_ALLOW_WILDCARDS: {{ .ldapConfiguration.trustStoreConfig.hostNameConfig.allowWildCards | quote | b64enc }}
+  AUTHENTICATION_LDAP_ALLOWED_HOSTNAMES: {{ .Values.openmetadata.config.authentication.ldapConfiguration.trustStoreConfig.hostNameConfig.acceptableHostNames | b64enc}}
+  {{ end }}
+  {{- if eq .ldapConfiguration.truststoreConfigType "JVMDefault" }}
+  AUTHENTICATION_LDAP_SSL_VERIFY_CERT_HOST: {{ .ldapConfiguration.trustStoreConfig.jvmDefaultConfig.verifyHostname | quote | b64enc }}
+  {{ end }}
+  {{- if eq .ldapConfiguration.truststoreConfigType "TrustAll" }}
+  AUTHENTICATION_LDAP_EXAMINE_VALIDITY_DATES: {{ .ldapConfiguration.trustStoreConfig.trustAllConfig.examineValidityDates | quote | b64enc }}
+  {{ end }}
+{{ end }}
+{{- if eq .provider "saml" }}
+  SAML_DEBUG_MODE: {{ .saml.debugMode | quote | b64enc }}
+  SAML_IDP_ENTITY_ID: {{ .saml.idp.entityId | quote | b64enc }}
+  SAML_IDP_SSO_LOGIN_URL: {{ .saml.idp.ssoLoginUrl | quote | b64enc }}
+  SAML_AUTHORITY_URL: {{ .saml.idp.authorityUrl | quote | b64enc }}
+  SAML_IDP_NAME_ID: {{ .saml.idp.nameId | quote | b64enc }}
+  SAML_SP_ENTITY_ID: {{ .saml.sp.entityId | quote | b64enc }}
+  SAML_SP_ACS: {{ .saml.sp.acs | quote | b64enc }}
+  SAML_SP_CALLBACK: {{ .saml.sp.callback | quote | b64enc }}
+  SAML_STRICT_MODE: {{ .saml.security.strictMode | quote | b64enc }}
+  SAML_SP_TOKEN_VALIDITY: {{ .saml.security.tokenValidity | quote | b64enc }}
+  SAML_SEND_ENCRYPTED_NAME_ID: {{ .saml.security.sendEncryptedNameId | quote | b64enc }}
+  SAML_SEND_SIGNED_AUTH_REQUEST: {{ .saml.security.sendSignedAuthRequest | quote | b64enc }}
+  SAML_SIGNED_SP_METADATA: {{ .saml.security.signSpMetadata | quote | b64enc }}
+  SAML_WANT_MESSAGE_SIGNED: {{ .saml.security.wantMessagesSigned | quote | b64enc }}
+  SAML_WANT_ASSERTION_SIGNED: {{ .saml.security.wantAssertionsSigned | quote | b64enc }}
+  SAML_WANT_ASSERTION_ENCRYPTED: {{ .saml.security.wantAssertionEncrypted | quote | b64enc }}
+  SAML_WANT_NAME_ID_ENCRYPTED: {{ .saml.security.wantNameIdEncrypted | quote | b64enc }}
+  # Key Store should only be considered if either wantAssertionEncrypted or wantNameIdEncrypted will be true
+  {{- if or .saml.security.wantAssertionEncrypted .saml.security.wantNameIdEncrypted }}
+  SAML_KEYSTORE_FILE_PATH: {{ .saml.security.keyStoreFilePath | quote | b64enc }}
+  {{ end }}
+{{ end }}
+{{ end }}
+{{ end }}
+
+{{- if .Values.openmetadata.config.eventMonitor.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-eventmonitor-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config.eventMonitor }}
+  EVENT_MONITOR: {{ .type | b64enc }}
+  EVENT_MONITOR_BATCH_SIZE: {{ .batchSize | quote | b64enc }}
+{{ end }}
+  EVENT_MONITOR_PATH_PATTERN: {{ include "OpenMetadata.commaJoinedQuotedEncodedList" (dict "value" .Values.openmetadata.config.eventMonitor.pathPattern) }}
+  EVENT_MONITOR_LATENCY: {{ include "OpenMetadata.commaJoinedQuotedEncodedList" (dict "value" .Values.openmetadata.config.eventMonitor.latency) }}
+{{ end }}
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "OpenMetadata.fullname" . }}-config-secret
+type: Opaque
+data:
+{{- with .Values.openmetadata.config }}
+  LOG_LEVEL: {{ .logLevel | b64enc }}
+  OPENMETADATA_CLUSTER_NAME: {{ .clusterName | b64enc }}
+{{ end }}
\ No newline at end of file
diff --git a/charts/openmetadata/values.schema.json b/charts/openmetadata/values.schema.json
index 3169a681..92f80ed9 100644
--- a/charts/openmetadata/values.schema.json
+++ b/charts/openmetadata/values.schema.json
@@ -46,6 +46,9 @@
                                 "uriPath": {
                                     "type": "string"
                                 },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
                                 "hsts": {
                                     "type": "object",
                                     "additionalProperties": false,
@@ -204,9 +207,6 @@
                                 "metadataApiEndpoint": {
                                     "type": "string"
                                 },
-                                "maskPasswordsApi": {
-                                    "type": "boolean"
-                                },
                                 "sslCertificatePath": {
                                     "type": "string"
                                 },
@@ -240,6 +240,9 @@
                                         "type": "string"
                                     }
                                 },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
                                 "provider": {
                                     "type": "string",
                                     "enum": [
@@ -520,6 +523,9 @@
                                         "org.openmetadata.service.security.DefaultAuthorizer"
                                     ]
                                 },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
                                 "containerRequestFilter": {
                                     "type": "string",
                                     "enum": [
@@ -574,6 +580,9 @@
                                 "databaseName": {
                                     "type": "string"
                                 },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
                                 "dbScheme": {
                                     "type": "string"
                                 },
@@ -645,6 +654,9 @@
                                         "opensearch"
                                     ]
                                 },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
                                 "socketTimeoutSecs": {
                                     "type": "integer"
                                 },
@@ -688,6 +700,9 @@
                                         "cloudwatch"
                                     ]
                                 },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
                                 "batchSize": {
                                     "type": "integer"
                                 },
@@ -807,6 +822,9 @@
                                         "managed-aws-ssm",
                                         "in-memory"
                                     ]
+                                },
+                                "enabled": {
+                                    "type": "boolean"
                                 }
                             }
                         },
@@ -854,9 +872,6 @@
                                     "type": "string"
                                 }
                             }
-                        },
-                        "maskPasswordsApi": {
-                            "type": "boolean"
                         }
                     }
                 }
diff --git a/charts/openmetadata/values.yaml b/charts/openmetadata/values.yaml
index 3e8b6d53..0eb384cb 100644
--- a/charts/openmetadata/values.yaml
+++ b/charts/openmetadata/values.yaml
@@ -13,7 +13,6 @@ openmetadata:
     # Values can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL
     logLevel: INFO
     clusterName: openmetadata
-    maskPasswordsApi: false
     openmetadata:
       host: openmetadata
       # URI to use with OpenMetadata Alerts Integrations
@@ -21,6 +20,7 @@ openmetadata:
       port: 8585
       adminPort: 8586
     elasticsearch:
+      enabled: true
       host: opensearch
       searchType: opensearch
       port: 9200
@@ -43,6 +43,7 @@ openmetadata:
           secretRef: elasticsearch-secrets
           secretKey: openmetadata-elasticsearch-password
     database:
+      enabled: true
       host: mysql
       port: 3306
       driverClass: com.mysql.cj.jdbc.Driver
@@ -76,6 +77,7 @@ openmetadata:
           secretRef: airflow-secrets
           secretKey: openmetadata-airflow-password
     authorizer:
+      enabled: true
       className: "org.openmetadata.service.security.DefaultAuthorizer"
       containerRequestFilter: "org.openmetadata.service.security.JwtFilter"
       initialAdmins:
@@ -86,6 +88,7 @@ openmetadata:
       enforcePrincipalDomain: false
       enableSecureSocketConnection: false
     authentication:
+      enabled: true
       provider: "basic"
       publicKeys:
       - "http://openmetadata:8585/api/v1/system/config/jwks"
@@ -174,6 +177,7 @@ openmetadata:
       secretRef: ""
       secretKey: ""
     eventMonitor:
+      enabled: true
       # Possible values are prometheus and cloudwatch
       type: prometheus
       batchSize: 10
@@ -199,6 +203,7 @@ openmetadata:
         secretRef: ""
         secretKey: ""
     secretsManager:
+      enabled: true
       # Possible values are noop, aws, aws-ssm, managed-aws, managed-aws-ssm, in-memory
       provider: noop
       additionalParameters:
@@ -215,6 +220,7 @@ openmetadata:
       # --from-literal=aws-access-key-secret=<access_key_id_value> \
       # --from-literal=aws-secret-access-key-secret=<access_key_secret_value>
     web:
+      enabled: true
       uriPath: "/api"
       hsts:
         enabled: false