diff --git a/apps/meet/calcom/calcom-keys.yaml b/apps/meet/calcom/calcom-keys.yaml
index f82f76526bac380203b9fb45315c7aca6c6b8b3d..1475c8398f7ec72e7a3dc04c9e40dfc7cef3c925 100644
--- a/apps/meet/calcom/calcom-keys.yaml
+++ b/apps/meet/calcom/calcom-keys.yaml
@@ -8,3 +8,9 @@ stringData:
   NEXT_PUBLIC_WEBAPP_URL: "https://${calcom_domain}"
   NEXTAUTH_SECRET: "${nextauth_secret}"
   CALENDSO_ENCRYPTION_KEY: "${calendso_key}"
+  EMAIL_FROM: "${outgoing_mail_from_address}"
+  EMAIL_SERVER_HOST: "${outgoing_mail_smtp_host}"
+  EMAIL_SERVER_PORT: "${outgoing_mail_smtp_port}"
+  EMAIL_SERVER_USER: "${outgoing_mail_smtp_user}"
+  EMAIL_SERVER_PASSWORD: "${outgoing_mail_smtp_password}"
+  # email_enabled: "${outgoing_mail_enabled}"
diff --git a/apps/meet/calcom/calcom-values-configmap.yaml b/apps/meet/calcom/calcom-values-configmap.yaml
index aa087c88769814c955dd1e569b4f25ef7d198e6f..b72bb0c20b488d9dc8756ef07d5655bd6f86fcb0 100644
--- a/apps/meet/calcom/calcom-values-configmap.yaml
+++ b/apps/meet/calcom/calcom-values-configmap.yaml
@@ -42,17 +42,3 @@ data:
           - secretName: calcom-tls
             hosts:
               - "${calcom_domain}"
-
-    # TODO Adjust calcom Mailing config
-    #    mailer:
-    #      enabled: "${outgoing_mail_enabled}"
-    #      host: "${outgoing_mail_smtp_host}"
-    #      port: "${outgoing_mail_smtp_port}"
-    #      username: "${outgoing_mail_smtp_user}"
-    #      password: "${outgoing_mail_smtp_password}"
-    #      fromemail: "${outgoing_mail_from_address}"
-    # TODO Adjust calcom OpenID Connect Single Sign-On Configuration
-    #    - name: Stackspin
-    #      key: "${client_id}"
-    #      secret: "${client_secret}"
-    #      autoDiscoverUrl: 'https://${hydra_domain}/.well-known/openid-configuration'
diff --git a/apps/status/gatus/gatus-values-configmap.yaml b/apps/status/gatus/gatus-values-configmap.yaml
index 81ef0b4f7866e8e755a7b2bba3e01a0e6f223aab..9f15e28460dc4d7e28832c7be6ec366acf07ee14 100644
--- a/apps/status/gatus/gatus-values-configmap.yaml
+++ b/apps/status/gatus/gatus-values-configmap.yaml
@@ -16,6 +16,10 @@ data:
           hosts:
             - "${gatus_domain}"
 
+    persistence:
+      enabled: true
+      existingClaim: "gatus-data"
+
     security:
       oidc:
         issuer-url: "https://${hydra_domain}"