diff --git a/ssh/.ssh/.gitignore b/ssh/.ssh/.gitignore
index b6f9155..1debba7 100644
--- a/ssh/.ssh/.gitignore
+++ b/ssh/.ssh/.gitignore
@@ -1 +1,2 @@
 local-config
+id_*
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 460c536..80599c7 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -79,14 +79,11 @@ if [ -e $HOME/cfa-work/.zshrc ]; then
   . $HOME/cfa-work/.zshrc
 fi
 
-# setup okta-aws-cli env
-# export $(xargs < $HOME/.okta/.env)
-
-# setup aws-cli env
-export $(xargs < $HOME/.aws/.env)
-
-# setup gh env
-export $(xargs < $HOME/.config/git/.env)
+for env in $HOME/.okta/.env $HOME/.aws/.env $HOME/config/git/.env; do
+  if [ -r $env ]; then
+    export $(xargs < $env)
+  fi
+done
 
 autoload bashcompinit && bashcompinit
 autoload -Uz compinit