diff --git a/scripts/ci/build-debian-packages.sh b/scripts/ci/build-debian-packages.sh
index c6f8c99182cceddb2df2ae404bf43ddf9cc118c6..95fd2abc82f1416122bbc1fe08a53cdbfa1e0594 100755
--- a/scripts/ci/build-debian-packages.sh
+++ b/scripts/ci/build-debian-packages.sh
@@ -13,11 +13,13 @@ export BLST_PORTABLE=true
 cp -a ./* /root/tezos/
 cd /root/tezos/
 
+export DEBEMAIL="contact@nomadic-labs.com"
+
 if [ -n "${gitlab_release_no_v:-}" ]; then
   DEBVERSION=$gitlab_release_no_v
   DEBCHANGELOG="New Release $gitlab_release_no_v / $CI_COMMIT_SHORT_SHA"
 else
-  DEBVERSION=$(date +'%Y%m%d%h%m')+$CI_COMMIT_SHORT_SHA
+  DEBVERSION=$(date +'%Y%m%d%H%M')+$CI_COMMIT_SHORT_SHA
   DEBCHANGELOG="Test package commit $CI_COMMIT_REF_NAME"
 fi
 
diff --git a/scripts/packaging/build-deb-local.sh b/scripts/packaging/build-deb-local.sh
index 560cf05566f67360ce0716e907584eaecd3d52fe..60174954b852a34b60652b44d778debba008fc93 100755
--- a/scripts/packaging/build-deb-local.sh
+++ b/scripts/packaging/build-deb-local.sh
@@ -12,7 +12,11 @@ make all
 mkdir -p scripts/packaging/octez/binaries
 mkdir -p scripts/packaging/octez/zcash-params
 rm -Rf scripts/packaging/octez/binaries/*
-cp octez-* scripts/packaging/octez/binaries/
+
+EXECUTABLES=$(cat script-inputs/*-executables)
+for ex in $EXECUTABLES; do
+  cp "$ex" scripts/packaging/octez/binaries/
+done
 
 # Copy the zcash parametes to be packaged
 cp -a _opam/share/zcash-params scripts/packaging/octez/