diff --git a/samba/Dockerfile b/samba/Dockerfile
index 889e940..92900de 100644
--- a/samba/Dockerfile
+++ b/samba/Dockerfile
@@ -20,5 +20,9 @@ COPY rootfs /
 # Modules
 ARG MODULES="00-local_mounts.sh"
 
+# Automatic modules download
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
+RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
+
 HEALTHCHECK \
     CMD smbclient -L '\\localhost' -U '%' -m SMB3