diff --git a/.github/workflows/dockertests.yml b/.github/workflows/dockertests.yml
index 7167c3f83..e76ee9b65 100644
--- a/.github/workflows/dockertests.yml
+++ b/.github/workflows/dockertests.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest]
+        os: ['ubuntu-24.04', 'ubuntu-24.04-arm']
         node-version: ['23.x']
         java-version: ['23']
     runs-on: ${{ matrix.os }}
@@ -85,7 +85,7 @@ jobs:
   linux-dockertar-tests:
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: ['ubuntu-24.04', 'ubuntu-24.04-arm']
         node-version: ['23.x']
         java-version: ['23']
     runs-on: ${{ matrix.os }}
@@ -134,7 +134,7 @@ jobs:
         env:
           CDXGEN_DEBUG_MODE: debug
   os-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9e2f96e5b..5ee5a3aa2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,7 +10,7 @@ on:
   pull_request:
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 4e7bf2622..f589245d0 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     strategy:
diff --git a/.github/workflows/python-atom-tests.yml b/.github/workflows/python-atom-tests.yml
index 48ae473d0..e7b6b1b3b 100644
--- a/.github/workflows/python-atom-tests.yml
+++ b/.github/workflows/python-atom-tests.yml
@@ -8,7 +8,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         node-version: ['23.x']
diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml
index 6f6016a67..fff70e7a8 100644
--- a/.github/workflows/repotests.yml
+++ b/.github/workflows/repotests.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: true
       matrix:
         node-version: ['23.x']
-        os: ['ubuntu-latest', 'windows-latest']
+        os: ['ubuntu-24.04', 'ubuntu-24.04-arm', 'windows-latest']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -33,13 +33,13 @@ jobs:
           deno-version: v2.x
       - uses: oven-sh/setup-bun@v1
       - name: Trim CI agent
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm'
         run: |
           chmod +x contrib/free_disk_space.sh
           ./contrib/free_disk_space.sh
       - uses: sbt/setup-sbt@v1
       - name: Install bazelisk - linux
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm'
         run: |
           curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-amd64"
           sudo mv bazelisk-linux-amd64 /usr/local/bin/bazel
@@ -62,7 +62,7 @@ jobs:
         uses: android-actions/setup-android@v3
         if: matrix.os != 'self-hosted'
       - uses: swift-actions/setup-swift@v2
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm'
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -607,7 +607,7 @@ jobs:
         continue-on-error: true
         shell: bash
       - uses: actions/upload-artifact@v4
-        if: github.ref == 'refs/heads/master' && matrix.os == 'ubuntu-latest'
+        if: github.ref == 'refs/heads/master' && (matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm')
         with:
           name: bomresults
           path: bomresults