diff --git a/.github/workflows/local.yml b/.github/workflows/local.yml
index 67f964c..4dd36b4 100644
--- a/.github/workflows/local.yml
+++ b/.github/workflows/local.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14, macos-13, ubuntu-latest, ubuntu-20.04, windows-2019, windows-2022]
+        os: [macos-14, macos-13, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-2019, windows-2022]
         qt: [""]
         include:
           - os: ubuntu-latest
diff --git a/action.yml b/action.yml
index 05148bd..f057323 100644
--- a/action.yml
+++ b/action.yml
@@ -16,11 +16,21 @@ branding:
 runs:
   using: "composite"
   steps:
-    - name: Install Linux dependencies
+    - name: Update apt
       if: runner.os == 'Linux'
       shell: bash
       # TODO: Pyvista uses `xset` which is part of x11-xserver-utils, maybe a better way to check?
-      run: sudo apt update && sudo apt install libgl1-mesa-glx xvfb x11-xserver-utils -y
+      run: sudo apt update
+
+    - name: Install Linux dependencies
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        sudo apt-get install -y \
+          libglx-mesa0 \
+          libgl1 \
+          xvfb \
+          x11-xserver-utils
 
     - name: Install Linux Qt dependencies
       if: runner.os == 'Linux' && inputs.qt != 'false'
@@ -64,14 +74,7 @@ runs:
         Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
         sleep 3
 
-    - name: Configure for PyVista on Linux and macOS
-      if: runner.os != 'Windows' && inputs.pyvista != 'false'
+    - name: Configure for PyVista
+      if: inputs.pyvista != 'false'
       shell: bash
       run: echo "PYVISTA_OFF_SCREEN=true" >> $GITHUB_ENV
-
-    - name: Configure for PyVista on Windows
-      if: runner.os == 'Windows' && inputs.pyvista != 'false'
-      shell: powershell
-      run: |
-        chcp 65001 #set code page to utf-8
-        echo "PYVISTA_OFF_SCREEN=true" >> $env:GITHUB_ENV
diff --git a/linux/setup.sh b/linux/setup.sh
deleted file mode 100644
index cc1175c..0000000
--- a/linux/setup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -x
-sudo apt-get update && sudo apt-get install libgl1-mesa-glx xvfb -y
-export DISPLAY=:99.0
-export PYVISTA_OFF_SCREEN=True
-which Xvfb
-Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-# give xvfb some time to start
-sleep 3
-set +x