diff --git a/setup/01_install_commits.sh b/setup/01_install_commits.sh
index b701396f..4dfdbf8c 100755
--- a/setup/01_install_commits.sh
+++ b/setup/01_install_commits.sh
@@ -2,15 +2,15 @@
 
 OURNAME=01_install_commits.sh
 
-NODEREPO="node_14.x"
+NODEREPO="node_16.x"
 MONGODB="4.4"
 CODENAME=`lsb_release -c -s`
 
-WILDDUCK_COMMIT="90eeda683a58ebc6b7b741fb471ca05be9b42395"
-ZONEMTA_COMMIT="7a45524789fd7063792f52f6c22620184056d8b4" # zone-mta-template
+WILDDUCK_COMMIT="cf624823f92ce6a1f4c069500f068aaf0113923b"
+ZONEMTA_COMMIT="a08d064e6a50ea59ca4be3b8e541f2ba279a16a9" # zone-mta-template
 WEBMAIL_COMMIT="3371984a32a7942d7859c3fcde923cf62484e7fa"
-WILDDUCK_ZONEMTA_COMMIT="cc41a65828762d1c25983d0894e2f1280f8f7962"
-WILDDUCK_HARAKA_COMMIT="aa07652ce84f0c8983ed1e095762c19855269f38"
+WILDDUCK_ZONEMTA_COMMIT="05cc573da50d63abff2fd0b17cab483b21729fb7"
+WILDDUCK_HARAKA_COMMIT="517a6d5d5e16e7a70f397a67ca99207434831a08"
 HARAKA_VERSION="2.8.27"
 
 echo -e "\n-- Executing ${ORANGE}${OURNAME}${NC} subscript --"