diff --git a/.github/workflows/base.yaml b/.github/workflows/base.yaml
index 7f573a0..818ceef 100644
--- a/.github/workflows/base.yaml
+++ b/.github/workflows/base.yaml
@@ -18,6 +18,8 @@ jobs:
         base_image_vsn:
           - "5.0"
         platform:
+          - [ubuntu24.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
+          - [ubuntu24.04, linux/amd64, [self-hosted, linux, arm64, ephemeral]]
           - [ubuntu22.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
           - [ubuntu22.04, linux/arm64, [self-hosted, linux, arm64, ephemeral]]
           - [ubuntu20.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 1e2ff26..6404d40 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -37,6 +37,8 @@ jobs:
         base_image_vsn:
           - "5.0"
         platform:
+          - [ubuntu24.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
+          - [ubuntu24.04, linux/arm64, [self-hosted, linux, arm64, ephemeral]]
           - [ubuntu22.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
           - [ubuntu22.04, linux/arm64, [self-hosted, linux, arm64, ephemeral]]
           - [ubuntu20.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
@@ -122,7 +124,8 @@ jobs:
         otp: ${{ fromJSON(needs.prepare.outputs.otp) }}
         elixir: ${{ fromJSON(needs.prepare.outputs.elixir) }}
         platform:
-          - [ubuntu22.04fdb, linux/amd64, [self-hosted, linux, x64, ephemeral]]
+          - [ubuntu24.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
+          - [ubuntu24.04, linux/arm64, [self-hosted, linux, arm64, ephemeral]]
           - [ubuntu22.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
           - [ubuntu22.04, linux/arm64, [self-hosted, linux, arm64, ephemeral]]
           - [ubuntu20.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
@@ -220,15 +223,13 @@ jobs:
         otp: ${{ fromJSON(needs.prepare.outputs.otp) }}
         elixir: ${{ fromJSON(needs.prepare.outputs.elixir) }}
         platform:
-          - ubuntu22.04fdb
+          - ubuntu24.04
           - ubuntu22.04
           - ubuntu20.04
           - ubuntu18.04
-          - ubuntu16.04
           - debian12
           - debian11
           - debian10
-          - debian9
           - el9
           - el8
           - el7
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2c06a47..e8a402c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -55,6 +55,8 @@ jobs:
         otp: ${{ fromJSON(needs.prepare.outputs.otp) }}
         elixir: ${{ fromJSON(needs.prepare.outputs.elixir) }}
         platform:
+          - [ubuntu24.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
+          - [ubuntu24.04, linux/arm64, [self-hosted, linux, arm64, ephemeral]]
           - [ubuntu22.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
           - [ubuntu22.04, linux/arm64, [self-hosted, linux, arm64, ephemeral]]
           - [ubuntu20.04, linux/amd64, [self-hosted, linux, x64, ephemeral]]
diff --git a/Makefile b/Makefile
index 567af79..c806e85 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-IMAGES = alpine3.15 amzn2 amzn2023 debian10 debian11 debian12 el7 el8 el9 ubuntu18.04 ubuntu20.04 ubuntu22.04
+IMAGES = alpine3.15 amzn2 amzn2023 debian10 debian11 debian12 el7 el8 el9 ubuntu18.04 ubuntu20.04 ubuntu22.04 ubuntu24.04
 
 .PHONY: all
 all: $(IMAGES)
diff --git a/get-fdb.sh b/get-fdb.sh
index 06ba7a6..869ee17 100755
--- a/get-fdb.sh
+++ b/get-fdb.sh
@@ -36,7 +36,7 @@ elif [[ "${ID:-}" =~ debian|ubuntu ]]; then
     ARCH=$(dpkg --print-architecture)
     SYSTEM="${ID}${VERSION_ID}"
     case ${SYSTEM} in
-        debian11 | debian12 | ubuntu20.04 | ubuntu22.04)
+        debian11 | debian12 | ubuntu20.04 | ubuntu22.04 | ubuntu24.04)
             wget "${BASE_URL}/foundationdb-clients_${FDB_VERSION}-1_${ARCH}.deb" -O foundationdb-clients.deb
             dpkg -i foundationdb-clients.deb
             rm foundationdb-clients.deb
diff --git a/ubuntu24.04/Dockerfile b/ubuntu24.04/Dockerfile
new file mode 100644
index 0000000..706cdc0
--- /dev/null
+++ b/ubuntu24.04/Dockerfile
@@ -0,0 +1,58 @@
+ARG BUILD_FROM=public.ecr.aws/ubuntu/ubuntu:24.04
+FROM ${BUILD_FROM}
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y \
+    apt-transport-https \
+    autoconf \
+    automake \
+    autotools-dev \
+    bison \
+    build-essential \
+    ca-certificates \
+    cmake \
+    curl \
+    debhelper \
+    expect \
+    flex \
+    git \
+    inotify-tools \
+    jq \
+    krb5-admin-server \
+    krb5-kdc \
+    libffi-dev \
+    libkrb5-3 \
+    libkrb5-dev \
+    libncurses5-dev \
+    libsasl2-2 \
+    libsasl2-dev \
+    libsasl2-modules-gssapi-mit \
+    libssl-dev \
+    libtool \
+    python3 \
+    python3-pip \
+    software-properties-common \
+    unixodbc \
+    unixodbc-dev \
+    unzip \
+    vim \
+    wget \
+    zip \
+    zlib1g-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN ln -sf /usr/bin/python3 /usr/bin/python && \
+    ln -sf /usr/bin/pip3 /usr/bin/pip
+
+RUN cmake --version
+
+WORKDIR /
+
+# Elixir complains if runs without UTF-8
+ENV LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8
+
+WORKDIR /
+CMD [ "/bin/bash" ]