diff --git a/charts/twentycrm/Chart.yaml b/charts/twentycrm/Chart.yaml
index 43930bb..0e2a52f 100644
--- a/charts/twentycrm/Chart.yaml
+++ b/charts/twentycrm/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 description: A Helm chart for https://github.com/twentyhq/twenty
 name: twentycrm
-version: 0.2.0
+version: 0.2.1
diff --git a/charts/twentycrm/templates/secret-tokens.yaml b/charts/twentycrm/templates/secret-tokens.yaml
index 9da7fb0..94a123b 100644
--- a/charts/twentycrm/templates/secret-tokens.yaml
+++ b/charts/twentycrm/templates/secret-tokens.yaml
@@ -11,9 +11,17 @@ metadata:
     heritage: "{{ .Release.Service }}"
 type: Opaque
 data:
+{{- if .Values.secrets }}
   ACCESS_TOKEN_SECRET: {{ default (randAlphaNum 32) .Values.secrets.accessToken | b64enc | quote }}
   LOGIN_TOKEN_SECRET: {{ default (randAlphaNum 32) .Values.secrets.loginToken | b64enc | quote }}
   REFRESH_TOKEN_SECRET: {{ default (randAlphaNum 32) .Values.secrets.refreshToken | b64enc | quote }}
   FILE_TOKEN_SECRET: {{ default (randAlphaNum 32) .Values.secrets.fileToken | b64enc | quote }}
   APP_SECRET: {{ default (randAlphaNum 32) .Values.secrets.appSecret | b64enc | quote }}
+{{- else }}
+  ACCESS_TOKEN_SECRET: {{ randAlphaNum 32 | b64enc | quote }}
+  LOGIN_TOKEN_SECRET: {{ randAlphaNum 32 | b64enc | quote }}
+  REFRESH_TOKEN_SECRET: {{ randAlphaNum 32 | b64enc | quote }}
+  FILE_TOKEN_SECRET: {{ randAlphaNum 32 | b64enc | quote }}
+  APP_SECRET: {{ randAlphaNum 32 | b64enc | quote }}
+{{- end }}