diff --git a/config/motion.conf b/config/motion.conf
index 7f05d45..07ac601 100644
--- a/config/motion.conf
+++ b/config/motion.conf
@@ -32,7 +32,7 @@ timelapse_filename /timelapse/%Y-%m-%d-%H-%M-%S
 
 # WEBCONTROL
 webcontrol_auth_method 2
-webcontrol_authentication ${USER}:${PASS}
+webcontrol_authentication ${MOTION_USER}:${MOTION_PASSWORD}
 webcontrol_port 8080
 webcontrol_localhost off
 webcontrol_cert /etc/letsencrypt/live/${DOMAIN}/fullchain.pem
@@ -47,7 +47,7 @@ stream_quality 25
 stream_motion on
 stream_maxrate 24
 stream_auth_method 2
-stream_authentication ${USER}:${PASS}
+stream_authentication ${MOTION_USER}:${MOTION_PASSWORD}
 stream_preview_method 0
 stream_tls on
 
diff --git a/config/msmtprc b/config/msmtprc
index 32144e4..08d7082 100644
--- a/config/msmtprc
+++ b/config/msmtprc
@@ -4,11 +4,11 @@ tls            on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 logfile        ~/.msmtp.log
 
-account        gmail
-host           smtp.gmail.com
-port           587
-from           user@example.com
-user           user@example.com
-password       app-password
+account        default
+host           ${EMAIL_HOST}
+port           ${EMAIL_PORT}
+from           ${EMAIL_USER}
+user           ${EMAIL_USER}
+password       ${EMAIL_PASSWORD}
 
-account default : gmail
+account default : default
diff --git a/config/muttrc b/config/muttrc
index 440adca..02fb6f4 100644
--- a/config/muttrc
+++ b/config/muttrc
@@ -1,3 +1,3 @@
 set sendmail="/usr/bin/msmtp"
 set use_from=yes
-set from=user@example.com
+set from=${EMAIL_USER}