diff --git a/.templates/00-global_var.sh b/.templates/00-global_var.sh
index d538ccc97..fdcc47e07 100755
--- a/.templates/00-global_var.sh
+++ b/.templates/00-global_var.sh
@@ -46,10 +46,10 @@ for KEYS in "${arr[@]}"; do
     echo "$KEYS=\"$VALUE\"" >> /.env || true
     # set /etc/environment
     mkdir -p /etc
-    echo "$KEYS=$VALUE" >> /etc/environment
+    echo "$KEYS=\"$VALUE\"" >> /etc/environment
     # For non s6
-    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
+    if cat /etc/services.d/*/*run* &>/dev/null; then sed -i "1a export ${KEYS}=\"${VALUE}\"" /etc/services.d/*/*run* 2>/dev/null; fi
+    if cat /etc/cont-init.d/*run* &>/dev/null; then sed -i "1a export ${KEYS}=\"${VALUE}\"" /etc/cont-init.d/*run* 2>/dev/null; fi
     # For s6
     if [ -d /var/run/s6/container_environment ]; then printf "%s" "${VALUE}" > /var/run/s6/container_environment/"${KEYS}"; fi
     echo "export ${KEYS}=\"${VALUE}\"" >> ~/.bashrc