diff --git a/zsh/.zshrc b/zsh/.zshrc
index 02781e6..a536edd 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -81,7 +81,7 @@ precmd_functions+=( set_prompt )
 
 # setup SSH keys
 if [ -e /usr/bin/keychain ]; then
-  eval $(/usr/bin/keychain --eval -Q --quiet id_ed25519)
+  eval $(/usr/bin/keychain --quick --eval --quiet id_ed25519)
 fi
 
 # ctrl-x opens up the command line in $EDITOR
@@ -92,11 +92,15 @@ bindkey "^X" edit-command-line
 # direnv setup
 whence -p direnv &>/dev/null && eval "$(direnv hook zsh)"
 
-# secrets
-if [ -r "$HOME/.env_secrets" ]; then
-  set -a
-  source "$HOME/.env_secrets"
-  set +a
+# secrets are individual files in /run/secrets - export them as environment variables
+if [ -d "/run/secrets" ]; then
+  for secret in /run/secrets/*; do
+    if [ -f "$secret" ]; then
+      name=$(basename "$secret")
+      value=$(head -n1 "$secret" | sed 's/[ \t]*$//' | tr '\0' '\n')
+      export "${name}=${value}"
+    fi
+  done
 fi
 
 # command line completion