diff --git a/setup/01_install_commits.sh b/setup/01_install_commits.sh
index a8fe8f0c..05984347 100644
--- a/setup/01_install_commits.sh
+++ b/setup/01_install_commits.sh
@@ -6,11 +6,11 @@ NODEREPO="node_10.x"
 MONGODB="3.6"
 CODENAME=`lsb_release -c -s`
 
-WILDDUCK_COMMIT="c7da95e5cb81fafdca0d45ac82c3259daedb8c2d"
+WILDDUCK_COMMIT="29dfd6c55db6148674c0834dfd8744141705c1c2"
 ZONEMTA_COMMIT="fad9d3f0f8e1568e8eeb4a72791fab24d1f245d7" # zone-mta-template
 WEBMAIL_COMMIT="221783539bd4382917d750989bb2ab425804f80a"
-WILDDUCK_ZONEMTA_COMMIT="e58db2e431669cf63454c530620176b6d387b364"
-WILDDUCK_HARAKA_COMMIT="cd37af59b78ffb07118a86fbaf6d95508b98cf68"
-HARAKA_VERSION="2.8.20"
+WILDDUCK_ZONEMTA_COMMIT="02b1d02d8a7c6c9017733e5619be18b7c1719488"
+WILDDUCK_HARAKA_COMMIT="14db1ceed857f8616094cfd2f52b6b58bf413173"
+HARAKA_VERSION="2.8.21"
 
 echo -e "\n-- Executing ${ORANGE}${OURNAME}${NC} subscript --"