diff --git a/.templates/00-global_var.sh b/.templates/00-global_var.sh
index 45743d7fc..fbba9240f 100644
--- a/.templates/00-global_var.sh
+++ b/.templates/00-global_var.sh
@@ -11,7 +11,7 @@ JSONSOURCE="/data/options.json"
 # Export keys as env variables
 # echo "All addon options were exported as variables"
 mapfile -t arr < <(jq -r 'keys[]' ${JSONSOURCE})
-for KEYS in ${arr[@]}; do
+for KEYS in "${arr[@]}"; do
   # export key
   VALUE=$(jq ."$KEYS" ${JSONSOURCE})
   line="${KEYS}=${VALUE//[\"\']/}"
@@ -26,7 +26,7 @@ done
 ################
 # Set timezone #
 ################
-if [ -n "TZ" ] && [ -f /etc/localtime ]; then
+if [ -n "$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
diff --git a/.templates/19-json_repair.sh b/.templates/19-json_repair.sh
index bd9fcb787..b62dac164 100644
--- a/.templates/19-json_repair.sh
+++ b/.templates/19-json_repair.sh
@@ -22,7 +22,7 @@ if [ -f ${JSONTOCHECK} ]; then
     mapfile -t arr < <(jq -r 'keys[]' ${JSONSOURCE})
 
     # Check if all keys are still there, or add them
-    for KEYS in ${arr[@]}; do
+    for KEYS in "${arr[@]}"; do
         # Check if key exists
         KEYSTHERE=$(jq "has(\"${KEYS}\")" ${JSONTOCHECK})
         if [ $KEYSTHERE != "true" ]; then
diff --git a/transmission/rootfs/etc/cont-init.d/19-json_repair.sh b/transmission/rootfs/etc/cont-init.d/19-json_repair.sh
index bd9fcb787..b62dac164 100644
--- a/transmission/rootfs/etc/cont-init.d/19-json_repair.sh
+++ b/transmission/rootfs/etc/cont-init.d/19-json_repair.sh
@@ -22,7 +22,7 @@ if [ -f ${JSONTOCHECK} ]; then
     mapfile -t arr < <(jq -r 'keys[]' ${JSONSOURCE})
 
     # Check if all keys are still there, or add them
-    for KEYS in ${arr[@]}; do
+    for KEYS in "${arr[@]}"; do
         # Check if key exists
         KEYSTHERE=$(jq "has(\"${KEYS}\")" ${JSONTOCHECK})
         if [ $KEYSTHERE != "true" ]; then