diff --git a/.github/workflows/pytest-core-mpi.yml b/.github/workflows/pytest-core-mpi.yml
index 0811d51289..ddb9fd2846 100644
--- a/.github/workflows/pytest-core-mpi.yml
+++ b/.github/workflows/pytest-core-mpi.yml
@@ -56,10 +56,17 @@ jobs:
 
   test-mpi-docker:
       name: pytest-mpi
-      runs-on: ubuntu-latest
+      runs-on: ${{ matrix.os }}
       strategy:
         matrix:
-          arch: [gcc, icx]
+          name: [gcc, icx]
+          include:
+            - name: gcc
+              arch: gcc
+              os: ubuntu-latest
+            - name: icx
+              arch: icx
+              os: ["self-hosted", "docker"]
       
       steps:
       - name: Checkout devito
diff --git a/.github/workflows/pytest-core-nompi.yml b/.github/workflows/pytest-core-nompi.yml
index 63c65d8813..5370d47118 100644
--- a/.github/workflows/pytest-core-nompi.yml
+++ b/.github/workflows/pytest-core-nompi.yml
@@ -100,7 +100,7 @@ jobs:
 
         - name: pytest-docker-py39-icx-omp
           python-version: '3.9'
-          os: ubuntu-22.04
+          os: ["self-hosted", "docker"]
           arch: "icx"
           language: "openmp"
           sympy: "1.12"