diff --git a/.github/workflows/setup/action.yaml b/.github/workflows/setup/action.yaml
index 958f60d2e..f3a1a3950 100644
--- a/.github/workflows/setup/action.yaml
+++ b/.github/workflows/setup/action.yaml
@@ -26,10 +26,6 @@ runs:
           exit 1
         fi
 
-    # do this after checkout to ensure our custom LFS config is used to pull from GitLab
-    - shell: bash
-      run: git lfs pull
-
     # build cache
     - id: date
       shell: bash
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index ff4fc3909..fa327ea74 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -66,6 +66,10 @@ jobs:
     - uses: actions/checkout@v6
       with:
         submodules: true
+    - name: Remove Homebrew from environment
+      run: |
+        FILTERED=$(echo "$PATH" | tr ':' '\n' | grep -v '/opt/homebrew' | tr '\n' ':')
+        echo "PATH=${FILTERED}/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" >> $GITHUB_ENV
     - uses: ./.github/workflows/setup-with-retry
     - name: Building openpilot
       run: scons
diff --git a/tools/cabana/SConscript b/tools/cabana/SConscript
index 90de21265..137e77d85 100644
--- a/tools/cabana/SConscript
+++ b/tools/cabana/SConscript
@@ -6,8 +6,11 @@ Import('env', 'arch', 'common', 'messaging', 'visionipc', 'cereal')
 
 # Detect Qt - skip build if not available
 if arch == "Darwin":
-  brew_prefix = subprocess.check_output(['brew', '--prefix'], encoding='utf8').strip()
-  has_qt = os.path.isdir(os.path.join(brew_prefix, "opt/qt@5"))
+  try:
+    brew_prefix = subprocess.check_output(['brew', '--prefix'], encoding='utf8').strip()
+    has_qt = os.path.isdir(os.path.join(brew_prefix, "opt/qt@5"))
+  except (FileNotFoundError, subprocess.CalledProcessError):
+    has_qt = False
 else:
   has_qt = shutil.which('qmake') is not None
 
diff --git a/tools/op.sh b/tools/op.sh
index 966d4ba43..f5c5b6082 100755
--- a/tools/op.sh
+++ b/tools/op.sh
@@ -225,6 +225,8 @@ function op_setup() {
   et="$(date +%s)"
   echo -e " ↳ [${GREEN}✔${NC}] Dependencies installed successfully in $((et - st)) seconds."
 
+  op_activate_venv
+
   echo "Getting git submodules..."
   st="$(date +%s)"
   if ! git submodule update --jobs 4 --init --recursive; then