diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml
index 7461b4c..5c0ede7 100644
--- a/.github/workflows/python.yaml
+++ b/.github/workflows/python.yaml
@@ -6,11 +6,15 @@ on:
 
 jobs:
   build:
-    runs-on: 'ubuntu-latest'
     strategy:
+      fail-fast: false
       matrix:
         python-version: ['3.12']
-
+        runner:
+          - 'ubuntu-latest'
+          - 'self-hosted'
+          
+    runs-on: ${{ matrix.runner }}
     steps:
       - uses: 'actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744' # ratchet:actions/checkout@v3
       - name: 'Set up Python ${{ matrix.python-version }}'
diff --git a/.github/workflows/python_selfhost.yaml b/.github/workflows/python_selfhost.yaml
deleted file mode 100644
index 140b383..0000000
--- a/.github/workflows/python_selfhost.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: 'Python lint and test (self-hosted)'
-
-on:
-  push:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: 'self-hosted'
-    strategy:
-      matrix:
-        python-version: ['3.12']
-
-    steps:
-      - uses: 'actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744' # ratchet:actions/checkout@v3
-      - name: 'Set up Python ${{ matrix.python-version }}'
-        uses: 'actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236' # ratchet:actions/setup-python@v4
-        with:
-          python-version: '${{ matrix.python-version }}'
-      - name: 'Install dependencies'
-        run: |
-          python -m pip install --upgrade pip
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-      - name: 'Lint with ruff'
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
-          ruff check --output-format=github --select=E9,F63,F7,F82 --target-version=py37 .
-          # default set of ruff rules with GitHub Annotations
-          ruff check --output-format=github --target-version=py37 .
-      - name: 'Test with pytest'
-        run: |
-          pytest
diff --git a/.github/workflows/pytype.yaml b/.github/workflows/pytype.yaml
index b8f707d..93fd3ea 100644
--- a/.github/workflows/pytype.yaml
+++ b/.github/workflows/pytype.yaml
@@ -5,10 +5,16 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        runner:
+          - 'ubuntu-latest'
+          - 'self-hosted'
+    runs-on: ${{ matrix.runner }}
     steps:
     - uses: actions/checkout@v2
     - name: pytypes checker
       uses: theahura/pytypes-action@main
       with:
-        args: -d import-error
\ No newline at end of file
+        args: -d import-error
diff --git a/.github/workflows/pytype_selfhost.yaml b/.github/workflows/pytype_selfhost.yaml
deleted file mode 100644
index 682c5a5..0000000
--- a/.github/workflows/pytype_selfhost.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: 'pytype check (self-hosted)'
-
-on:
-  push:
-  workflow_dispatch:
-
-jobs:
-  check:
-    runs-on: 'self-hosted'
-    steps:
-    - uses: 'actions/checkout@v2'
-    - name: 'pytypes checker'
-      uses: 'theahura/pytypes-action@main'
-      with:
-        args: '-d import-error'