diff --git a/.github/workflows/os_actions.yml b/.github/workflows/os_actions.yml
deleted file mode 100644
index 497e40121..000000000
--- a/.github/workflows/os_actions.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) 2020 The University of Manchester
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This workflow will install Python dependencies, run tests, lint and rat with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Os Actions
-on: [push]
-jobs:
-  os:
-    runs-on: ${{ matrix.runner }}
-    timeout-minutes: 10
-    strategy:
-      matrix:
-        include:
-          - runner: ubuntu-22.04
-            python-version: "3.12"
-            style: true
-          - runner: ubuntu-20.04
-            python-version: 3.8
-            style: true
-          - runner: windows-2022
-            python-version: "3.12"
-            style: false
-          - runner: windows-2019
-            python-version: 3.8
-            style: false
-          - runner: macos-14
-            python-version: "3.12"
-            style: false
-          - runner: macos-13
-            python-version: "3.11"
-            style: false
-          - runner: macos-12
-            python-version: "3.10"
-            style: false
-          - runner: macos-11
-            python-version: 3.9
-            style: false
-
-    steps:
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Checkout SupportScripts
-      uses: actions/checkout@v4
-      with:
-        repository: SpiNNakerManchester/SupportScripts
-        path: support
-
-    - name: Install pip, etc
-      if: ${{ matrix.style }}
-      uses: ./support/actions/python-tools
-    - name: Install mypy
-      if: ${{ matrix.style }}
-      run: pip install mypy
-
-    - name: Install Spinnaker Dependencies
-      uses: ./support/actions/install-spinn-deps
-      with:
-        repositories: SpiNNUtils SpiNNMachine
-        install: true
-
-    - name: Run Install
-      uses: ./support/actions/run-install
-
-    - name: install pytest
-      run: |
-        python -m pip install pytest-timeout pytest-forked pytest-progress
-
-    - name: Test with pytest
-      run: pytest unittests
-
-    - name: Integration tests
-      env:
-        SPALLOC_USER: ${{ secrets.SPALLOC_USER }}
-        SPALLOC_PASSWORD: ${{ secrets.SPALLOC_PASSWORD }}
-      run: pytest spinnman_integration_tests
diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml
index 7df7906db..cf0c2194e 100644
--- a/.github/workflows/python_actions.yml
+++ b/.github/workflows/python_actions.yml
@@ -25,47 +25,57 @@ jobs:
       matrix:
         include:
           - runner: ubuntu-24.04
-            python-version: "3.13"
-            tests: true
-
-          - runner: ubuntu-22.04
             python-version: "3.12"
-            style: true
-            coverage: true
+            tests: tests
 
           - runner: ubuntu-22.04
             python-version: "3.12"
-            validate: true
+            style: style
+            tests: tests
+            mypy: mypy
+            coverage: coverage
 
           - runner: ubuntu-20.04
             python-version: 3.8
-            style: true
-            mypy: true
-            tests: true
+            style: style
+            mypy: mypy
+            tests: tests
+
+          - runner: ubuntu-latest
+            python-version: "3.13"
+            tests: tests
+
+          - runner: ubuntu-latest
+            python-version: "3.11"
+            tests: tests
+
+          - runner: ubuntu-latest
+            python-version: "3.10"
+            tests: tests
+
+          - runner: ubuntu-latest
+            python-version: "3.09"
+            tests: tests
 
           - runner: windows-2022
             python-version: "3.12"
-            tests: true
+            tests: tests
 
           - runner: windows-2019
             python-version: 3.8
-            tests: true
+            tests: tests
 
           - runner: macos-14
             python-version: "3.12"
-            tests: true
-
-          - runner: macos-13
-            python-version: "3.11"
-            tests: true
-
-          - runner: macos-12
-            python-version: "3.10"
-            tests: true
+            tests: tests
 
           - runner: macos-11
-            python-version: 3.9
-            tests: true
+            python-version: 3.8
+            tests: tests
+
+          - runner: ubuntu-22.04
+            python-version: "3.12"
+            validate: validate
 
     steps:
     - name: Set up Python ${{ matrix.python-version }}