diff --git a/charts/incubator/n8n/Chart.yaml b/charts/incubator/n8n/Chart.yaml
index 9e85e6623fc..afa2446c0cf 100644
--- a/charts/incubator/n8n/Chart.yaml
+++ b/charts/incubator/n8n/Chart.yaml
@@ -28,7 +28,7 @@ sources:
 - https://docs.n8n.io/
 - https://github.com/n8n-io/n8n
 - https://hub.docker.com/r/n8nio/n8n
-version: 0.0.1
+version: 0.0.2
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/incubator/n8n/questions.yaml b/charts/incubator/n8n/questions.yaml
index 3f2fb7c9c35..b9b3f67c154 100644
--- a/charts/incubator/n8n/questions.yaml
+++ b/charts/incubator/n8n/questions.yaml
@@ -401,13 +401,13 @@ questions:
       type: dict
       attrs:
         - variable: CREDENTIALS_OVERWRITE_DATA
-          label: "Credentianls Overwrites"
+          label: "Credentianls Overwrites (Leave empty for default)"
           description: "Overwrites for credentials"
           schema:
             type: string
-            default: "default"
+            default: ""
         - variable: CREDENTIALS_OVERWRITE_ENDPOINT
-          label: "Credentials Overwrite Endpoint"
+          label: "Credentials Overwrite Endpoint (Leave empty for default)"
           description: "The API endpoint to fetch credentials"
           schema:
             type: string
@@ -430,7 +430,7 @@ questions:
           description: "Log output level"
           schema:
             type: string
-            default: "default"
+            default: "Default"
             enum:
               - value: ""
                 description: "Default"
@@ -449,7 +449,7 @@ questions:
           description: "Where to output logs"
           schema:
             type: string
-            default: "default"
+            default: "Default"
             enum:
               - value: ""
                 description: "Default"
diff --git a/charts/incubator/n8n/templates/_configmap.tpl b/charts/incubator/n8n/templates/_configmap.tpl
index 6f942ee57e8..20f0c80d25f 100644
--- a/charts/incubator/n8n/templates/_configmap.tpl
+++ b/charts/incubator/n8n/templates/_configmap.tpl
@@ -15,7 +15,7 @@ data:
   N8N_AUTH_EXCLUDE_ENDPOINTS: {{ .Values.security.N8N_AUTH_EXCLUDE_ENDPOINTS | quote }}
   {{- end }}
   {{- if .Values.security.N8N_BASIC_AUTH_ACTIVE }}
-  N8N_BASIC_AUTH_ACTIVE: {{ .Values.security.N8N_BASIC_AUTH_ACTIVE }}
+  N8N_BASIC_AUTH_ACTIVE: {{ .Values.security.N8N_BASIC_AUTH_ACTIVE | quote }}
   {{- end }}
   {{- if .Values.security.N8N_BASIC_AUTH_USER }}
   N8N_BASIC_AUTH_USER: {{ .Values.security.N8N_BASIC_AUTH_USER | quote }}
@@ -24,10 +24,10 @@ data:
   N8N_BASIC_AUTH_PASSWORD: {{ .Values.security.N8N_BASIC_AUTH_PASSWORD | quote }}
   {{- end }}
   {{- if .Values.security.N8N_BASIC_AUTH_HASH }}
-  N8N_BASIC_AUTH_HASH: {{ .Values.security.N8N_BASIC_AUTH_HASH }}
+  N8N_BASIC_AUTH_HASH: {{ .Values.security.N8N_BASIC_AUTH_HASH | quote }}
   {{- end }}
   {{- if .Values.security.N8N_JWT_AUTH_ACTIVE }}
-  N8N_JWT_AUTH_ACTIVE: {{ .Values.security.N8N_JWT_AUTH_ACTIVE }}
+  N8N_JWT_AUTH_ACTIVE: {{ .Values.security.N8N_JWT_AUTH_ACTIVE | quote }}
   {{- end }}
   {{- if .Values.security.N8N_JWT_AUTH_HEADER }}
   N8N_JWT_AUTH_HEADER: {{ .Values.security.N8N_JWT_AUTH_HEADER | quote }}
@@ -58,10 +58,10 @@ data:
   N8N_LOG_OUTPUT: {{ .Values.logs.N8N_LOG_OUTPUT | quote }}
   {{- end }}
   {{- if .Values.logs.N8N_LOG_FILE_COUNT_MAX }}
-  N8N_LOG_FILE_COUNT_MAX: {{ .Values.logs.N8N_LOG_FILE_COUNT_MAX }}
+  N8N_LOG_FILE_COUNT_MAX: {{ .Values.logs.N8N_LOG_FILE_COUNT_MAX | quote }}
   {{- end }}
   {{- if .Values.logs.N8N_LOG_FILE_SIZE_MAX }}
-  N8N_LOG_FILE_SIZE_MAX: {{ .Values.logs.N8N_LOG_FILE_SIZE_MAX }}
+  N8N_LOG_FILE_SIZE_MAX: {{ .Values.logs.N8N_LOG_FILE_SIZE_MAX | quote }}
   {{- end }}
   {{- if .Values.logs.N8N_LOG_FILE_LOCATION }}
   N8N_LOG_FILE_LOCATION: {{ .Values.logs.N8N_LOG_FILE_LOCATION | quote }}
@@ -74,10 +74,10 @@ data:
   EXECUTIONS_MODE: {{ .Values.executions.EXECUTIONS_MODE | quote }}
   {{- end }}
   {{- if .Values.executions.EXECUTIONS_TIMEOUT }}
-  EXECUTIONS_TIMEOUT: {{ .Values.executions.EXECUTIONS_TIMEOUT }}
+  EXECUTIONS_TIMEOUT: {{ .Values.executions.EXECUTIONS_TIMEOUT | quote }}
   {{- end }}
   {{- if .Values.executions.EXECUTIONS_TIMEOUT_MAX }}
-  EXECUTIONS_TIMEOUT_MAX: {{ .Values.executions.EXECUTIONS_TIMEOUT_MAX }}
+  EXECUTIONS_TIMEOUT_MAX: {{ .Values.executions.EXECUTIONS_TIMEOUT_MAX | quote }}
   {{- end }}
   {{- if .Values.executions.EXECUTIONS_DATA_SAVE_ON_ERROR }}
   EXECUTIONS_DATA_SAVE_ON_ERROR: {{ .Values.executions.EXECUTIONS_DATA_SAVE_ON_ERROR | quote }}
@@ -86,29 +86,29 @@ data:
   EXECUTIONS_DATA_SAVE_ON_SUCCESS: {{ .Values.executions.EXECUTIONS_DATA_SAVE_ON_SUCCESS | quote }}
   {{- end }}
   {{- if .Values.executions.EXECUTIONS_DATA_SAVE_ON_PROGRESS }}
-  EXECUTIONS_DATA_SAVE_ON_PROGRESS: {{ .Values.executions.EXECUTIONS_DATA_SAVE_ON_PROGRESS }}
+  EXECUTIONS_DATA_SAVE_ON_PROGRESS: {{ .Values.executions.EXECUTIONS_DATA_SAVE_ON_PROGRESS | quote }}
   {{- end }}
   {{- if .Values.executions.EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS }}
-  EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS: {{ .Values.executions.EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS }}
+  EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS: {{ .Values.executions.EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS | quote }}
   {{- end }}
   {{- if .Values.executions.EXECUTIONS_DATA_PRUNE }}
-  EXECUTIONS_DATA_PRUNE: {{ .Values.executions.EXECUTIONS_DATA_PRUNE }}
+  EXECUTIONS_DATA_PRUNE: {{ .Values.executions.EXECUTIONS_DATA_PRUNE | quote }}
   {{- end }}
   {{- if .Values.executions.EXECUTIONS_DATA_MAX_AGE }}
-  EXECUTIONS_DATA_MAX_AGE: {{ .Values.executions.EXECUTIONS_DATA_MAX_AGE }}
+  EXECUTIONS_DATA_MAX_AGE: {{ .Values.executions.EXECUTIONS_DATA_MAX_AGE | quote }}
   {{- end }}
   {{- if .Values.executions.EXECUTIONS_DATA_PRUNE_TIMEOUT }}
-  EXECUTIONS_DATA_PRUNE_TIMEOUT: {{ .Values.executions.EXECUTIONS_DATA_PRUNE_TIMEOUT }}
+  EXECUTIONS_DATA_PRUNE_TIMEOUT: {{ .Values.executions.EXECUTIONS_DATA_PRUNE_TIMEOUT | quote }}
   {{- end }}
   {{/*  Endpoints */}}
   {{- if .Values.endpoints.WEBHOOK_URL }}
   WEBHOOK_URL: {{ .Values.endpoints.WEBHOOK_URL | quote }}
   {{- end }}
   {{- if .Values.endpoints.N8N_PAYLOAD_SIZE_MAX }}
-  N8N_PAYLOAD_SIZE_MAX: {{ .Values.endpoints.N8N_PAYLOAD_SIZE_MAX }}
+  N8N_PAYLOAD_SIZE_MAX: {{ .Values.endpoints.N8N_PAYLOAD_SIZE_MAX | quote }}
   {{- end }}
   {{- if .Values.endpoints.N8N_METRICS }}
-  N8N_METRICS: {{ .Values.endpoints.N8N_METRICS }}
+  N8N_METRICS: {{ .Values.endpoints.N8N_METRICS | quote }}
   {{- end }}
   {{- if .Values.endpoints.N8N_METRICS_PREFIX }}
   N8N_METRICS_PREFIX: {{ .Values.endpoints.N8N_METRICS_PREFIX | quote }}
@@ -126,10 +126,10 @@ data:
   N8N_ENDPOINT_WEBHOOK_WAIT: {{ .Values.endpoints.N8N_ENDPOINT_WEBHOOK_WAIT | quote }}
   {{- end }}
   {{- if .Values.endpoints.N8N_DISABLE_PRODUCTION_MAIN_PROCESS }}
-  N8N_DISABLE_PRODUCTION_MAIN_PROCESS: {{ .Values.endpoints.N8N_DISABLE_PRODUCTION_MAIN_PROCESS }}
+  N8N_DISABLE_PRODUCTION_MAIN_PROCESS: {{ .Values.endpoints.N8N_DISABLE_PRODUCTION_MAIN_PROCESS | quote }}
   {{- end }}
   {{- if .Values.endpoints.N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN }}
-  N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN: {{ .Values.endpoints.N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN }}
+  N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN: {{ .Values.endpoints.N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN | quote }}
   {{- end }}
   {{/*  Credentials */}}
   {{- if .Values.credentials.CREDENTIALS_OVERWRITE_DATA }}
@@ -149,18 +149,18 @@ data:
   N8N_CONFIG_FILES: {{ .Values.deployment.N8N_CONFIG_FILES | quote }}
   {{- end }}
   {{- if .Values.deployment.N8N_DISABLE_UI }}
-  N8N_DISABLE_UI: {{ .Values.deployment.N8N_DISABLE_UI }}
+  N8N_DISABLE_UI: {{ .Values.deployment.N8N_DISABLE_UI | quote }}
   {{- end }}
   {{- if .Values.deployment.N8N_ENCRYPTION_KEY }}
   N8N_ENCRYPTION_KEY: {{ .Values.deployment.N8N_ENCRYPTION_KEY | quote }}
   {{- end }}
   {{- if .Values.deployment.N8N_PERSONALIZATION_ENABLED }}
-  N8N_PERSONALIZATION_ENABLED: {{ .Values.deployment.N8N_PERSONALIZATION_ENABLED }}
+  N8N_PERSONALIZATION_ENABLED: {{ .Values.deployment.N8N_PERSONALIZATION_ENABLED | quote }}
   {{- end }}
   {{- if .Values.deployment.N8N_VERSION_NOTIFICATIONS_ENABLED }}
-  N8N_VERSION_NOTIFICATIONS_ENABLED: {{ .Values.deployment.N8N_VERSION_NOTIFICATIONS_ENABLED }}
+  N8N_VERSION_NOTIFICATIONS_ENABLED: {{ .Values.deployment.N8N_VERSION_NOTIFICATIONS_ENABLED | quote }}
   {{- end }}
   {{- if .Values.deployment.N8N_DIAGNOSTICS_ENABLED }}
-  N8N_DIAGNOSTICS_ENABLED: {{ .Values.deployment.N8N_DIAGNOSTICS_ENABLED }}
+  N8N_DIAGNOSTICS_ENABLED: {{ .Values.deployment.N8N_DIAGNOSTICS_ENABLED | quote }}
   {{- end }}
 {{- end -}}