diff --git a/arpspoof/rootfs/scripts/00-global_var.sh b/arpspoof/rootfs/scripts/00-global_var.sh
index d27ecdea2..b20e367db 100644
--- a/arpspoof/rootfs/scripts/00-global_var.sh
+++ b/arpspoof/rootfs/scripts/00-global_var.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
 ###################################
 # Export all addon options as env #
@@ -15,6 +15,7 @@ for KEYS in ${arr[@]}; do
   VALUE=$(jq .$KEYS ${JSONSOURCE})
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
+  bashio::log.blue "$line" 2>/dev/null || echo "$line"
   export $line
   # Export the variable to run scripts
   line="${KEYS}=${VALUE//[\"\']/} &>/dev/null"
diff --git a/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh b/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh
index d27ecdea2..b20e367db 100644
--- a/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh
+++ b/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
 ###################################
 # Export all addon options as env #
@@ -15,6 +15,7 @@ for KEYS in ${arr[@]}; do
   VALUE=$(jq .$KEYS ${JSONSOURCE})
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
+  bashio::log.blue "$line" 2>/dev/null || echo "$line"
   export $line
   # Export the variable to run scripts
   line="${KEYS}=${VALUE//[\"\']/} &>/dev/null"
diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh b/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh
index 1b70524de..b20e367db 100644
--- a/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh
+++ b/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
 ###################################
 # Export all addon options as env #
@@ -13,7 +13,13 @@ mapfile -t arr < <(jq -r 'keys[]' ${JSONSOURCE})
 for KEYS in ${arr[@]}; do
   # export key
   VALUE=$(jq .$KEYS ${JSONSOURCE})
-  export ${KEYS}=${VALUE//[\"\']/} &>/dev/null
+  line="${KEYS}=${VALUE//[\"\']/}"
+  # Use locally
+  bashio::log.blue "$line" 2>/dev/null || echo "$line"
+  export $line
+  # Export the variable to run scripts
+  line="${KEYS}=${VALUE//[\"\']/} &>/dev/null"
+  sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run*
 done
 
 ################
@@ -23,7 +29,5 @@ if [ ! -z "TZ" ] && [ -f /etc/localtime ]; then
   if [ -f /usr/share/zoneinfo/$TZ ]; then
     echo "Timezone set from $(cat /etc/timezone) to $TZ"
     ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone
-  else
-    echo "WARNING : Timezone $TZ is invalid, it will be kept to default value of $(cat /etc/timezone)"
   fi
 fi