diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 949a53f0c..215480115 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04]
+        os: [ubuntu-latest]
         buildType: [Debug, RelWithDebInfo]
         runtimeCheck: [asan, tsan]
         protonGitRef:
@@ -226,7 +226,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04]
+        os: [ubuntu-latest]
         buildType: [Debug, RelWithDebInfo]
         runtimeCheck: [asan, tsan]
         protonGitRef:
@@ -494,7 +494,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04]
+        os: [ubuntu-latest]
         container: ['fedora']
         containerTag: ['40']
         cc: [gcc]
@@ -514,7 +514,7 @@ jobs:
             runtimeCheck: asan
         include:
           # CentOS 9: Coverage Proton-main 1 of 2
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
             container: 'centos'
             containerTag: stream9
             cc: gcc
@@ -527,7 +527,7 @@ jobs:
             shard: 1
             shards: 2
           # CentOS 9: Coverage Proton-main 2 of 2
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
             container: 'centos'
             containerTag: stream9
             cc: gcc
@@ -540,7 +540,7 @@ jobs:
             shard: 2
             shards: 2
           # CentOS 8: Release Proton-main 1 of 2
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
             container: 'centos'
             containerTag: stream8
             cc: gcc
@@ -552,7 +552,7 @@ jobs:
             shard: 1
             shards: 2
           # CentOS 8: Release Proton-main 2 of 2
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
             container: 'centos'
             containerTag: stream8
             cc: gcc
@@ -563,7 +563,7 @@ jobs:
             protonGitRef: ${{ github.event.inputs.protonBranch || 'main' }}
             shard: 2
             shards: 2
-          # - os: ubuntu-24.04
+          # - os: ubuntu-latest
           #   container: 'centos'
           #   containerTag: stream8
           #   cc: gcc
@@ -574,7 +574,7 @@ jobs:
           #   protonGitRef: 0.39.0
           #   shard: 1
           #   shards: 2
-          # - os: ubuntu-24.04
+          # - os: ubuntu-latest
           #   container: 'centos'
           #   containerTag: stream8
           #   cc: gcc
@@ -586,7 +586,7 @@ jobs:
           #   shard: 2
           #   shards: 2
           # # unittest coverage
-          # - os: ubuntu-24.04
+          # - os: ubuntu-latest
           #   container: 'fedora'
           #   containerTag: 40
           #   cc: gcc
@@ -600,7 +600,7 @@ jobs:
           #   shard: 1
           #   shards: 1
           # # clang
-          #- os: ubuntu-24.04
+          #- os: ubuntu-latest
           #  container: 'fedora'
           #  containerTag: 40
           #  cc: clang
@@ -611,7 +611,7 @@ jobs:
           #  protonGitRef: ${{ github.event.inputs.protonBranch || 'main' }}
           #  shard: 1
           #  shards: 2
-          #- os: ubuntu-24.04
+          #- os: ubuntu-latest
           #  container: 'fedora'
           #  containerTag: 40
           #  cc: clang
@@ -930,7 +930,7 @@ jobs:
     runs-on: '${{ matrix.os }}'
     strategy:
       matrix:
-        os: [ 'ubuntu-24.04' ]
+        os: [ 'ubuntu-latest' ]
 
     env:
       DispatchBuildDir: ${{github.workspace}}/build
@@ -988,7 +988,7 @@ jobs:
 
   container_amd64:
     name: amd64 container image
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     env:
       ImageName: local/skupper-router:local
 
@@ -1084,7 +1084,7 @@ jobs:
     runs-on: '${{ matrix.os }}'
     strategy:
       matrix:
-        os: [ 'ubuntu-24.04' ]
+        os: [ 'ubuntu-latest' ]
         container: [ 'centos' ]
         containerTag: [ 'stream9' ]
 
@@ -1172,7 +1172,7 @@ jobs:
 
   rat_check:
     name: RAT Check
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4