diff --git a/falcosidekick/CHANGELOG.md b/falcosidekick/CHANGELOG.md
index ba3881685..6b4d5574b 100644
--- a/falcosidekick/CHANGELOG.md
+++ b/falcosidekick/CHANGELOG.md
@@ -5,6 +5,13 @@ numbering uses [semantic versioning](http://semver.org).
 
 Before release 0.1.20, the helm chart can be found in `falcosidekick` [repository](https://github.com/falcosecurity/falcosidekick/tree/master/deploy/helm/falcosidekick).
 
+## 0.5.8
+
+* Add `alertmanager.extralabels` and `alertmanager.extraannotations` to the values,
+as a list of comma separated labels and annotations to add to the AlertManager trigger.
+* Add `smtp.autmechanism` and associated fields to be able to use any SASL mechanism.
+
+
 ## 0.5.7
 
 * Removing unused Kafka config values
diff --git a/falcosidekick/Chart.yaml b/falcosidekick/Chart.yaml
index 4c241678e..d85efb08a 100644
--- a/falcosidekick/Chart.yaml
+++ b/falcosidekick/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 2.26.0
+appVersion: 2.27.0
 description: Connect Falco to your ecosystem
 icon: https://raw.githubusercontent.com/falcosecurity/falcosidekick/master/imgs/falcosidekick_color.png
 name: falcosidekick
diff --git a/falcosidekick/templates/secrets.yaml b/falcosidekick/templates/secrets.yaml
index 300966e07..6873a9cfe 100644
--- a/falcosidekick/templates/secrets.yaml
+++ b/falcosidekick/templates/secrets.yaml
@@ -61,6 +61,8 @@ data:
   ALERTMANAGER_MINIMUMPRIORITY: "{{ .Values.config.alertmanager.minimumpriority | b64enc }}"
   ALERTMANAGER_MUTUALTLS: "{{ .Values.config.alertmanager.mutualtls | printf "%t" | b64enc }}"
   ALERTMANAGER_CHECKCERT: "{{ .Values.config.alertmanager.checkcert | printf "%t" | b64enc }}"
+  ALERTMANAGER_EXTRALABELS: "{{ .Values.config.alertmanager.extralabels | b64enc }}"
+  ALERTMANAGER_EXTRAANNOTATIONS: "{{ .Values.config.alertmanager.extraannotations | b64enc }}"
 
   # InfluxDB Output
   INFLUXDB_USER: "{{ .Values.config.influxdb.user | b64enc }}"
@@ -92,9 +94,13 @@ data:
   AWS_KINESIS_MINIMUMPRIORITY: "{{ .Values.config.aws.kinesis.minimumpriority | b64enc }}"
 
   # SMTP Output
+  SMTP_HOSTPORT: "{{ .Values.config.smtp.hostport | b64enc }}"
+  SMTP_AUTHMECHANISM: "{{ .Values.config.smtp.authmechanism | b64enc }}"
   SMTP_USER: "{{ .Values.config.smtp.user | b64enc }}"
   SMTP_PASSWORD: "{{ .Values.config.smtp.password | b64enc }}"
-  SMTP_HOSTPORT: "{{ .Values.config.smtp.hostport | b64enc }}"
+  SMTP_TOKEN: "{{ .Values.config.smtp.token | b64enc }}"
+  SMTP_IDENTITY: "{{ .Values.config.smtp.identity | b64enc }}"
+  SMTP_TRACE: "{{ .Values.config.smtp.trace | b64enc }}"
   SMTP_FROM: "{{ .Values.config.smtp.from | b64enc }}"
   SMTP_TO: "{{ .Values.config.smtp.to | b64enc }}"
   SMTP_OUTPUTFORMAT: "{{ .Values.config.smtp.outputformat | b64enc }}"