diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index cbf3b88c..4ffb390b 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -6,9 +6,14 @@ on:
       - rolling
   schedule:
     - cron: "0 5 * * *"
+defaults:
+  run:
+    shell: bash
 jobs:
   binary:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:24.04
     continue-on-error: true
     strategy:
       fail-fast: false
@@ -51,7 +56,9 @@ jobs:
         source install/setup.bash
         (! ros2 run tracetools status)
   source:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:24.04
     continue-on-error: true
     strategy:
       fail-fast: false
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3ec42a43..5e125922 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,34 +6,39 @@ on:
       - rolling
   schedule:
     - cron: "0 5 * * *"
+defaults:
+  run:
+    shell: bash
 jobs:
   test:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ matrix.os }}
     continue-on-error: ${{ matrix.build-type == 'binary' }}
     strategy:
       fail-fast: false
       matrix:
         include:
           # Normal build (binary)
-          - os: ubuntu-22.04
+          - os: ubuntu:24.04
             distro: rolling
             build-type: binary
             instrumentation: instr-enabled
             tracepoints: tp-included
           # Normal build (source)
-          - os: ubuntu-22.04
+          - os: ubuntu:24.04
             distro: rolling
             build-type: source
             instrumentation: instr-enabled
             tracepoints: tp-included
           # Build with instrumentation disabled
-          - os: ubuntu-22.04
+          - os: ubuntu:24.04
             distro: rolling
             build-type: source
             instrumentation: instr-disabled
             tracepoints: tp-included
           # Normal build with tracepoints excluded
-          - os: ubuntu-22.04
+          - os: ubuntu:24.04
             distro: rolling
             build-type: source
             instrumentation: instr-enabled