diff --git a/Makefile b/Makefile
index a067414c0..c84d22dee 100644
--- a/Makefile
+++ b/Makefile
@@ -307,7 +307,7 @@ amd64-centos: centos7 centos7-dbg centos8 centos8-clang centos8-dbg centos9 cent
 amd64-debian: debian10 debian10-dbg debian11 debian11-clang debian11-dbg debian12 debian12-clang debian12-dbg
 amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
-amd64-ubuntu: ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg
+amd64-ubuntu: ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
 
 arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux
 arm64-almalinux: almalinux8 almalinux9
@@ -315,7 +315,7 @@ arm64-centos: centos7 centos8 centos9
 arm64-debian: debian10 debian11 debian12
 arm64-fedora: fedora38 fedora39
 arm64-opensuse: opensuse15
-arm64-ubuntu: ubuntu16 ubuntu18 ubuntu20 ubuntu22
+arm64-ubuntu: ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24
 
 almalinux%: build-almalinux% ;
 centos%: build-centos% ;
diff --git a/docker-compose.yml b/docker-compose.yml
index dc1935562..eede1f428 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -319,6 +319,33 @@ services:
       - PKG_RELEASE=dbg-ubuntu22
       - PROXYSQL_BUILD_TYPE=debug
 
+####################################################################################################
+  ubuntu24_build:
+    extends:
+      service: _build
+    image: proxysql/packaging:build-ubuntu24
+    volumes:
+      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
+      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - PKG_RELEASE=ubuntu24
+      - PROXYSQL_BUILD_TYPE=clickhouse
+
+  ubuntu24_clang_build:
+    extends:
+      service: ubuntu24_build
+    image: proxysql/packaging:build-clang-ubuntu24
+    environment:
+      - PKG_RELEASE=ubuntu24-clang
+
+  ubuntu24_dbg_build:
+    extends:
+      service: ubuntu24_build
+    environment:
+      - PKG_RELEASE=dbg-ubuntu24
+      - PROXYSQL_BUILD_TYPE=debug
+
 ####################################################################################################
 ####################################################################################################
   opensuse15_build: