diff --git a/charts/siglensent/Chart.yaml b/charts/siglensent/Chart.yaml
index aa406f6..59ecaf0 100644
--- a/charts/siglensent/Chart.yaml
+++ b/charts/siglensent/Chart.yaml
@@ -7,13 +7,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.19
+version: 0.1.20
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.32-ent1"
+appVersion: "1.0.50-ent1"
 
 maintainers:
   - name: SigLens
diff --git a/charts/siglensent/templates/raft-configmap.yaml b/charts/siglensent/templates/raft-configmap.yaml
index e7fbfcc..66eb027 100644
--- a/charts/siglensent/templates/raft-configmap.yaml
+++ b/charts/siglensent/templates/raft-configmap.yaml
@@ -5,19 +5,7 @@ metadata:
   namespace: {{ .Values.global.namespace }}
 data:
   server.yaml: |-
-    tls:
-      enabled: {{ .Values.config.tls.enabled }}
-      certificatePath: {{ .Values.config.tls.certificatePath }}
-      privateKeyPath: {{ .Values.config.tls.privateKeyPath }}
-    ingestPort: {{ .Values.config.ingestPort }}
-    queryPort: {{ .Values.config.queryPort }}
-    dataPath: {{ .Values.config.dataPath }}
-    timestampKey: {{ .Values.config.timestampKey }}
-    licenseKeyPath: {{ .Values.config.licenseKeyPath }} 
-    ssInstanceName: {{ .Values.config.raft.ssInstanceName }}
-    rbac:
-      provider: sqlite
-      dbname: db1
+    {{ toYaml .Values.config | nindent 4 }}
     ingestNode: false
     queryNode: false
     isRaftNode: true
diff --git a/charts/siglensent/templates/worker-configmap.yaml b/charts/siglensent/templates/worker-configmap.yaml
index 9da8775..0d40b3f 100644
--- a/charts/siglensent/templates/worker-configmap.yaml
+++ b/charts/siglensent/templates/worker-configmap.yaml
@@ -5,58 +5,13 @@ metadata:
   namespace: {{ .Values.global.namespace }}
 data:
   server.yaml: |-
-    tls:
-      enabled: {{ .Values.config.tls.enabled }}
-      certificatePath: {{ .Values.config.tls.certificatePath }}
-      privateKeyPath: {{ .Values.config.tls.privateKeyPath }}
-    ingestPort: {{ .Values.config.ingestPort }}
-    queryPort: {{ .Values.config.queryPort }}
-    dataPath: {{ .Values.config.dataPath }}
-    timestampKey: {{ .Values.config.timestampKey }}
-    licenseKeyPath: {{ .Values.config.licenseKeyPath }}
-    ssInstanceName: {{ .Values.config.worker.ssInstanceName }}
-    blobStoreMode: {{ .Values.config.blobStoreMode }}
-    s3:
-      enabled: {{ .Values.config.s3.enabled }}
-      bucketName: {{ .Values.config.s3.bucketName }}
-      bucketPrefix: {{ .Values.config.s3.bucketPrefix }}
-      regionName: {{ .Values.config.s3.regionName }}
-    gcs:
-      bucketName: {{ .Values.config.gcs.bucketName }}
-      bucketPrefix: {{ .Values.config.gcs.bucketPrefix }}
-      regionName: {{ .Values.config.gcs.regionName }}
-    rbac:
-      provider: {{ .Values.config.rbac.provider }}
-      dbname: {{ .Values.config.rbac.dbname }}
-      host: {{ .Values.config.rbac.host }}
-      port: {{ .Values.config.rbac.port }}
-      user: {{ .Values.config.rbac.user }}
-      password: {{ .Values.config.rbac.password }}
-    emailConfig:
-      smtpHost: {{ .Values.config.emailConfig.smtpHost }}
-      smtpPort: {{ .Values.config.emailConfig.smtpPort }}
-      senderEmail: {{ .Values.config.emailConfig.senderEmail }}
-      gmailAppPassword: {{ .Values.config.emailConfig.gmailAppPassword }}
-    saas:
-      superadminEmail: {{ .Values.config.saas.superadminEmail }}
-      superadminOrgName: {{ .Values.config.saas.superadminOrgName }}
-      enabled: {{ .Values.config.saas.enabled }}
-      googleAuth:
-        clientId: {{ .Values.config.saas.googleAuth.clientId }}
-        clientSecret: {{ .Values.config.saas.googleAuth.clientSecret }}
-        queryCallbackUrl: {{ .Values.config.saas.googleAuth.queryCallbackUrl }}
-        managementCallbackUrl: {{ .Values.config.saas.googleAuth.managementCallbackUrl }}
-      githubAuth:
-        clientId: {{ .Values.config.saas.githubAuth.clientId }}
-        clientSecret: {{ .Values.config.saas.githubAuth.clientSecret }} 
-        queryCallbackUrl: {{ .Values.config.saas.githubAuth.queryCallbackUrl }}
-        managementCallbackUrl: {{ .Values.config.saas.githubAuth.managementCallbackUrl }}
+    {{ toYaml .Values.config | nindent 4 }}
     ingestNode: true
     queryNode: true
     isManagementNode: true
+    isRaftNode: false
     queryHostname: {{ .Values.queryHostWithPort }}
     ingestUrl: {{ .Values.ingestHost }}
-    isRaftNode: false
     raft:
       raftNodes:
 {{- $namespace := .Release.Namespace }}