diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index ab603cd9ea4..1dff4b1a2d4 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -104,6 +104,17 @@ RUN arch=${TARGETARCH:-amd64} \
   && dpkg -i /tmp/nfpm.deb \
   && rm /tmp/nfpm.deb
 
+ARG GO_VERSION=1.18.3
+# We need go for clickhouse-diagnostics
+RUN arch=${TARGETARCH:-amd64} \
+  && curl -Lo /tmp/go.tgz "https://go.dev/dl/go${GO_VERSION}.linux-${arch}.tar.gz" \
+  && tar -xzf /tmp/go.tgz -C /usr/local/ \
+  && rm /tmp/go.tgz
+
+ENV PATH="$PATH:/usr/local/go/bin"
+ENV GOPATH=/workdir/go
+ENV GOCACHE=/workdir/
+
 RUN mkdir /workdir && chmod 777 /workdir
 WORKDIR /workdir
 
diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index b8d11e9c293..270c93c105c 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -29,8 +29,21 @@ env
 
 if [ -n "$MAKE_DEB" ]; then
   rm -rf /build/packages/root
+  if [ -z "$SANITIZER" ]; then
+    # We need to check if clickhouse-diagnostics is fine and build it
+    (
+      cd /build/programs/diagnostics
+      make test-no-docker
+      GOARCH="${DEB_ARCH}" CGO_ENABLED=0 make VERSION="$VERSION_STRING" build
+      mv clickhouse-diagnostics ..
+    )
+  else
+    echo -e "#!/bin/sh\necho 'Not implemented for this type of package'" > /build/programs/clickhouse-diagnostics
+    chmod +x /build/programs/clickhouse-diagnostics
+  fi
 fi
 
+
 cache_status
 # clear cache stats
 ccache --zero-stats ||:
@@ -81,6 +94,8 @@ if [ -n "$MAKE_DEB" ]; then
   # No quotes because I want it to expand to nothing if empty.
   # shellcheck disable=SC2086
   DESTDIR=/build/packages/root ninja $NINJA_FLAGS install
+  cp /build/programs/clickhouse-diagnostics /build/packages/root/usr/bin
+  cp /build/programs/clickhouse-diagnostics /output
   bash -x /build/packages/build
 fi
 
diff --git a/packages/clickhouse-common-static.yaml b/packages/clickhouse-common-static.yaml
index 269d4318e5e..527b6a24703 100644
--- a/packages/clickhouse-common-static.yaml
+++ b/packages/clickhouse-common-static.yaml
@@ -29,12 +29,14 @@ description: |
 contents:
 - src: root/usr/bin/clickhouse
   dst: /usr/bin/clickhouse
-- src: root/usr/bin/clickhouse-odbc-bridge
-  dst: /usr/bin/clickhouse-odbc-bridge
-- src: root/usr/bin/clickhouse-library-bridge
-  dst: /usr/bin/clickhouse-library-bridge
+- src: root/usr/bin/clickhouse-diagnostics
+  dst: /usr/bin/clickhouse-diagnostics
 - src: root/usr/bin/clickhouse-extract-from-config
   dst: /usr/bin/clickhouse-extract-from-config
+- src: root/usr/bin/clickhouse-library-bridge
+  dst: /usr/bin/clickhouse-library-bridge
+- src: root/usr/bin/clickhouse-odbc-bridge
+  dst: /usr/bin/clickhouse-odbc-bridge
 - src: root/usr/share/bash-completion/completions
   dst: /usr/share/bash-completion/completions
 # docs