diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile
index 39540de91..9f26a17ab 100644
--- a/addons_updater/Dockerfile
+++ b/addons_updater/Dockerfile
@@ -66,11 +66,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 # Entrypoint logic
 
diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile
index 3b9fd5fbd..361cdc6e9 100644
--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -65,11 +65,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile
index cb77a89ab..ea3060246 100644
--- a/autobrr/Dockerfile
+++ b/autobrr/Dockerfile
@@ -73,11 +73,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #WORKDIR /
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/baikal/Dockerfile b/baikal/Dockerfile
index 57c048991..dcd29b7f6 100644
--- a/baikal/Dockerfile
+++ b/baikal/Dockerfile
@@ -70,11 +70,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 WORKDIR "/data"
 
diff --git a/battybirdnet-pi/Dockerfile b/battybirdnet-pi/Dockerfile
index 773fc9665..964f9aba0 100644
--- a/battybirdnet-pi/Dockerfile
+++ b/battybirdnet-pi/Dockerfile
@@ -164,11 +164,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 # Avoid config.yaml interference
 WORKDIR /config
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index d6db5e397..966e97548 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -70,11 +70,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ############
 # 5 Labels #
diff --git a/binance-trading-bot/Dockerfile b/binance-trading-bot/Dockerfile
index f079a3253..8cda9cf50 100644
--- a/binance-trading-bot/Dockerfile
+++ b/binance-trading-bot/Dockerfile
@@ -85,11 +85,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 VOLUME [ "/data" ]
 WORKDIR /
diff --git a/birdnet-go/Dockerfile b/birdnet-go/Dockerfile
index e8ff85687..e4ee511ce 100644
--- a/birdnet-go/Dockerfile
+++ b/birdnet-go/Dockerfile
@@ -65,11 +65,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 # Avoid config.yaml interference
 RUN sed -i "s|config.yaml|config_env.yaml|g" /etc/cont-init.d/01-config_yaml.sh
diff --git a/birdnet-pi/Dockerfile b/birdnet-pi/Dockerfile
index ad5160609..217db9969 100644
--- a/birdnet-pi/Dockerfile
+++ b/birdnet-pi/Dockerfile
@@ -173,11 +173,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 # Avoid config.yaml interference
 WORKDIR /config
diff --git a/birdnet-pipy/Dockerfile b/birdnet-pipy/Dockerfile
index 328812ae9..cedb1628a 100644
--- a/birdnet-pipy/Dockerfile
+++ b/birdnet-pipy/Dockerfile
@@ -99,11 +99,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ENTRYPOINT [ "/usr/bin/env" ]
 CMD [ "/ha_entrypoint.sh" ]
diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile
index 490f89b59..64f9f045d 100644
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -96,11 +96,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index 7e94c4b81..99f3a4102 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -76,11 +76,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/browser_brave/Dockerfile b/browser_brave/Dockerfile
index 2b8bb82c2..5cc522491 100644
--- a/browser_brave/Dockerfile
+++ b/browser_brave/Dockerfile
@@ -91,11 +91,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #WORKDIR /
 #ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/browser_chromium/Dockerfile b/browser_chromium/Dockerfile
index 2b8bb82c2..5cc522491 100644
--- a/browser_chromium/Dockerfile
+++ b/browser_chromium/Dockerfile
@@ -91,11 +91,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #WORKDIR /
 #ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile
index 07e687d96..f39f73a9a 100644
--- a/browserless_chrome/Dockerfile
+++ b/browserless_chrome/Dockerfile
@@ -67,11 +67,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 RUN \ sed -i "2a /./ha_entrypoint.sh" ./scripts/start.sh
 
diff --git a/calibre/Dockerfile b/calibre/Dockerfile
index 11cd6eee0..956bd0d46 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -79,11 +79,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile
index d83617794..e89729752 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -85,11 +85,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/changedetection.io/Dockerfile b/changedetection.io/Dockerfile
index 4a1630eac..5d6eaec12 100644
--- a/changedetection.io/Dockerfile
+++ b/changedetection.io/Dockerfile
@@ -71,11 +71,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #WORKDIR /
 #ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index 94b155a84..3c8e9eb5a 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -67,11 +67,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ENTRYPOINT [ "/ha_entrypoint.sh" ]
 
diff --git a/codex/Dockerfile b/codex/Dockerfile
index fc8b6f56b..1402773b4 100644
--- a/codex/Dockerfile
+++ b/codex/Dockerfile
@@ -64,11 +64,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 VOLUME [ "/data" ]
 WORKDIR /
diff --git a/collabora/Dockerfile b/collabora/Dockerfile
index 5eaaf0de9..338ac39c8 100644
--- a/collabora/Dockerfile
+++ b/collabora/Dockerfile
@@ -71,11 +71,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 WORKDIR /
 ENTRYPOINT [ "/ha_entrypoint.sh" ]
diff --git a/comixed/Dockerfile b/comixed/Dockerfile
index 2fa730223..6ea533c33 100644
--- a/comixed/Dockerfile
+++ b/comixed/Dockerfile
@@ -80,11 +80,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 VOLUME [ "/data" ]
 WORKDIR /
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index d2649dbee..2756cc8c1 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -78,11 +78,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ############
 # 5 Labels #
diff --git a/emby/Dockerfile b/emby/Dockerfile
index 8368c618b..d23ae183e 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -69,11 +69,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ############
 # 5 Labels #
diff --git a/emby_beta/Dockerfile b/emby_beta/Dockerfile
index 470ff41ff..ce203bcb9 100644
--- a/emby_beta/Dockerfile
+++ b/emby_beta/Dockerfile
@@ -69,11 +69,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ############
 # 5 Labels #
diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile
index 211703f50..78284bc1a 100644
--- a/enedisgateway2mqtt/Dockerfile
+++ b/enedisgateway2mqtt/Dockerfile
@@ -64,11 +64,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile
index 823f68df5..6f14cead0 100644
--- a/enedisgateway2mqtt_dev/Dockerfile
+++ b/enedisgateway2mqtt_dev/Dockerfile
@@ -64,11 +64,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile
index 54beb8bf4..9dfd9b0cc 100644
--- a/epicgamesfree/Dockerfile
+++ b/epicgamesfree/Dockerfile
@@ -67,11 +67,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile
index 780dafa8b..096d76385 100644
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -67,11 +67,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 VOLUME [ "/data" ]
 WORKDIR /
diff --git a/filebrowser_quantum/Dockerfile b/filebrowser_quantum/Dockerfile
index 5b6febb5d..6c129f5b5 100644
--- a/filebrowser_quantum/Dockerfile
+++ b/filebrowser_quantum/Dockerfile
@@ -68,11 +68,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 RUN \ sed -i "s|/command/with-contenv|/usr/bin/env|g" "/ha_entrypoint.sh"
 
diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile
index 844a12ddf..f60f3f7db 100644
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -76,11 +76,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #ENTRYPOINT [ "/usr/bin/env" ]
 #CMD [ "/ha_entrypoint.sh" ]
diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile
index d62283125..38839442a 100644
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -78,11 +78,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 # Adapt shebang
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile
index cec7e985d..99b76f953 100644
--- a/flaresolverr/Dockerfile
+++ b/flaresolverr/Dockerfile
@@ -66,11 +66,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index a793bbdb4..d7d54d797 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -82,11 +82,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/free_games_claimer/Dockerfile b/free_games_claimer/Dockerfile
index fdaa18c86..bbd86787f 100644
--- a/free_games_claimer/Dockerfile
+++ b/free_games_claimer/Dockerfile
@@ -64,11 +64,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 RUN \
     # Change data folder
diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile
index dde8ec8e0..69b6cc854 100644
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -67,11 +67,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/gitea/Dockerfile b/gitea/Dockerfile
index 6898dd686..60f8bf5df 100644
--- a/gitea/Dockerfile
+++ b/gitea/Dockerfile
@@ -69,11 +69,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 
 ENTRYPOINT [ "/ha_entrypoint.sh" ]
diff --git a/grampsweb/Dockerfile b/grampsweb/Dockerfile
index 527c3979c..a29ded557 100644
--- a/grampsweb/Dockerfile
+++ b/grampsweb/Dockerfile
@@ -65,11 +65,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ENTRYPOINT [ "/usr/bin/env" ]
 CMD [ "/ha_entrypoint.sh" ]
diff --git a/grav/Dockerfile b/grav/Dockerfile
index f91ee8d14..9a9b77382 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -73,11 +73,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ############
 # 5 Labels #
diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile
index 4e34716b9..a45abbe87 100644
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -91,11 +91,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #WORKDIR /data
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/immich/Dockerfile b/immich/Dockerfile
index 8e1d6a6ed..d43749278 100644
--- a/immich/Dockerfile
+++ b/immich/Dockerfile
@@ -79,11 +79,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 RUN \ sed -i "s|postgresql-16|postgresql-15|g" /etc/s6-overlay/s6-rc.d/init-test-run/run
 
diff --git a/immich_cuda/Dockerfile b/immich_cuda/Dockerfile
index 8e1d6a6ed..d43749278 100644
--- a/immich_cuda/Dockerfile
+++ b/immich_cuda/Dockerfile
@@ -79,11 +79,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 RUN \ sed -i "s|postgresql-16|postgresql-15|g" /etc/s6-overlay/s6-rc.d/init-test-run/run
 
diff --git a/immich_frame/Dockerfile b/immich_frame/Dockerfile
index 81cf3656c..244796342 100644
--- a/immich_frame/Dockerfile
+++ b/immich_frame/Dockerfile
@@ -66,11 +66,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ENTRYPOINT [ "/usr/bin/env" ]
 CMD [ "/ha_entrypoint.sh" ]
diff --git a/immich_noml/Dockerfile b/immich_noml/Dockerfile
index 8e1d6a6ed..d43749278 100644
--- a/immich_noml/Dockerfile
+++ b/immich_noml/Dockerfile
@@ -79,11 +79,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 RUN \ sed -i "s|postgresql-16|postgresql-15|g" /etc/s6-overlay/s6-rc.d/init-test-run/run
 
diff --git a/immich_openvino/Dockerfile b/immich_openvino/Dockerfile
index 8e1d6a6ed..d43749278 100644
--- a/immich_openvino/Dockerfile
+++ b/immich_openvino/Dockerfile
@@ -79,11 +79,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 RUN \ sed -i "s|postgresql-16|postgresql-15|g" /etc/s6-overlay/s6-rc.d/init-test-run/run
 
diff --git a/immich_power_tools/Dockerfile b/immich_power_tools/Dockerfile
index 81cf3656c..244796342 100644
--- a/immich_power_tools/Dockerfile
+++ b/immich_power_tools/Dockerfile
@@ -66,11 +66,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ENTRYPOINT [ "/usr/bin/env" ]
 CMD [ "/ha_entrypoint.sh" ]
diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile
index 36195e87d..76a9ef4f6 100644
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -90,11 +90,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 WORKDIR /
 
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index b1d4376e8..6fabde75c 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -72,11 +72,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 ############
 # 5 Labels #
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index fdbef85b7..4d2121e9e 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -80,11 +80,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/jellyseerr/Dockerfile b/jellyseerr/Dockerfile
index 2405b7a0b..8f531c678 100644
--- a/jellyseerr/Dockerfile
+++ b/jellyseerr/Dockerfile
@@ -76,11 +76,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 
 #ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/joal/Dockerfile b/joal/Dockerfile
index 977a1f293..ecbccbd08 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -77,11 +77,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/joplin/Dockerfile b/joplin/Dockerfile
index 842d26500..1445d2927 100644
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -72,11 +72,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/kometa/Dockerfile b/kometa/Dockerfile
index d86f5fa84..4904d26fb 100644
--- a/kometa/Dockerfile
+++ b/kometa/Dockerfile
@@ -78,11 +78,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/librespeed/Dockerfile b/librespeed/Dockerfile
index a9b6847a0..fb220cf34 100644
--- a/librespeed/Dockerfile
+++ b/librespeed/Dockerfile
@@ -69,11 +69,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index e2931597d..c8ef58def 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -72,11 +72,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/linkwarden/Dockerfile b/linkwarden/Dockerfile
index a5f40d825..a05fadaae 100644
--- a/linkwarden/Dockerfile
+++ b/linkwarden/Dockerfile
@@ -79,11 +79,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/mealie/Dockerfile b/mealie/Dockerfile
index 123c15141..917cd156a 100644
--- a/mealie/Dockerfile
+++ b/mealie/Dockerfile
@@ -96,11 +96,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/monica/Dockerfile b/monica/Dockerfile
index fe2a2015f..d6d74f3c2 100644
--- a/monica/Dockerfile
+++ b/monica/Dockerfile
@@ -101,11 +101,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index c52c76fff..b03751648 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -69,11 +69,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/navidrome/Dockerfile b/navidrome/Dockerfile
index 347152d13..69e3b2c6b 100644
--- a/navidrome/Dockerfile
+++ b/navidrome/Dockerfile
@@ -68,11 +68,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index d3325cba8..49fb37cd8 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -108,11 +108,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
index 293a8d5fd..043009501 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -69,11 +69,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index d2bf07d85..fec9c599d 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -70,11 +70,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/omni-tools/Dockerfile b/omni-tools/Dockerfile
index 6301d50e6..279439fe9 100644
--- a/omni-tools/Dockerfile
+++ b/omni-tools/Dockerfile
@@ -68,11 +68,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/openproject/Dockerfile b/openproject/Dockerfile
index fedc13ba3..381dbc843 100644
--- a/openproject/Dockerfile
+++ b/openproject/Dockerfile
@@ -77,11 +77,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index 671e70b58..c1b0c70fa 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -68,11 +68,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile
index 219aa4967..5d7a932f6 100644
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -70,11 +70,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile
index a830fb937..e62499a8b 100644
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -75,11 +75,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 436ab5a22..7f23ea8e1 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -71,11 +71,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/plex/Dockerfile b/plex/Dockerfile
index cc337bbb2..ed0b9ad63 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -83,11 +83,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/portainer/Dockerfile b/portainer/Dockerfile
index 3d9eb0565..33f969d31 100644
--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -87,11 +87,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/portainer_agent/Dockerfile b/portainer_agent/Dockerfile
index ac2d18259..2d37feea6 100644
--- a/portainer_agent/Dockerfile
+++ b/portainer_agent/Dockerfile
@@ -78,11 +78,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 RUN chmod a+x /usr/sbin/healthcheck && \
     chmod a+x /usr/sbin/wait-for-signal
diff --git a/postgres_15/Dockerfile b/postgres_15/Dockerfile
index 5dc518b1c..261f6a7ff 100644
--- a/postgres_15/Dockerfile
+++ b/postgres_15/Dockerfile
@@ -71,11 +71,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index 13d6a9361..bec6391c9 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -72,11 +72,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index 48ffdf8fe..844af1663 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -134,11 +134,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index afbb57654..b9b0b88dd 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -73,11 +73,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index fe669fda7..2abf52357 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -70,11 +70,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index c1ea0b091..3ac0e606a 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -72,11 +72,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index a2a98d95e..74209eb0a 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -91,11 +91,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile
index 293a8d5fd..043009501 100644
--- a/sabnzbd/Dockerfile
+++ b/sabnzbd/Dockerfile
@@ -69,11 +69,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index f0ebf3e1b..85034b8f5 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -67,11 +67,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile
index ccb3327d1..adc08f178 100644
--- a/scrutiny_fa/Dockerfile
+++ b/scrutiny_fa/Dockerfile
@@ -64,11 +64,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/seafile/Dockerfile b/seafile/Dockerfile
index b05c47fad..777f91534 100644
--- a/seafile/Dockerfile
+++ b/seafile/Dockerfile
@@ -70,11 +70,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/signalk/Dockerfile b/signalk/Dockerfile
index 4f8cbe6fb..b634027ba 100644
--- a/signalk/Dockerfile
+++ b/signalk/Dockerfile
@@ -73,11 +73,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/social_to_mealie/Dockerfile b/social_to_mealie/Dockerfile
index 514eaf924..eba4219c4 100644
--- a/social_to_mealie/Dockerfile
+++ b/social_to_mealie/Dockerfile
@@ -66,11 +66,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index f144a0a65..6d9b3015a 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -73,11 +73,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/sponsorblockcast/Dockerfile b/sponsorblockcast/Dockerfile
index 83b9c63e9..e6bd8577c 100644
--- a/sponsorblockcast/Dockerfile
+++ b/sponsorblockcast/Dockerfile
@@ -66,11 +66,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile
index c590860f4..a448aebb8 100644
--- a/spotweb/Dockerfile
+++ b/spotweb/Dockerfile
@@ -123,11 +123,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile
index d5b5f125c..e10d90e95 100644
--- a/tandoor_recipes/Dockerfile
+++ b/tandoor_recipes/Dockerfile
@@ -64,11 +64,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile
index cb7cdfeac..7727b97eb 100644
--- a/tdarr/Dockerfile
+++ b/tdarr/Dockerfile
@@ -64,11 +64,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile
index d6014bdb5..a95749dd8 100644
--- a/teamspeak/Dockerfile
+++ b/teamspeak/Dockerfile
@@ -71,11 +71,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index e3b8838c3..8218457e5 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -80,11 +80,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile
index a7b7108d2..e7f60761e 100644
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -70,11 +70,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index f25d20e33..3290af232 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -83,11 +83,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile
index a955524d6..9441f6181 100644
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -68,11 +68,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile
index a4eff292f..6f05c8311 100644
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -86,11 +86,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index 9eb576b06..d0f2964ea 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -88,11 +88,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/wger/Dockerfile b/wger/Dockerfile
index 8feba3cf7..e5de2079b 100644
--- a/wger/Dockerfile
+++ b/wger/Dockerfile
@@ -77,11 +77,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/whatsapper/Dockerfile b/whatsapper/Dockerfile
index 55b8d9ef7..7a05360c6 100644
--- a/whatsapper/Dockerfile
+++ b/whatsapper/Dockerfile
@@ -68,11 +68,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile
index 6569a0533..de5c677db 100644
--- a/whoogle/Dockerfile
+++ b/whoogle/Dockerfile
@@ -70,11 +70,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/xteve/Dockerfile b/xteve/Dockerfile
index a08efc293..9e4f4a3cb 100644
--- a/xteve/Dockerfile
+++ b/xteve/Dockerfile
@@ -70,11 +70,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile
index 0aa3ebc8c..2b063ff05 100644
--- a/zoneminder/Dockerfile
+++ b/zoneminder/Dockerfile
@@ -75,11 +75,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/zzz_archived_code-server/Dockerfile b/zzz_archived_code-server/Dockerfile
index fd4266a1e..b47b3ef92 100644
--- a/zzz_archived_code-server/Dockerfile
+++ b/zzz_archived_code-server/Dockerfile
@@ -70,11 +70,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/zzz_archived_omada/Dockerfile b/zzz_archived_omada/Dockerfile
index 86d370be7..580ad57bc 100644
--- a/zzz_archived_omada/Dockerfile
+++ b/zzz_archived_omada/Dockerfile
@@ -68,11 +68,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" \) -print -exec chmod +x {} \;
diff --git a/zzz_archived_omada_v3/Dockerfile b/zzz_archived_omada_v3/Dockerfile
index 566f8ebb4..006ee160f 100644
--- a/zzz_archived_omada_v3/Dockerfile
+++ b/zzz_archived_omada_v3/Dockerfile
@@ -74,11 +74,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/zzz_archived_paperless_ngx/Dockerfile b/zzz_archived_paperless_ngx/Dockerfile
index 77064fb94..8bb0c67ac 100644
--- a/zzz_archived_paperless_ngx/Dockerfile
+++ b/zzz_archived_paperless_ngx/Dockerfile
@@ -68,11 +68,10 @@ RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 # Add custom scripts
 RUN sed -i "2a source /ha_entrypoint.sh" /sbin/docker-entrypoint.sh && \
diff --git a/zzz_archived_papermerge/Dockerfile b/zzz_archived_papermerge/Dockerfile
index eef006502..5ea394386 100644
--- a/zzz_archived_papermerge/Dockerfile
+++ b/zzz_archived_papermerge/Dockerfile
@@ -80,11 +80,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /
diff --git a/zzz_archived_plex_meta_manager/Dockerfile b/zzz_archived_plex_meta_manager/Dockerfile
index 6fc7538cc..c7476839e 100644
--- a/zzz_archived_plex_meta_manager/Dockerfile
+++ b/zzz_archived_plex_meta_manager/Dockerfile
@@ -78,11 +78,10 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 RUN chmod 777 /ha_entrypoint.sh
 
 # Install bashio
-ENV PATH="/usr/bin:${PATH}"
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
-RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
-RUN chmod 0755 /usr/bin/bashio
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/usr/local/lib/bashio-standalone.sh"
+#RUN chmod 0755 /usr/local/lib/bashio-standalone.sh
+#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-router.sh" "/usr/bin/bashio"
+#RUN chmod 0755 /usr/bin/bashio
 
 #
 #WORKDIR /