diff --git a/zzz_templates/automatic_packages.sh b/zzz_templates/automatic_packages.sh
index 87f350a8a..6b17c9610 100644
--- a/zzz_templates/automatic_packages.sh
+++ b/zzz_templates/automatic_packages.sh
@@ -61,7 +61,16 @@ if ls $files/*nginx* 1> /dev/null 2>&1; then
 [ $PACKMANAGER = "apk" ] && PACKAGES="$PACKAGES nginx"
 [ $PACKMANAGER = "apt" ] && PACKAGES="$PACKAGES nginx"
 fi
-done
+
+if [ $(grep -rnw "$files" -e 'git' &>/dev/null) ]; then
+[ $PACKMANAGER = "apk" ] && PACKAGES="$PACKAGES git"
+[ $PACKMANAGER = "apt" ] && PACKAGES="$PACKAGES git"
+fi
+
+if [ $(grep -rnw "$files" -e 'sponge' &>/dev/null) ]; then
+[ $PACKMANAGER = "apk" ] && PACKAGES="$PACKAGES moreutils"
+[ $PACKMANAGER = "apt" ] && PACKAGES="$PACKAGES moreutils"
+fi
 
 ####################
 # INSTALL ELEMENTS #