External entrypoint modif

2026-01-09 17:31:03 +01:00 · 2023-09-10 07:28:02 +02:00
parent 98deb09e97
commit 629efc0e93
87 changed files with 397 additions and 591 deletions
--- a/.templates/00-aaa_dockerfile_backup.sh
+++ b/.templates/00-aaa_dockerfile_backup.sh
@@ -27,10 +27,10 @@ if [ -e "/ENVFILE" ]; then

    if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi &&
    if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi &&
-    curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh &&
-    chmod 777 /automatic_packages.sh &&
-    eval /./automatic_packages.sh "${PACKAGES:-}" &&
-    rm /automatic_packages.sh
+    curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automatic_packages.sh" --output /ha_automatic_packages.sh &&
+    chmod 777 /ha_automatic_packages.sh &&
+    eval /./ha_automatic_packages.sh "${PACKAGES:-}" &&
+    rm /ha_automatic_packages.sh
 fi

 if [ -e "/MODULESFILE" ] && [ ! -f /ha_entrypoint.sh ]; then
--- a/.templates/ha_autoapps.sh
+++ b/.templates/ha_autoapps.sh
@@ -19,9 +19,9 @@ if ! command -v curl >/dev/null 2>/dev/null; then
 fi

 # Call apps installer script if needed
-curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh
-chmod 777 /automatic_packages.sh
-eval /./automatic_packages.sh "${PACKAGES:-}"
+curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automatic_packages.sh" --output /ha_automatic_packages.sh
+chmod 777 /ha_automatic_packages.sh
+eval /./ha_automatic_packages.sh "${PACKAGES:-}"

 # Clean
-rm /automatic_packages.sh
+rm /ha_automatic_packages.sh
--- a/.templates/ha_automatic_packages.sh
+++ b/.templates/ha_automatic_packages.sh
--- a/.templates/ha_entrypoint_modif.sh
+++ b/.templates/ha_entrypoint_modif.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+##########################################
+# Global modifications before entrypoint #
+##########################################
+
+# Corrects permissions for s6 v3
+################################
+
+if [ -d /etc/cont-init.d ]; then
+    chmod -R 755 /etc/cont-init.d
+fi
+
+if [ -d /etc/services.d ]; then
+    chmod -R 755 /etc/services.d
+fi
+
+# Correct shebang in entrypoint
+###############################
+
+# Make s6 contenv if needed
+mkdir -p /run/s6/container_environment
+
+# Check if shebang exists
+for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do
+    if [ -f "${shebang%% *}" ]; then
+        break
+    fi
+done
+
+# Define shebang
+sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
--- a/addons_updater/Dockerfile
+++ b/addons_updater/Dockerfile
@@ -59,13 +59,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 # Entrypoint logic

--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -59,13 +58,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/autobrr/Dockerfile
+++ b/autobrr/Dockerfile
@@ -66,13 +66,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #WORKDIR /
 ENTRYPOINT [ "/usr/bin/env" ]
--- a/baikal/Dockerfile
+++ b/baikal/Dockerfile
@@ -62,13 +62,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 WORKDIR "/data"

--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -63,13 +63,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ############
 # 5 Labels #
--- a/binance-trading-bot/Dockerfile
+++ b/binance-trading-bot/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -79,13 +78,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 VOLUME [ "/data" ]
 WORKDIR /
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -35,7 +35,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -69,15 +68,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
-
-RUN chmod 777 /etc/services.d/*/*
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -69,13 +69,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/browserless_chrome/Dockerfile
+++ b/browserless_chrome/Dockerfile
@@ -60,13 +60,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 RUN sed -i "2a /./ha_entrypoint.sh" start.sh

--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -72,13 +72,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -78,13 +78,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/changedetection/Dockerfile
+++ b/changedetection/Dockerfile
@@ -0,0 +1,124 @@
+#============================#
+#  ALEXBELGIUM'S DOCKERFILE  #
+#============================#
+#           _.------.
+#       _.-`    ('>.-`"""-.
+# '.--'`       _'`   _ .--.)
+#    -'         '-.-';`   `
+#    ' -      _.'  ``'--.
+#        '---`    .-'""`
+#               /`
+#=== Home Assistant Addon ===#
+
+#################
+# 1 Build Image #
+#################
+
+ARG BUILD_FROM
+ARG BUILD_VERSION
+FROM ${BUILD_FROM}
+
+##################
+# 2 Modify Image #
+##################
+
+# Set S6 wait time
+ENV S6_CMD_WAIT_FOR_SERVICES=1 \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
+
+# Image specific modifications
+
+# Global LSIO modifications
+ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
+ARG CONFIGLOCATION="/config"
+RUN if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
+
+##################
+# 3 Install apps #
+##################
+
+# Add rootfs
+COPY rootfs/ /
+
+# Modules
+ARG MODULES="00-banner.sh 01-custom_script.sh"
+
+# Automatic modules download
+ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
+RUN /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
+
+# Manual apps
+ENV PACKAGES=""
+
+# Automatic apps & bashio
+ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
+RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
+
+################
+# 4 Entrypoint #
+################
+
+# Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
+
+# Entrypoint modifications
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+
+#
+#WORKDIR /
+#ENTRYPOINT [ "/usr/bin/env" ]
+#CMD [ "/ha_entrypoint.sh" ]
+#SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+############
+# 5 Labels #
+############
+
+ARG BUILD_ARCH
+ARG BUILD_DATE
+ARG BUILD_DESCRIPTION
+ARG BUILD_NAME
+ARG BUILD_REF
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION
+LABEL \
+    io.hass.name="${BUILD_NAME}" \
+    io.hass.description="${BUILD_DESCRIPTION}" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.type="addon" \
+    io.hass.version=${BUILD_VERSION} \
+    maintainer="alexbelgium (https://github.com/alexbelgium)" \
+    org.opencontainers.image.title="${BUILD_NAME}" \
+    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
+    org.opencontainers.image.vendor="Home Assistant Add-ons" \
+    org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.url="https://github.com/alexbelgium" \
+    org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
+    org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
+    org.opencontainers.image.created=${BUILD_DATE} \
+    org.opencontainers.image.revision=${BUILD_REF} \
+    org.opencontainers.image.version=${BUILD_VERSION}
+
+#################
+# 6 Healthcheck #
+#################
+
+ENV HEALTH_PORT="32400" \
+    HEALTH_URL="/identity"
+HEALTHCHECK \
+    --interval=5s \
+    --retries=5 \
+    --start-period=30s \
+    --timeout=25s \
+    CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1
--- a/changedetection/README.md
+++ b/changedetection/README.md
@@ -0,0 +1,71 @@
+# Home assistant add-on: changedetection.io
+
+[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)
+
+![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fchangedetection.io%2Fconfig.json)
+![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fchangedetection.io%2Fconfig.json)
+![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fchangedetection.io%2Fconfig.json)
+
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade)
+[![GitHub Super-Linter](https://github.com/alexbelgium/hassio-addons/workflows/Lint%20Code%20Base/badge.svg)](https://github.com/marketplace/actions/super-linter)
+[![Builder](https://github.com/alexbelgium/hassio-addons/workflows/Builder/badge.svg)](https://github.com/alexbelgium/hassio-addons/actions/workflows/builder.yaml)
+
+[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white
+
+_Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_
+
+[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers)
+
+![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/changedetection.io/stats.png)
+
+## About
+
+[Changedetection.io](https://github.com/dgtlmoon/changedetection.io) provides free, open-source web page monitoring, notification and change detection.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-changedetection.io) from linuxserver.io.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+## Configuration
+
+Webui can be found at `<your-ip>:8096`.
+
+```yaml
+PGID: user
+GPID: user
+TZ: timezone
+claim: claim code for changedetection.io server # see https://github.com/linuxserver/docker-changedetection.io
+localdisks: sda1 #put the hardware name of your drive to mount separated by commas, or its label. ex. sda1, sdb1, MYNAS...
+networkdisks: "//SERVER/SHARE" # optional, list of smb servers to mount, separated by commas
+cifsusername: "username" # optional, smb username, same for all smb shares
+cifspassword: "password" # optional, smb password
+cifsdomain: "domain" # optional, allow setting the domain for the smb share
+```
+
+## Installation
+
+The installation of this add-on is pretty straightforward and not different in
+comparison to installing any other Hass.io add-on.
+
+1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance.
+1. Install this add-on.
+1. Click the `Save` button to store your configuration.
+1. Start the add-on.
+1. Check the logs of the add-on to see if everything went well.
+1. Carefully configure the add-on to your preferences, see the official documentation for for that.
+
+[repository]: https://github.com/alexbelgium/hassio-addons
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -60,13 +60,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ENTRYPOINT [ "/ha_entrypoint.sh" ]

--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -63,13 +63,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -71,13 +71,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ############
 # 5 Labels #
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -62,13 +62,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ############
 # 5 Labels #
--- a/enedisgateway2mqtt/Dockerfile
+++ b/enedisgateway2mqtt/Dockerfile
@@ -27,7 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -58,13 +57,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/enedisgateway2mqtt_dev/Dockerfile
+++ b/enedisgateway2mqtt_dev/Dockerfile
@@ -27,7 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -58,13 +57,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/epicgamesfree/Dockerfile
+++ b/epicgamesfree/Dockerfile
@@ -60,13 +60,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -60,13 +59,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 VOLUME [ "/data" ]
 WORKDIR /
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -69,13 +69,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -65,13 +65,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/fireflyiii_fints_importer/Dockerfile
+++ b/fireflyiii_fints_importer/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -59,13 +58,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/flaresolverr/Dockerfile
+++ b/flaresolverr/Dockerfile
@@ -59,13 +59,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -75,13 +75,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/free_games_claimer/Dockerfile
+++ b/free_games_claimer/Dockerfile
@@ -27,7 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -58,13 +57,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 RUN \
    # Change data folder
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -60,13 +60,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/gitea/Dockerfile
+++ b/gitea/Dockerfile
@@ -62,13 +62,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/ha_entrypoint.sh" ]
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -66,13 +66,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ############
 # 5 Labels #
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -90,13 +90,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /data
--- a/immich/Dockerfile
+++ b/immich/Dockerfile
@@ -81,13 +81,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #ENTRYPOINT [ "/usr/bin/env" ]
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -83,13 +83,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 WORKDIR /

--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -65,13 +65,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ############
 # 5 Labels #
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -71,13 +71,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/jellyseerr/Dockerfile
+++ b/jellyseerr/Dockerfile
@@ -69,13 +69,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -71,13 +71,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -65,13 +65,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -65,13 +65,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/mealie/Dockerfile
+++ b/mealie/Dockerfile
@@ -66,13 +66,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 RUN \
    # Add custom instructions to run.sh on armv7
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -62,13 +62,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -88,13 +88,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 # Correct modifications
 ARG CONFIGLOCATION="/www/nextcloud/config"
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -62,13 +62,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/omada/Dockerfile
+++ b/omada/Dockerfile
@@ -66,13 +66,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #ENTRYPOINT [ "/usr/bin/env" ]
--- a/omada_v3/Dockerfile
+++ b/omada_v3/Dockerfile
@@ -67,13 +67,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #ENTRYPOINT [ "/usr/bin/env" ]
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -62,13 +62,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -62,13 +62,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ############
 # 5 Labels #
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -63,13 +63,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -63,13 +63,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 #WORKDIR /
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -73,13 +73,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -70,13 +70,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -64,13 +64,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 # hadolint ignore=SC2013
 RUN \
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -75,13 +75,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/plex_meta_manager/Dockerfile
+++ b/plex_meta_manager/Dockerfile
@@ -71,13 +71,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -81,13 +81,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 RUN chmod 777 /etc/services.d/*/*
 #
--- a/portainer_agent/Dockerfile
+++ b/portainer_agent/Dockerfile
@@ -36,7 +36,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -67,13 +66,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 RUN chmod a+x /usr/sbin/healthcheck && \
    chmod a+x /usr/sbin/wait-for-signal
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -63,13 +63,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 WORKDIR /data
 ENTRYPOINT [ "/usr/bin/env" ]
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -65,13 +65,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -101,13 +101,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ############
 # 5 Labels #
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -66,13 +66,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -63,13 +63,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -65,13 +65,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -86,13 +86,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/sabnzbd/Dockerfile
+++ b/sabnzbd/Dockerfile
@@ -62,13 +62,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -27,7 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -61,13 +60,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh



--- a/scrutiny_fa/Dockerfile
+++ b/scrutiny_fa/Dockerfile
@@ -27,7 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -61,13 +60,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh



--- a/seafile/Dockerfile
+++ b/seafile/Dockerfile
@@ -63,13 +63,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -66,13 +66,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/sponsorblockcast/Dockerfile
+++ b/sponsorblockcast/Dockerfile
@@ -27,7 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -60,13 +59,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 # Entrypoint logic

--- a/spotweb/Dockerfile
+++ b/spotweb/Dockerfile
@@ -116,13 +116,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ############
 # 5 Labels #
--- a/tandoor_recipes/Dockerfile
+++ b/tandoor_recipes/Dockerfile
@@ -27,7 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -58,13 +57,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 #WORKDIR /data/recipes
--- a/tdarr/Dockerfile
+++ b/tdarr/Dockerfile
@@ -27,7 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
    S6_SERVICES_GRACETIME=0

-
 ##################
 # 3 Install apps #
 ##################
@@ -58,13 +57,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ############
 # 5 Labels #
--- a/teamspeak/Dockerfile
+++ b/teamspeak/Dockerfile
@@ -64,13 +64,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -73,13 +73,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -68,13 +68,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 CMD [ "/ha_entrypoint.sh" ]
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -76,13 +76,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -61,13 +61,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 ############
 # 5 Labels #
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -72,13 +72,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -71,13 +71,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/wger/Dockerfile
+++ b/wger/Dockerfile
@@ -69,13 +69,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 USER wger
--- a/whoogle/Dockerfile
+++ b/whoogle/Dockerfile
@@ -63,13 +63,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/xteve/Dockerfile
+++ b/xteve/Dockerfile
@@ -63,13 +63,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/zoneminder/Dockerfile
+++ b/zoneminder/Dockerfile
@@ -68,13 +68,8 @@ ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-RUN \
-    # Corrects permissions for s6 v3
-    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
-    #Correct shebang in entrypoint
-    mkdir -p /run/s6/container_environment && \
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
+ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint_modif.sh"
+RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh


 ENTRYPOINT [ "/usr/bin/env" ]