diff --git a/Makefile b/Makefile
index 614811ba9..3aa621028 100644
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,7 @@ amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensu
 amd64-centos: centos6 centos6-dbg centos7 centos7-dbg centos8 centos8-clang centos8-dbg
 .PHONY: amd64-centos
 
-amd64-ubuntu: ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg
+amd64-ubuntu: ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg
 .PHONY: amd64-ubuntu
 
 amd64-debian: debian8 debian8-dbg debian9 debian9-dbg debian10 debian10-dbg debian11 debian11-clang debian11-dbg
@@ -223,7 +223,7 @@ arm64-centos: centos7-arm64 centos8-arm64
 arm64-debian: debian9-arm64 debian10-arm64 debian11-arm64
 .PHONY: arm64-debian
 
-arm64-ubuntu: ubuntu16-arm64 ubuntu18-arm64 ubuntu20-arm64
+arm64-ubuntu: ubuntu16-arm64 ubuntu18-arm64 ubuntu20-arm64 ubuntu22-arm64
 .PHONY: arm64-ubuntu
 
 arm64-fedora: fedora33-arm64 fedora34-arm64
@@ -346,6 +346,19 @@ ubuntu20-dbg: binaries/proxysql_${CURVER}-dbg-ubuntu20_amd64.deb
 .PHONY: ubuntu20-dbg
 
 
+ubuntu22: binaries/proxysql_${CURVER}-ubuntu22_amd64.deb
+.PHONY: ubuntu22
+
+ubuntu22-clang: binaries/proxysql_${CURVER}-ubuntu22-clang_amd64.deb
+.PHONY: ubuntu22-clang
+
+ubuntu22-arm64: binaries/proxysql_${CURVER}-ubuntu22_arm64.deb
+.PHONY: ubuntu22-arm64
+
+ubuntu22-dbg: binaries/proxysql_${CURVER}-dbg-ubuntu22_amd64.deb
+.PHONY: ubuntu22-dbg
+
+
 debian8: binaries/proxysql_${CURVER}-debian8_amd64.deb
 .PHONY: debian8
 
@@ -552,6 +565,23 @@ binaries/proxysql_${CURVER}-ubuntu20_arm64.deb:
 	docker-compose rm -f
 
 
+binaries/proxysql_${CURVER}-dbg-ubuntu22_amd64.deb:
+	docker-compose up ubuntu22_dbg_build
+	docker-compose rm -f
+
+binaries/proxysql_${CURVER}-ubuntu22_amd64.deb:
+	docker-compose up ubuntu22_build
+	docker-compose rm -f
+
+binaries/proxysql_${CURVER}-ubuntu22-clang_amd64.deb:
+	docker-compose up ubuntu22_clang_build
+	docker-compose rm -f
+
+binaries/proxysql_${CURVER}-ubuntu22_arm64.deb:
+	docker-compose up ubuntu22_build
+	docker-compose rm -f
+
+
 binaries/proxysql_${CURVER}-debian8_amd64.deb:
 	docker-compose up debian8_build
 	docker-compose rm -f
diff --git a/docker-compose.yml b/docker-compose.yml
index 9f605f70f..364e45fd0 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -512,6 +512,51 @@ services:
     command:
       - /opt/entrypoint/entrypoint.bash
 
+  ubuntu22_build:
+    image: proxysql/packaging:build-ubuntu22
+    volumes:
+      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
+      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - MAKE
+      - MAKEOPT
+      - CURVER
+      - PKG_RELEASE=ubuntu22
+      - PROXYSQL_BUILD_TYPE=clickhouse
+    command:
+      - /opt/entrypoint/entrypoint.bash
+
+  ubuntu22_clang_build:
+    image: proxysql/packaging:build-clang-ubuntu22
+    volumes:
+      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
+      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - MAKE
+      - MAKEOPT
+      - CURVER
+      - PKG_RELEASE=ubuntu22-clang
+      - PROXYSQL_BUILD_TYPE=clickhouse
+    command:
+      - /opt/entrypoint/entrypoint.bash
+
+  ubuntu22_dbg_build:
+    image: proxysql/packaging:build-ubuntu22
+    volumes:
+      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
+      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - MAKE
+      - MAKEOPT
+      - CURVER
+      - PKG_RELEASE=dbg-ubuntu22
+      - PROXYSQL_BUILD_TYPE=debug
+    command:
+      - /opt/entrypoint/entrypoint.bash
+
 
   opensuse15_build:
     image: proxysql/packaging:build-opensuse15
diff --git a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
index 36880e2b7..d53de4d74 100755
--- a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
@@ -55,7 +55,11 @@ cp -r ../systemd ./systemd
 DEB_BUILD_OPTIONS=nostrip equivs-build proxysql.ctl
 cp ./proxysql_${CURVER}_${ARCH}.deb ../binaries/proxysql_${CURVER}-${PKG_RELEASE}_${ARCH}.deb
 # get SHA1 of the packaged executable
-ar -p proxysql_${CURVER}_${ARCH}.deb data.tar.xz | unxz -c - | tar xvf - ./usr/bin/proxysql -O > tmp/proxysql
+if [[ -x $(command -v unzstd) ]]; then
+	ar -p proxysql_${CURVER}_${ARCH}.deb $(ar t proxysql_${CURVER}_${ARCH}.deb | grep data.tar) | unzstd -c - | tar xvf - ./usr/bin/proxysql -O > tmp/proxysql
+else
+	ar -p proxysql_${CURVER}_${ARCH}.deb $(ar t proxysql_${CURVER}_${ARCH}.deb | grep data.tar) | unxz -c - | tar xvf - ./usr/bin/proxysql -O > tmp/proxysql
+fi
 sha1sum tmp/proxysql | sed 's|tmp/||' | tee tmp/proxysql.sha1
 cp tmp/proxysql.sha1 ../binaries/proxysql_${CURVER}-${PKG_RELEASE}_${ARCH}.id-hash
 popd