diff --git a/flux2/apps/rocketchat/rocketchat-values-configmap.yaml b/flux2/apps/rocketchat/rocketchat-values-configmap.yaml
index 38ad797bb1c041278a6763e0a7db971211693f04..3ec1b047a69d6c36fa89d8c1c4f364a8568aa6e8 100644
--- a/flux2/apps/rocketchat/rocketchat-values-configmap.yaml
+++ b/flux2/apps/rocketchat/rocketchat-values-configmap.yaml
@@ -68,6 +68,26 @@ data:
         value: "true"
       - name: Accounts_OAuth_Custom_Openappstack_show_button
         value: "true"
+      # Prevent non-functional TOTP 
+      - name: Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In
+        value: "false"
+      # Configure SMTP
+      - name: SMTP_Protocol
+        value: 'smtp'
+      - name: SMTP_Host
+        value: "${outgoing_mail_smtp_host}"
+      - name: SMTP_Port
+        value: "${outgoing_mail_smtp_port}"
+      - name: SMTP_IgnoreTLS
+        value: false
+      - name: SMTP_Pool
+        value: false
+      - name: SMTP_Username
+        value: "${outgoing_mail_smtp_user}"
+      - name: SMTP_Password
+        value: "${outgoing_mail_smtp_password}"
+      - name: From_Email
+        value: "${outgoing_mail_from_address}"
 
     livenessProbe:
       initialDelaySeconds: 180