diff --git a/.github/workflows/devskim-analysis.yml b/.github/workflows/devskim-analysis.yml
index 1c8cc71..45ea001 100644
--- a/.github/workflows/devskim-analysis.yml
+++ b/.github/workflows/devskim-analysis.yml
@@ -16,7 +16,7 @@ on:
 jobs:
   lint:
     name: DevSkim
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read
diff --git a/Versions/2.2.1/Dockerfile b/Versions/2.2.1/Dockerfile
index 7880d77..d0644ed 100644
--- a/Versions/2.2.1/Dockerfile
+++ b/Versions/2.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
diff --git a/Versions/2.2/Dockerfile b/Versions/2.2/Dockerfile
index 0a3c539..24953e8 100644
--- a/Versions/2.2/Dockerfile
+++ b/Versions/2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
diff --git a/Versions/3.0.1/Dockerfile b/Versions/3.0.1/Dockerfile
index 79e0758..16064e5 100644
--- a/Versions/3.0.1/Dockerfile
+++ b/Versions/3.0.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
diff --git a/Versions/3.0/Dockerfile b/Versions/3.0/Dockerfile
index acf5249..c952f17 100644
--- a/Versions/3.0/Dockerfile
+++ b/Versions/3.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
diff --git a/Versions/3.1/Dockerfile b/Versions/3.1/Dockerfile
index 25dbb0c..a17b539 100644
--- a/Versions/3.1/Dockerfile
+++ b/Versions/3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
diff --git a/Versions/4.0/Dockerfile b/Versions/4.0/Dockerfile
index fd8a8b6..2bf03ff 100644
--- a/Versions/4.0/Dockerfile
+++ b/Versions/4.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
diff --git a/Versions/4.1.1/Dockerfile b/Versions/4.1.1/Dockerfile
index 295a9d5..d658a0a 100644
--- a/Versions/4.1.1/Dockerfile
+++ b/Versions/4.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
diff --git a/Versions/4.1.2/Dockerfile b/Versions/4.1.2/Dockerfile
index d6c6868..d5e66a5 100644
--- a/Versions/4.1.2/Dockerfile
+++ b/Versions/4.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
diff --git a/Versions/4.1/Dockerfile b/Versions/4.1/Dockerfile
index d7cec5d..b5ca758 100644
--- a/Versions/4.1/Dockerfile
+++ b/Versions/4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
diff --git a/Versions/4.2/Dockerfile b/Versions/4.2/Dockerfile
index 80b0335..db771cd 100644
--- a/Versions/4.2/Dockerfile
+++ b/Versions/4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 # Install related packages and set LLVM 3.9 as the compiler
diff --git a/Versions/5.0/Dockerfile b/Versions/5.0/Dockerfile
index ec6a6fd..c84e3eb 100644
--- a/Versions/5.0/Dockerfile
+++ b/Versions/5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.1/Dockerfile b/Versions/5.1/Dockerfile
index 6faa693..1a47fa8 100644
--- a/Versions/5.1/Dockerfile
+++ b/Versions/5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.2/Dockerfile b/Versions/5.2/Dockerfile
index 083f51f..2b5b736 100644
--- a/Versions/5.2/Dockerfile
+++ b/Versions/5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.3.1/Dockerfile b/Versions/5.3.1/Dockerfile
index 06cb472..3b393dd 100644
--- a/Versions/5.3.1/Dockerfile
+++ b/Versions/5.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.3.2/Dockerfile b/Versions/5.3.2/Dockerfile
index 5d4cb28..c2cfc93 100644
--- a/Versions/5.3.2/Dockerfile
+++ b/Versions/5.3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.3.3/Dockerfile b/Versions/5.3.3/Dockerfile
index 9796790..99fe25e 100644
--- a/Versions/5.3.3/Dockerfile
+++ b/Versions/5.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.3/Dockerfile b/Versions/5.3/Dockerfile
index 81daafd..14d2bd7 100644
--- a/Versions/5.3/Dockerfile
+++ b/Versions/5.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.4.1/Dockerfile b/Versions/5.4.1/Dockerfile
index 4679d90..771d085 100644
--- a/Versions/5.4.1/Dockerfile
+++ b/Versions/5.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.4.2/Dockerfile b/Versions/5.4.2/Dockerfile
index 7e87210..9fe9f26 100644
--- a/Versions/5.4.2/Dockerfile
+++ b/Versions/5.4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.4.3/Dockerfile b/Versions/5.4.3/Dockerfile
index e3e4a37..006cb1e 100644
--- a/Versions/5.4.3/Dockerfile
+++ b/Versions/5.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.4/Dockerfile b/Versions/5.4/Dockerfile
index 4625d00..2ca1d04 100644
--- a/Versions/5.4/Dockerfile
+++ b/Versions/5.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:24.04
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.5/Dockerfile b/Versions/5.5/Dockerfile
index 6dd2a7c..8538842 100644
--- a/Versions/5.5/Dockerfile
+++ b/Versions/5.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.6/Dockerfile b/Versions/5.6/Dockerfile
index d03a41c..49d8c58 100644
--- a/Versions/5.6/Dockerfile
+++ b/Versions/5.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
diff --git a/Versions/5.7.2/Dockerfile b/Versions/5.7.2/Dockerfile
index 0cfbee8..7ba91bc 100644
--- a/Versions/5.7.2/Dockerfile
+++ b/Versions/5.7.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 LABEL maintainer="Swift Infrastructure <swift-infrastructure@forums.swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
diff --git a/Versions/5.7/Dockerfile b/Versions/5.7/Dockerfile
index a1a7228..b6bffdf 100644
--- a/Versions/5.7/Dockerfile
+++ b/Versions/5.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 LABEL maintainer="Swift Infrastructure <swift-infrastructure@forums.swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
diff --git a/Versions/5.8/Dockerfile b/Versions/5.8/Dockerfile
index 0641d64..3371b03 100644
--- a/Versions/5.8/Dockerfile
+++ b/Versions/5.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="Swift Infrastructure <swift-infrastructure@forums.swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
diff --git a/Versions/5.9/Dockerfile b/Versions/5.9/Dockerfile
index ad698ff..877a369 100644
--- a/Versions/5.9/Dockerfile
+++ b/Versions/5.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="Swift Infrastructure <swift-infrastructure@forums.swift.org>"
 LABEL description="Docker Container for the Swift programming language"