diff --git a/.github/workflows/build-wheel-linux-arm64.yaml b/.github/workflows/build-wheel-linux-arm64.yaml
index 29f6a20a71..f517bbd3ab 100644
--- a/.github/workflows/build-wheel-linux-arm64.yaml
+++ b/.github/workflows/build-wheel-linux-arm64.yaml
@@ -500,14 +500,14 @@ jobs:
 
     - name: Run Python Pytest Tests
       run: |
-        python${{ matrix.python_version }} -m pytest frontend/test/pytest -n auto
-        python${{ matrix.python_version }} -m pytest frontend/test/pytest --backend="lightning.kokkos" -n auto -m "not xdsl"
+        python${{ matrix.python_version }} -m pytest frontend/test/pytest -n logical
+        python${{ matrix.python_version }} -m pytest frontend/test/pytest --backend="lightning.kokkos" -n logical -m "not xdsl"
         python${{ matrix.python_version }} -m pytest frontend/test/async_tests
-        python${{ matrix.python_version }} -m pytest frontend/test/pytest --runbraket=LOCAL -n auto -m "not xdsl" || true
-        python${{ matrix.python_version }} -m pytest frontend/test/test_oqc/oqc -n auto
+        python${{ matrix.python_version }} -m pytest frontend/test/pytest --runbraket=LOCAL -n logical -m "not xdsl" || true
+        python${{ matrix.python_version }} -m pytest frontend/test/test_oqc/oqc -n logical
 
     - name: Run Standalone Plugin Tests
       # Run only on Thursday at the given time
       if: env.BUILD_STANDALONE_PLUGIN == 'true'
       run: |
-        python${{ matrix.python_version }} -m pytest standalone_plugin_wheel/standalone_plugin/test -n auto
+        python${{ matrix.python_version }} -m pytest standalone_plugin_wheel/standalone_plugin/test -n logical
diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml
index 055d3f48a5..93b1dcf7a0 100644
--- a/.github/workflows/build-wheel-linux-x86_64.yaml
+++ b/.github/workflows/build-wheel-linux-x86_64.yaml
@@ -542,14 +542,14 @@ jobs:
 
     - name: Run Python Pytest Tests
       run: |
-        python${{ matrix.python_version }} -m pytest frontend/test/pytest -n auto
-        python${{ matrix.python_version }} -m pytest frontend/test/pytest --backend="lightning.kokkos" -n auto -m "not xdsl"
+        python${{ matrix.python_version }} -m pytest frontend/test/pytest -n logical
+        python${{ matrix.python_version }} -m pytest frontend/test/pytest --backend="lightning.kokkos" -n logical -m "not xdsl"
         python${{ matrix.python_version }} -m pytest frontend/test/async_tests
-        python${{ matrix.python_version }} -m pytest frontend/test/pytest --runbraket=LOCAL -n auto -m "not xdsl" || true
-        python${{ matrix.python_version }} -m pytest frontend/test/test_oqc/oqc -n auto
+        python${{ matrix.python_version }} -m pytest frontend/test/pytest --runbraket=LOCAL -n logical -m "not xdsl" || true
+        python${{ matrix.python_version }} -m pytest frontend/test/test_oqc/oqc -n logical
 
     - name: Run Standalone Plugin Tests
       # Run only on Thursday at the given time
       if: env.BUILD_STANDALONE_PLUGIN == 'true'
       run: |
-        python${{ matrix.python_version }} -m pytest standalone_plugin_wheel/standalone_plugin/test -n auto
+        python${{ matrix.python_version }} -m pytest standalone_plugin_wheel/standalone_plugin/test -n logical
diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml
index b2a83f55eb..c3d071f64f 100644
--- a/.github/workflows/build-wheel-macos-arm64.yaml
+++ b/.github/workflows/build-wheel-macos-arm64.yaml
@@ -521,14 +521,14 @@ jobs:
 
     - name: Run Python Pytest Tests
       run: |
-        python${{ matrix.python_version }} -m pytest frontend/test/pytest -n auto
-        python${{ matrix.python_version }} -m pytest frontend/test/pytest --backend="lightning.kokkos" -n auto -m "not xdsl"
+        python${{ matrix.python_version }} -m pytest frontend/test/pytest -n logical
+        python${{ matrix.python_version }} -m pytest frontend/test/pytest --backend="lightning.kokkos" -n logical -m "not xdsl"
         python${{ matrix.python_version }} -m pytest frontend/test/async_tests
-        python${{ matrix.python_version }} -m pytest frontend/test/pytest --runbraket=LOCAL -n auto -m "not xdsl" || true
-        python${{ matrix.python_version }} -m pytest frontend/test/test_oqc/oqc -n auto
+        python${{ matrix.python_version }} -m pytest frontend/test/pytest --runbraket=LOCAL -n logical -m "not xdsl" || true
+        python${{ matrix.python_version }} -m pytest frontend/test/test_oqc/oqc -n logical
 
     - name: Run Standalone Plugin Tests
       # Run only on Thursday at the given time
       if: env.BUILD_STANDALONE_PLUGIN == 'true'
       run: |
-        python${{ matrix.python_version }} -m pytest standalone_plugin_wheel/standalone_plugin/test -n auto
+        python${{ matrix.python_version }} -m pytest standalone_plugin_wheel/standalone_plugin/test -n logical
diff --git a/Makefile b/Makefile
index bbeb52f2ce..48a2e5aad4 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ SCIPY_DIR := $(shell python -c 'import os, scipy_openblas32; print(os.path.dirna
 ASAN_FLAGS += DYLD_LIBRARY_PATH="$(RT_BUILD_DIR)/lib:$(SCIPY_DIR)/lib:$(DYLD_LIBRARY_PATH)"
 endif
 
-PARALLELIZE := -n auto
+PARALLELIZE := -n logical
 ifeq ($(ENABLE_ASAN),ON)
 ifeq ($(PLATFORM),Darwin)
 # Launching subprocesses with ASAN on macOS is not supported (see https://stackoverflow.com/a/47853433).