diff --git a/terraform/apps/dev-01/apps.tf b/terraform/apps/dev-01/apps.tf
index 8737ec9..7f127c2 100644
--- a/terraform/apps/dev-01/apps.tf
+++ b/terraform/apps/dev-01/apps.tf
@@ -116,6 +116,7 @@ module "vaultwarden" {
   smtp_from         = local.vaultwarden_smtp_from
   smtp_from_name    = local.vaultwarden_smtp_from_name
   smtp_username     = local.vaultwarden_smtp_username
+  smtp_password     = local.vaultwarden_smtp_password
 
   # We temporarily enable signup to create the first admin user, then we will disable it and rotate the admin token
   # signup_enabled = true
diff --git a/terraform/apps/dev-01/config.tf b/terraform/apps/dev-01/config.tf
index 6436764..4ec25e2 100644
--- a/terraform/apps/dev-01/config.tf
+++ b/terraform/apps/dev-01/config.tf
@@ -221,7 +221,7 @@ locals {
   alertmanager_config = file("${path.module}/resources/alertmanager.yml")
   alertmanager_email_config = {
     to            = "c.alexandre.pires@alexpires.me"
-    from          = "alertmanager@${local.lab_domain}"
+    from          = "alertmanager@alexpires.me"
     smarthost     = "smtp.tem.scw.cloud:587"
     auth_username = var.scaleway_project_id
     auth_password = local.mail_app_api_secret_key
@@ -263,7 +263,7 @@ locals {
   vaultwarden_smtp_host      = local.scaleway_smtp_host
   vaultwarden_smtp_port      = 465
   vaultwarden_smtp_security  = "force_tls"
-  vaultwarden_smtp_from      = "vaultwarden@${local.lab_domain}"
+  vaultwarden_smtp_from      = "vaultwarden@alexpires.me"
   vaultwarden_smtp_from_name = "Vaultwarden"
   vaultwarden_smtp_username  = var.scaleway_project_id
   vaultwarden_smtp_password  = local.mail_app_api_secret_key
diff --git a/terraform/modules/apps/vaultwarden/main.tf b/terraform/modules/apps/vaultwarden/main.tf
index 13c188d..4105695 100644
--- a/terraform/modules/apps/vaultwarden/main.tf
+++ b/terraform/modules/apps/vaultwarden/main.tf
@@ -94,8 +94,9 @@ resource "kubernetes_deployment" "vaultwarden" {
     template {
       metadata {
         labels = {
-          app             = "vaultwarden"
-          config_checksum = md5(join("", values(kubernetes_config_map.vaultwarden_config.data)))
+          app              = "vaultwarden"
+          config_checksum  = md5(join("", values(kubernetes_config_map.vaultwarden_config.data)))
+          secrets_checksum = md5(join("", values(kubernetes_secret.vaultwarden_secrets.data)))
         }
       }
 
@@ -134,6 +135,26 @@ resource "kubernetes_deployment" "vaultwarden" {
             }
           }
 
+          env {
+            name = "SMTP_USERNAME"
+            value_from {
+              secret_key_ref {
+                name = kubernetes_secret.vaultwarden_secrets.metadata[0].name
+                key  = "SMTP_USERNAME"
+              }
+            }
+          }
+
+          env {
+            name = "SMTP_PASSWORD"
+            value_from {
+              secret_key_ref {
+                name = kubernetes_secret.vaultwarden_secrets.metadata[0].name
+                key  = "SMTP_PASSWORD"
+              }
+            }
+          }
+
           env {
             name  = "ROCKET_PORT"
             value = "8080"