diff --git a/packaging/build-config.json b/packaging/build-config.json
index e276f34858f..27b5d2e8671 100644
--- a/packaging/build-config.json
+++ b/packaging/build-config.json
@@ -92,6 +92,14 @@
           "target": "ubuntu/22.04.arm64v8",
           "type": "deb"
         },
+        {
+          "target": "ubuntu/24.04",
+          "type": "deb"
+        },
+        {
+          "target": "ubuntu/24.04.arm64v8",
+          "type": "deb"
+        },
         {
           "target": "raspbian/buster",
           "type": "deb"
diff --git a/packaging/distros/ubuntu/Dockerfile b/packaging/distros/ubuntu/Dockerfile
index 40272f8fcd7..2ca0704580e 100644
--- a/packaging/distros/ubuntu/Dockerfile
+++ b/packaging/distros/ubuntu/Dockerfile
@@ -114,6 +114,32 @@ ENV DEBIAN_FRONTEND noninteractive
 
 COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
 
+# hadolint ignore=DL3008,DL3015
+RUN apt-get update && \
+    apt-get install -y curl ca-certificates build-essential libsystemd-dev \
+    cmake make bash wget unzip nano vim valgrind dh-make flex bison \
+    libpq-dev postgresql-server-dev-all libpq5 \
+    libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \
+    apt-get install -y --reinstall lsb-base lsb-release
+
+    # ubuntu/24.04 base image
+FROM ubuntu:24.04 as ubuntu-24.04-base
+ENV DEBIAN_FRONTEND noninteractive
+
+# hadolint ignore=DL3008,DL3015
+RUN apt-get update && \
+    apt-get install -y curl ca-certificates build-essential libsystemd-dev \
+    cmake make bash wget unzip nano vim valgrind dh-make flex bison \
+    libpq-dev postgresql-server-dev-all libpq5 \
+    libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \
+    apt-get install -y --reinstall lsb-base lsb-release
+
+# ubuntu/24.04.arm64v8 base image
+FROM arm64v8/ubuntu:24.04 as ubuntu-24.04.arm64v8-base
+ENV DEBIAN_FRONTEND noninteractive
+
+COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
+
 # hadolint ignore=DL3008,DL3015
 RUN apt-get update && \
     apt-get install -y curl ca-certificates build-essential libsystemd-dev \
diff --git a/packaging/update-repos.sh b/packaging/update-repos.sh
index a4d711e950c..ea7acacff7c 100755
--- a/packaging/update-repos.sh
+++ b/packaging/update-repos.sh
@@ -54,6 +54,7 @@ DEB_REPO_PATHS=( "debian/bookworm"
                  "ubuntu/bionic"
                  "ubuntu/focal"
                  "ubuntu/jammy"
+                 "ubuntu/noble"
                  "raspbian/buster"
                  "raspbian/bullseye" )