diff --git a/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh b/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh b/arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/arpspoof/rootfs/scripts/00-global_var.sh b/arpspoof/rootfs/scripts/00-global_var.sh
index 42e6d262c..b68e3f08b 100644
--- a/arpspoof/rootfs/scripts/00-global_var.sh
+++ b/arpspoof/rootfs/scripts/00-global_var.sh
@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
-  export 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*
diff --git a/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/bazarr/rootfs/etc/cont-init.d/20-folders.sh b/bazarr/rootfs/etc/cont-init.d/20-folders.sh
index b5a64e91e..ac8d1c7a5 100644
--- a/bazarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/bazarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 
 if [ ! -d /share/storage/movies ]; then
   echo "Creating /share/storage/movies"
@@ -6,6 +6,12 @@ if [ ! -d /share/storage/movies ]; then
   chown -R abc:abc /share/storage/movies
 fi
 
+if [ ! -d /share/storage/tv ]; then
+  echo "Creating /share/storage/tv"
+  mkdir -p /share/storage/tv
+  chown -R abc:abc /share/storage/tv
+fi
+
 if [ ! -d /share/downloads ]; then
   echo "Creating /share/downloads"
   mkdir -p /share/downloads
diff --git a/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh b/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/emby/rootfs/etc/cont-init.d/20-folders.sh b/emby/rootfs/etc/cont-init.d/20-folders.sh
index 7765f925c..17e59c0d6 100644
--- a/emby/rootfs/etc/cont-init.d/20-folders.sh
+++ b/emby/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 
 if [ ! -d /emby ]; then
   echo "Creating /emby"
@@ -24,10 +24,18 @@ if [ ! -d /share/emby ]; then
   chown -R abc:abc /share/emby
 fi
 
-if [ ! -d /config/emby ]; then
-  echo "Creating /config/emby"
-  mkdir -p /config/emby
-  chown -R abc:abc /config/emby
+if [ -d /config/emby ] && [ ! -d /config/addons_config/emby ]; then
+  echo "Moving to new location /config/addons_config/emby"
+  mkdir -p /config/addons_config/emby
+  chown -R abc:abc /config/addons_config/emby
+  mv /config/emby/* /config/addons_config/emby/
+  rm -r /config/emby
+fi
+
+if [ ! -d /config/addons_config/emby ]; then
+  echo "Creating /config/addons_config/emby"
+  mkdir -p /config/addons_config/emby
+  chown -R abc:abc /config/addons_config/emby
 fi
 
 # links
diff --git a/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh b/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh
index 42e6d262c..b68e3f08b 100644
--- a/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh
+++ b/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh
@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
-  export 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*
diff --git a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh b/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/fireflyiii/Readme.md b/fireflyiii/Readme.md
index 37b1f4a71..963dad6b1 100644
--- a/fireflyiii/Readme.md
+++ b/fireflyiii/Readme.md
@@ -38,9 +38,9 @@ Options can be configured through two ways :
 
 - Config.yaml
 
-Configuration is done by customizing the config.yaml in the location defined in your addon options
+Additional variables can be set as ENV variables by adding them in the config.yaml in the location defined in your addon options
 
-The complete list of options can be seen here : https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/.env.example
+The complete list of ENV variables can be seen here : https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/.env.example
 
 ## Installation
 
diff --git a/fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh b/fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/fireflyiii/rootfs/scripts/00-global_var.sh b/fireflyiii/rootfs/scripts/00-global_var.sh
index 42e6d262c..b68e3f08b 100644
--- a/fireflyiii/rootfs/scripts/00-global_var.sh
+++ b/fireflyiii/rootfs/scripts/00-global_var.sh
@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
-  export 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*
diff --git a/fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh b/fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh b/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh
index 42e6d262c..b68e3f08b 100644
--- a/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh
+++ b/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh
@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
-  export 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*
diff --git a/flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh b/flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh b/inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/jackett/rootfs/etc/cont-init.d/20-folders.sh b/jackett/rootfs/etc/cont-init.d/20-folders.sh
index 187bfc32f..f4d27377c 100644
--- a/jackett/rootfs/etc/cont-init.d/20-folders.sh
+++ b/jackett/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 
 if [ ! -d /share/downloads ]; then
   echo "Creating /share/downloads"
diff --git a/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh
index 1d8c2904c..877cd36e9 100644
--- a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh
+++ b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 
 if [ ! -d /jellyfin ]; then
   echo "Creating /jellyfin"
diff --git a/joal/rootfs/scripts/00-aaa_dockerfile_backup.sh b/joal/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/joal/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/joal/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh b/joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/joplin/rootfs/scripts/00-global_var.sh b/joplin/rootfs/scripts/00-global_var.sh
index 42e6d262c..b68e3f08b 100644
--- a/joplin/rootfs/scripts/00-global_var.sh
+++ b/joplin/rootfs/scripts/00-global_var.sh
@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
-  export 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*
diff --git a/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/photoprism/rootfs/00-aaa_dockerfile_backup.sh b/photoprism/rootfs/00-aaa_dockerfile_backup.sh
index ded1ef213..17aecfa6e 100644
--- a/photoprism/rootfs/00-aaa_dockerfile_backup.sh
+++ b/photoprism/rootfs/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ ! -f "/usr/bin/bashio" ]; then
     echo "Bashio does not exist, executing script"
diff --git a/photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh b/photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
index 5fdccc325..10a5bdc48 100644
--- a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,6 +1,6 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 
-if [ -d /config/prowlarr ]; then
+if [ -d /config/prowlarr ] && [ ! -d /config/addons_config/prowlarr ]; then
   echo "Moving to new location /config/addons_config/prowlarr"
   mkdir -p /config/addons_config/prowlarr
   chown -R abc:abc /config/addons_config/prowlarr
diff --git a/qbittorrent/apparmor.txt b/qbittorrent/apparmor.txt
index b494bb495..cf40bc380 100644
--- a/qbittorrent/apparmor.txt
+++ b/qbittorrent/apparmor.txt
@@ -8,6 +8,13 @@ profile db21ed7f_qbittorrent flags=(attach_disconnected,mediate_deleted) {
   mount,
   umount,
   remount,
+  network udp,
+  network tcp,
+  network dgram,
+  network stream,
+  network inet,
+  network inet6,
+  network netlink raw,
 
   capability setgid,
   capability chown,
diff --git a/qbittorrent/config.json b/qbittorrent/config.json
index a2a10d1f4..97a4e8da0 100644
--- a/qbittorrent/config.json
+++ b/qbittorrent/config.json
@@ -102,6 +102,6 @@
   "slug": "qbittorrent",
   "upstream": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls159",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls160-2",
+  "version": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls160-3",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }
diff --git a/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 337e4b3ca..0d5d0097d 100644
--- a/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/radarr/rootfs/etc/cont-init.d/20-folders.sh b/radarr/rootfs/etc/cont-init.d/20-folders.sh
index 79f3df9e7..f497e47b3 100644
--- a/radarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/radarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 
 if [ ! -d /share/storage/movies ]; then
   echo "Creating /share/storage/movies"
@@ -12,15 +12,15 @@ if [ ! -d /share/downloads ]; then
   chown -R abc:abc /share/downloads
 fi
 
-if [ ! -d /config/addons_config/radarr ]; then
-if [ -d /config/radarr ]; then
+if [ -d /config/radarr ] && [ ! -d /config/addons_config/radarr ]; then
   echo "Moving to new location /config/addons_config/radarr"
   mkdir -p /config/addons_config/radarr
   chown -R abc:abc /config/addons_config/radarr
   mv /config/radarr/* /config/addons_config/radarr/
   rm -r /config/radarr
 fi
- 
+
+if [ ! -d /config/addons_config/radarr ]; then
   echo "Creating /config/addons_config/radarr"
   mkdir -p /config/addons_config/radarr
   chown -R abc:abc /config/addons_config/radarr
diff --git a/readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/readarr/rootfs/etc/cont-init.d/20-folders.sh b/readarr/rootfs/etc/cont-init.d/20-folders.sh
index 54a9a8d81..ee243a46c 100644
--- a/readarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/readarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,9 +1,9 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 
-if [ ! -d /share/music ]; then
-  echo "Creating /share/music"
-  mkdir -p /share/music
-  chown -R abc:abc /share/music
+if [ ! -d /share/storage/ebook ]; then
+  echo "Creating /share/storage/ebook"
+  mkdir -p /share/storage/ebook
+  chown -R abc:abc /share/storage/ebook
 fi
 
 if [ ! -d /share/downloads ]; then
@@ -12,15 +12,16 @@ if [ ! -d /share/downloads ]; then
   chown -R abc:abc /share/downloads
 fi
 
-if [ ! -d /config/addons_config/readarr ]; then
-if [ -d /config/readarr ]; then
+if [ -d /config/readarr ] && [ ! -d /config/addons_config/readarr ]; then
   echo "Moving to new location /config/addons_config/readarr"
   mkdir -p /config/addons_config/readarr
   chown -R abc:abc /config/addons_config/readarr
   mv /config/readarr/* /config/addons_config/readarr/
   rm -r /config/readarr
-fi 
- echo "Creating /config/addons_config/readarr"
+fi
+
+if [ ! -d /config/addons_config/readarr ]; then
+  echo "Creating /config/addons_config/readarr"
   mkdir -p /config/addons_config/readarr
   chown -R abc:abc /config/addons_config/readarr
 fi
diff --git a/repository.json b/repository.json
index 1ba35a80e..4a95259b1 100644
--- a/repository.json
+++ b/repository.json
@@ -1,5 +1,5 @@
 {
-  "name": "HA Add-ons by alexbelgium for testing ONLY!",
-  "url": "https://github.com/bruvv/hassio-addons-1",
-  "maintainer": "bruvv"
+  "name": "HA Add-ons by alexbelgium",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "maintainer": "alexbelgium"
 }
diff --git a/requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index 2c2724bfe..566f4c4bb 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -22,11 +22,8 @@ FROM ${BUILD_FROM}
 ##################
 
 RUN \
-    # Install script
-    chmod a+x /run.sh \
-    \
     # Allow UID and GID setting
-    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
+    sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
     # use /data instead of /config for database
diff --git a/scrutiny/config.json b/scrutiny/config.json
index 6c94cbaaf..f6cae659f 100644
--- a/scrutiny/config.json
+++ b/scrutiny/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Scrutiny",
-  "version": "0.3.13-3",
+  "version": "0.3.13-4",
   "upstream": "0.3.13",
   "slug": "scrutiny",
   "description": "Scrutiny WebUI for smartd S.M.A.R.T monitoring",
diff --git a/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/sonarr/rootfs/etc/cont-init.d/20-folders.sh b/sonarr/rootfs/etc/cont-init.d/20-folders.sh
index f2c586c1b..36f96c5ed 100644
--- a/sonarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/sonarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,9 +1,9 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 
-if [ ! -d /share/storage/movies ]; then
-  echo "Creating /share/storage/movies"
-  mkdir -p /share/storage/movies
-  chown -R abc:abc /share/storage/movies
+if [ ! -d /share/storage/tv ]; then
+  echo "Creating /share/storage/tv"
+  mkdir -p /share/storage/tv
+  chown -R abc:abc /share/storage/tv
 fi
 
 if [ ! -d /share/downloads ]; then
@@ -12,7 +12,7 @@ if [ ! -d /share/downloads ]; then
   chown -R abc:abc /share/downloads
 fi
 
-if [ -d /config/sonarr ]; then
+if [ -d /config/sonarr ] && [ ! -d /config/addons_config/sonarr ]; then
   echo "Moving to new location /config/addons_config/sonarr"
   mkdir -p /config/addons_config/sonarr
   chown -R abc:abc /config/addons_config/sonarr
diff --git a/teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/webtop/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/webtop/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/webtop/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/webtop/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh b/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/wger/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/wger/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/wger/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/wger/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/whoogle/CHANGELOG.md b/whoogle/CHANGELOG.md
index e8baeab26..49c084440 100644
--- a/whoogle/CHANGELOG.md
+++ b/whoogle/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.7.1
+- Breaking change
 - Changed the config handeling
 - Added a docs with the config explaination.
 - Make sure you redo your configuration!
diff --git a/whoogle/rootfs/scripts/00-aaa_dockerfile_backup.sh b/whoogle/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/whoogle/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/whoogle/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/whoogle/rootfs/scripts/00-global_var.sh b/whoogle/rootfs/scripts/00-global_var.sh
index b1b92fff6..55611f7e0 100644
--- a/whoogle/rootfs/scripts/00-global_var.sh
+++ b/whoogle/rootfs/scripts/00-global_var.sh
@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
-  export 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*
diff --git a/xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2082a4ea6..1a3fd0934 100644
--- a/xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/zzz_templates/00-aaa_dockerfile_backup.sh b/zzz_templates/00-aaa_dockerfile_backup.sh
index 2182a302d..c8646f882 100644
--- a/zzz_templates/00-aaa_dockerfile_backup.sh
+++ b/zzz_templates/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"
diff --git a/zzz_templates/00-bettercomments.sh b/zzz_templates/00-bettercomments.sh
index b31a742fa..32acdb462 100644
--- a/zzz_templates/00-bettercomments.sh
+++ b/zzz_templates/00-bettercomments.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 
 # Color comments
 #! Red
diff --git a/zzz_templates/automatic_packages.sh b/zzz_templates/automatic_packages.sh
index 8c3d67582..d7c66640b 100644
--- a/zzz_templates/automatic_packages.sh
+++ b/zzz_templates/automatic_packages.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/bin/bash
 
 ########
 # INIT #