diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 71fafa366..5fbfec049 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,14 +16,12 @@ env:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Install system dependencies
       run: |
-        sudo apt install -yq python3-pip
-        pip install --upgrade setuptools
-        pip install setuptools_scm
+        sudo apt install -yq python3-pip python3-setuptools-scm
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
       with:
diff --git a/.github/workflows/reusable-unit-tests-docker.yml b/.github/workflows/reusable-unit-tests-docker.yml
index 986d47161..947c413cb 100644
--- a/.github/workflows/reusable-unit-tests-docker.yml
+++ b/.github/workflows/reusable-unit-tests-docker.yml
@@ -9,16 +9,14 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
         ref: ${{ inputs.branch }}
     - name: Install system dependencies
       run: |
-        sudo apt install -yq python3-pip
-        pip install --upgrade setuptools
-        pip install setuptools_scm
+        sudo apt install -yq python3-pip python3-setuptools-scm
     - name: Build docker images
       run: |
         ./dockerfiles/build.sh
diff --git a/.github/workflows/reusable-unit-tests.yml b/.github/workflows/reusable-unit-tests.yml
index 6a6eef797..28848417c 100644
--- a/.github/workflows/reusable-unit-tests.yml
+++ b/.github/workflows/reusable-unit-tests.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     continue-on-error: false
     steps:
     - uses: actions/checkout@v4