diff --git a/.templates/01-config_yaml.sh b/.templates/01-config_yaml.sh
index 946b40a6d..646209562 100755
--- a/.templates/01-config_yaml.sh
+++ b/.templates/01-config_yaml.sh
@@ -178,6 +178,9 @@ while IFS= read -r line; do
         # set environment
         mkdir -p /etc
         echo "$line" >> /etc/environment
+        # Export to entrypoint
+        if [ -f /entrypoint.sh ]; then sed -i "1a export $line" /entrypoint.sh 2> /dev/null; fi
+        if [ -f /*/entrypoint.sh ]; then sed -i "1a export $line" /*/entrypoint.sh 2> /dev/null; fi
         # Export to scripts
         if cat /etc/services.d/*/*run* &> /dev/null; then sed -i "1a export $line" /etc/services.d/*/*run* 2> /dev/null; fi
         if cat /etc/cont-init.d/*run* &> /dev/null; then sed -i "1a export $line" /etc/cont-init.d/*run* 2> /dev/null; fi