diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 6afe9fa2..6c5d8acd 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   complete:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v2
diff --git a/Dockerfile.netdelay b/Dockerfile.netdelay
index 97f5e94d..c320d0df 100644
--- a/Dockerfile.netdelay
+++ b/Dockerfile.netdelay
@@ -6,5 +6,5 @@
 #
 # docker build -t stellar/sdf-netdelay:latest -f Dockerfile.netdelay .
 
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 RUN apt-get -y -q update && DEBIAN_FRONTEND=noninteractive apt-get -y -q install iproute2 bind9-host
diff --git a/src/MissionParallelCatchup/Dockerfile.jobmonitor b/src/MissionParallelCatchup/Dockerfile.jobmonitor
index 415e1806..fab52d34 100644
--- a/src/MissionParallelCatchup/Dockerfile.jobmonitor
+++ b/src/MissionParallelCatchup/Dockerfile.jobmonitor
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 ubuntu:22.04
+FROM --platform=linux/amd64 ubuntu:24.04
 
 VOLUME /data