diff --git a/tools/mac_setup.sh b/tools/mac_setup.sh
index f4129a4d68..a633066f29 100755
--- a/tools/mac_setup.sh
+++ b/tools/mac_setup.sh
@@ -62,14 +62,13 @@ fi
 # install python
 PYENV_PYTHON_VERSION=$(cat $OP_ROOT/.python-version)
 pyenv install -s ${PYENV_PYTHON_VERSION}
-pyenv global ${PYENV_PYTHON_VERSION}
 pyenv rehash
 eval "$(pyenv init -)"
 
 pip install pipenv==2020.8.13
-pipenv install --system --deploy
+pipenv install --dev --deploy
 
 echo
 echo "----   FINISH OPENPILOT SETUP   ----"
 echo "Configure your active shell env by running:"
-echo "source $RC_FILE"
\ No newline at end of file
+echo "source $RC_FILE"
diff --git a/tools/ubuntu_setup.sh b/tools/ubuntu_setup.sh
index c52f1dcb80..a7eaa98768 100755
--- a/tools/ubuntu_setup.sh
+++ b/tools/ubuntu_setup.sh
@@ -136,14 +136,13 @@ git submodule update
 PYENV_PYTHON_VERSION=$(cat $OP_ROOT/.python-version)
 PATH=$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
 pyenv install -s ${PYENV_PYTHON_VERSION}
-pyenv global ${PYENV_PYTHON_VERSION}
 pyenv rehash
 eval "$(pyenv init -)"
 
 # **** in python env ****
-pip install --upgrade pip==20.2.4
-pip install pipenv==2020.8.13
-pipenv install --dev --system --deploy
+pip install pip==21.3.1
+pip install pipenv==2021.5.29
+pipenv install --dev --deploy
 
 echo
 echo "----   FINISH OPENPILOT SETUP   ----"
diff --git a/update_requirements.sh b/update_requirements.sh
index c9cda377af..be7d53f98b 100755
--- a/update_requirements.sh
+++ b/update_requirements.sh
@@ -28,18 +28,25 @@ if ! command -v pipenv &> /dev/null; then
 fi
 
 echo "update pip"
-pip install --upgrade pip
-pip install pipenv
+pip install pip==21.3.1
+pip install pipenv==2021.5.29
 
 echo "pip packages install ..."
-[ -d "./xx" ] && export PIPENV_PIPFILE=./xx/Pipfile
-pipenv install --dev --deploy --system
+if [ -d "./xx" ]; then
+  export PIPENV_PIPFILE=./xx/Pipfile
+  pipenv install --system --dev --deploy
+  RUN=""
+else
+  pipenv install --dev --deploy
+  RUN="pipenv run"
+fi
+
 # update shims for newly installed executables (e.g. scons)
 pyenv rehash
 
 echo "precommit install ..."
-pre-commit install
+$RUN pre-commit install
 
 # for internal comma repos
-[ -d "./xx" ] && (cd xx && pre-commit install)
-[ -d "./notebooks" ] && (cd notebooks && pre-commit install)
+[ -d "./xx" ] && (cd xx && $RUN pre-commit install)
+[ -d "./notebooks" ] && (cd notebooks && $RUN pre-commit install)