diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
index 11af18b2d..40d469c61 100644
--- a/.github/workflows/ci_cd.yml
+++ b/.github/workflows/ci_cd.yml
@@ -127,11 +127,8 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - name: Installing OS packages
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt install -y libgl1 libglx-mesa0 xvfb libgomp1
+      - name: Set up headless display
+        uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
 
       - name: Set up Python
         uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index d01e00c0d..1c55177b8 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -22,11 +22,8 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - name: Installing OS packages
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt install -y libgl1 libglx-mesa0 xvfb libgomp1
+      - name: Set up headless display
+        uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
diff --git a/doc/Makefile b/doc/Makefile
index c43ba4e1b..c425063e6 100755
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -14,18 +14,9 @@ help:
 
 .PHONY: help Makefile
 
-.install-ci-dep:
-	@pip freeze | grep -q "vtk-osmesa" && is_vtk_osmesa_installed="yes" || is_vtk_osmesa_installed="no"
-	@if [ "${ON_CI}" = "true" ] && [ "$$is_vtk_osmesa_installed" != "yes" ]; then \
-		@echo "Removing package(s) to avoid conflicts with package(s) needed for CI/CD"; \
-		pip uninstall --yes vtk; \
-		@echo "Installing CI/CD required package(s)"; \
-		pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1; \
-	fi
-
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: .install-ci-dep Makefile
+%:
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
 
@@ -41,5 +32,5 @@ pdf:
 	(test -f $(BUILDDIR)/latex/*.pdf && echo pdf exists) || exit 1
 
 # Build HTML files and generate examples as .py files
-html: .install-ci-dep
+html:
 	@$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/doc/changelog.d/774.maintenance.md b/doc/changelog.d/774.maintenance.md
new file mode 100644
index 000000000..4ef58d81c
--- /dev/null
+++ b/doc/changelog.d/774.maintenance.md
@@ -0,0 +1 @@
+Rework logic around vtk-osmesa