diff --git a/.config/git/skel/.envrc b/.config/git/skel/.envrc
index aba4524b2dcd320d5cfc5bc18a57544315737490..bf920b0e4a60b44404190a3600af706be7d77c5b 100644
--- a/.config/git/skel/.envrc
+++ b/.config/git/skel/.envrc
@@ -1,4 +1,7 @@
 # shellcheck shell=bash disable=SC1091
 # vim: ft=sh
-source_up || true
-[ ! -f .envrc.private ] || . .envrc.private
+if ( cd .. && find_up .envrc >/dev/null )
+then
+    source_up || true
+fi
+source_env_if_exists .envrc.private
diff --git a/Repositories/SchooLinks/.envrc b/Repositories/SchooLinks/.envrc
index 3def1a895a2680cc4e8e42f1ee5cda25d1a01f5e..0e20cd4ea1e79f416acc2fc5797c5af08d835bda 100644
--- a/Repositories/SchooLinks/.envrc
+++ b/Repositories/SchooLinks/.envrc
@@ -1,10 +1,13 @@
 # shellcheck shell=bash disable=SC1091
 # vim: ft=sh
-source_up || true
+if ( cd .. && find_up .envrc >/dev/null )
+then
+    source_up || true
+fi
 export AWS_DEFAULT_PROFILE=schoolinks
 export AWS_PROFILE=schoolinks
 export COMPOSE_FILE='docker-compose.local.yml'
 export GIT_AUTHOR_EMAIL='nimrod@schoolinks.com'
 export GIT_AUTHOR_NAME='Nimrod Adar'
 export PIPENV_VENV_IN_PROJECT=1
-[ ! -f .envrc.private ] || . .envrc.private
+source_env_if_exists .envrc.private