diff --git a/build/packages/deb/files b/build/packages/deb/files
index 06b79165991..15052226b31 100644
--- a/build/packages/deb/files
+++ b/build/packages/deb/files
@@ -52,3 +52,4 @@ install -m 0660 example-queries-postgres.yml $RPM_BUILD_ROOT/usr/local/percona/p
 install -m 0660 example-queries-postgres.yml $RPM_BUILD_ROOT/usr/local/percona/pmm2/collectors/custom-queries/postgresql/medium-resolution/
 install -m 0660 example-queries-postgres.yml $RPM_BUILD_ROOT/usr/local/percona/pmm2/collectors/custom-queries/postgresql/high-resolution/
 install -m 0660 queries-postgres-uptime.yml $RPM_BUILD_ROOT/usr/local/percona/pmm2/collectors/custom-queries/postgresql/high-resolution/
+install -m 0660 queries.yaml $RPM_BUILD_ROOT/usr/local/percona/pmm2/collectors/custom-queries/postgresql/medium-resolution/
diff --git a/build/packages/deb/install b/build/packages/deb/install
index db4f57fe31c..2f02ed6f749 100644
--- a/build/packages/deb/install
+++ b/build/packages/deb/install
@@ -23,3 +23,4 @@ example-queries-postgres.yml /usr/local/percona/pmm2/collectors/custom-queries/p
 example-queries-postgres.yml /usr/local/percona/pmm2/collectors/custom-queries/postgresql/medium-resolution/
 example-queries-postgres.yml /usr/local/percona/pmm2/collectors/custom-queries/postgresql/high-resolution/
 queries-postgres-uptime.yml /usr/local/percona/pmm2/collectors/custom-queries/postgresql/high-resolution/
+queries.yaml /usr/local/percona/pmm2/collectors/custom-queries/postgresql/medium-resolution/
diff --git a/build/packages/deb/rules b/build/packages/deb/rules
index 9d0f552f377..67ed642f6bc 100644
--- a/build/packages/deb/rules
+++ b/build/packages/deb/rules
@@ -62,6 +62,7 @@ override_dh_auto_install:
 	cp -f distro/queries-mysqld-group-replication.yml $(TMP)/queries-mysqld-group-replication.yml
 	cp -f distro/example-queries-postgres.yml $(TMP)/example-queries-postgres.yml
 	cp -f distro/queries-postgres-uptime.yml $(TMP)/queries-postgres-uptime.yml
+	cp -f distro/queries.yaml $(TMP)/queries.yaml
 	cp -f distro/pt-summary $(TMP)/pt-summary
 	cp -f distro/pt-mysql-summary $(TMP)/pt-mysql-summary
 	cp -f distro/pt-mongodb-summary $(TMP)/pt-mongodb-summary
diff --git a/build/scripts/build-client-packages b/build/scripts/build-client-packages
index a6206370514..8c8bf5a2642 100755
--- a/build/scripts/build-client-packages
+++ b/build/scripts/build-client-packages
@@ -360,6 +360,7 @@ build_source_deb(){
     mv queries-mysqld-group-replication.yml ../${NAME}-${VERSION}_all/distro/
     mv example-queries-postgres.yml ../${NAME}-${VERSION}_all/distro/
     mv queries-postgres-uptime.yml ../${NAME}-${VERSION}_all/distro/
+    mv queries.yaml ../${NAME}-${VERSION}_all/distro/
     mv debian ../${NAME}-${VERSION}_all/
     mv config/pmm-agent.service ../${NAME}-${VERSION}_all/debian/pmm2-client.pmm-agent.service
     cd ../
diff --git a/build/scripts/build-client-sdeb b/build/scripts/build-client-sdeb
index 45e75ffb95f..1ee70d57f39 100755
--- a/build/scripts/build-client-sdeb
+++ b/build/scripts/build-client-sdeb
@@ -18,7 +18,7 @@ main() {
         OS_VERSION=\$(cat /etc/os-release | grep VERSION_ID | awk -F'\"' '{print \$2}')
 
         apt-get update
-        apt-get -y install git lsb-release devscripts dh-make dh-systemd
+        DEBIAN_FRONTEND=noninteractive apt-get -y install git lsb-release devscripts dh-make dh-systemd
         mkdir -p /tmp/pmm
         cd /home/builder/results
             bash /home/builder/bin/build-client-packages \