diff --git a/.gitignore b/.gitignore
index c415418cf..66f83bf6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,22 +5,19 @@ core
 *.so
 *.d
 !**/bash_completion.d
-!**/logrotate.d
-!**/keydb.service.d
-!**/keydb-sentinel.service.d
 *.log
 dump.rdb
 src/keydb-pro-server
-bin/keydb-pro-server
-app/keydb-pro-server
+**/bin/keydb-pro-server
+**/app/keydb-pro-server
 *.deb
 *.rpm
 src/keydb-cli
-bin/keydb-cli
-app/keydb-cli
+**/bin/keydb-cli
+**/app/keydb-cli
 src/keydb-sentinel
-bin/keydb-sentinel
-app/keydb-sentinel
+**/bin/keydb-sentinel
+**/app/keydb-sentinel
 redis-benchmark
 keydb-benchmark
 redis-check-aof
diff --git a/pkg/deb/deb-buildsource.sh b/pkg/deb/deb-buildsource.sh
index 998c6ca4b..94b774d8e 100755
--- a/pkg/deb/deb-buildsource.sh
+++ b/pkg/deb/deb-buildsource.sh
@@ -44,7 +44,12 @@ debuild -S -sa
 cd ../
 
 # create pbuilder chrooted environment and build the deb package
-sudo pbuilder create --distribution $codename
+if [ "$codename" == "xenial" ]; then
+        sudo pbuilder create --distribution $codename --othermirror "deb http://archive.ubuntu.com/ubuntu $codename universe multiverse"
+else
+        sudo pbuilder create --distribution $codename
+fi
+
 sudo pbuilder --update
 sudo pbuilder --build *.dsc  --logfile /mnt/pbuilderlog.log
 
diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control
index b02f1be4e..f847ad345 100644
--- a/pkg/deb/debian/control
+++ b/pkg/deb/debian/control
@@ -21,7 +21,12 @@ Build-Depends:
  autotools-dev <!nocheck>,
  autoconf <!nocheck>,
  libjemalloc-dev <!nocheck>,
- libssl-dev <!nocheck>
+ libssl-dev <!nocheck>,
+ libsnappy-dev <!nocheck>,
+ zlib1g-dev <!nocheck>,
+ libbz2-dev <!nocheck>,
+ liblz4-dev <!nocheck>,
+ libzstd-dev <!nocheck>
 Standards-Version: 4.2.1
 Homepage: https://docs.keydb.dev/
 Vcs-Git: https://github.com/JohnSully/KeyDB-Pro.git
diff --git a/pkg/rpm/keydb_build/keydb_rpm/usr/bin/keydb-cli b/pkg/rpm/keydb_build/keydb_rpm/usr/bin/keydb-cli
deleted file mode 100755
index 77760b391..000000000
Binary files a/pkg/rpm/keydb_build/keydb_rpm/usr/bin/keydb-cli and /dev/null differ
diff --git a/pkg/rpm/keydb_build/keydb_rpm/usr/bin/keydb-sentinel b/pkg/rpm/keydb_build/keydb_rpm/usr/bin/keydb-sentinel
deleted file mode 100755
index 1351a6645..000000000
Binary files a/pkg/rpm/keydb_build/keydb_rpm/usr/bin/keydb-sentinel and /dev/null differ