diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile
index 8ba512b66..d60b418b1 100644
--- a/addons_updater/Dockerfile
+++ b/addons_updater/Dockerfile
@@ -68,8 +68,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 # Entrypoint logic
 
diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile
index 80a18cb98..bbc52c809 100644
--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -68,8 +68,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile
index e35be4863..ae2d5d6e1 100644
--- a/autobrr/Dockerfile
+++ b/autobrr/Dockerfile
@@ -96,8 +96,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #WORKDIR /
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/baikal/Dockerfile b/baikal/Dockerfile
index 9652aa8de..6fe220a79 100644
--- a/baikal/Dockerfile
+++ b/baikal/Dockerfile
@@ -72,8 +72,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 WORKDIR "/data"
 
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index 567f1fcf9..31fc807bb 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -93,8 +93,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/binance-trading-bot/Dockerfile b/binance-trading-bot/Dockerfile
index 593a50534..57735f187 100644
--- a/binance-trading-bot/Dockerfile
+++ b/binance-trading-bot/Dockerfile
@@ -88,8 +88,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 VOLUME [ "/data" ]
 WORKDIR /
diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile
index 79d2427d8..1378c72b2 100644
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -78,8 +78,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 RUN chmod 777 /etc/services.d/*/*
 
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index 895ce0547..281e695cb 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -98,8 +98,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile
index 0f587f407..ba490e510 100644
--- a/browserless_chrome/Dockerfile
+++ b/browserless_chrome/Dockerfile
@@ -72,8 +72,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/calibre/Dockerfile b/calibre/Dockerfile
index 9efbcee02..442c85c9c 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -99,8 +99,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile
index 474f4089f..e56544817 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -107,8 +107,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index 9b58c8385..23857714a 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -70,8 +70,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ENTRYPOINT [ "/ha_entrypoint.sh" ]
 
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index 2a77212fb..fde2b8b93 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -93,8 +93,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index bf97b1176..1ae22d071 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -80,8 +80,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/emby/Dockerfile b/emby/Dockerfile
index e4dae0e82..c77f98dcb 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -92,8 +92,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile
index 0abbaaaab..94543faca 100644
--- a/enedisgateway2mqtt/Dockerfile
+++ b/enedisgateway2mqtt/Dockerfile
@@ -67,8 +67,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile
index e60d1affe..fa4f07613 100644
--- a/enedisgateway2mqtt_dev/Dockerfile
+++ b/enedisgateway2mqtt_dev/Dockerfile
@@ -67,8 +67,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile
index 12ac8a170..f61efea16 100644
--- a/epicgamesfree/Dockerfile
+++ b/epicgamesfree/Dockerfile
@@ -69,8 +69,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile
index 0f56ceff1..22c82e294 100644
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -69,8 +69,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 VOLUME [ "/data" ]
 WORKDIR /
diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile
index 5889035e5..065da8681 100644
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -78,8 +78,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile
index 2cf059866..90590d340 100644
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -74,8 +74,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile
index 6fcf55710..a81cbeebf 100644
--- a/fireflyiii_fints_importer/Dockerfile
+++ b/fireflyiii_fints_importer/Dockerfile
@@ -68,8 +68,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile
index f55f6df8a..32a68e014 100644
--- a/flaresolverr/Dockerfile
+++ b/flaresolverr/Dockerfile
@@ -68,8 +68,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index d8c50ccca..36ccb3d60 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -104,8 +104,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/free_games_claimer/Dockerfile b/free_games_claimer/Dockerfile
index c7e3afc06..2785f167c 100644
--- a/free_games_claimer/Dockerfile
+++ b/free_games_claimer/Dockerfile
@@ -67,17 +67,14 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 RUN \
     # Change data folder
     sed -i "s|/fgc|/data|g" /usr/local/bin/docker-entrypoint.sh && \
     # Run scripts only once
-    sed -i "1a if [ -f /done ]; then exit 0; fi && touch /done" /entrypoint.sh && \
-    sed -i "s=x11vnc=[[ \"\$(ps aux | grep \"x11vnc\" | grep -v grep)\" ]] || x11vnc=g" /usr/local/bin/docker-entrypoint.sh && \
-    # Allow entrypoint
-    chmod 777 /entrypoint.sh
+    sed -i "1a if [ -f /done ]; then exit 0; fi && touch /done" /ha_entrypoint.sh && \
+    sed -i "s=x11vnc=[[ \"\$(ps aux | grep \"x11vnc\" | grep -v grep)\" ]] || x11vnc=g" /usr/local/bin/docker-entrypoint.sh
 
 WORKDIR /data
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile
index 9d31da1ad..b30a87ddd 100644
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -69,8 +69,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/gitea/Dockerfile b/gitea/Dockerfile
index 16f3d58da..3a8dd3979 100644
--- a/gitea/Dockerfile
+++ b/gitea/Dockerfile
@@ -71,8 +71,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/ha_entrypoint.sh" ]
diff --git a/grav/Dockerfile b/grav/Dockerfile
index 7ba00cc18..1bd11838a 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -96,8 +96,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile
index e26fe7a25..3c5ba0acf 100644
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -99,8 +99,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /data
diff --git a/immich/Dockerfile b/immich/Dockerfile
index 1b6d3ea02..df1dda037 100644
--- a/immich/Dockerfile
+++ b/immich/Dockerfile
@@ -111,8 +111,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile
index fbb7c0ca9..f8ee0b9d4 100644
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -92,8 +92,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 WORKDIR /
 
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index dca958bab..3721b600b 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -95,8 +95,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index 49e94fee0..148a24900 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -100,8 +100,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/jellyseerr/Dockerfile b/jellyseerr/Dockerfile
index 72968642c..c4bcd4845 100644
--- a/jellyseerr/Dockerfile
+++ b/jellyseerr/Dockerfile
@@ -75,8 +75,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/joal/Dockerfile b/joal/Dockerfile
index 5e3b12ffc..a5fbb5794 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -80,8 +80,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/joplin/Dockerfile b/joplin/Dockerfile
index 0efcc14e8..55a30feb1 100644
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -74,8 +74,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index d08eec60d..79b493aaa 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -95,8 +95,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/mealie/Dockerfile b/mealie/Dockerfile
index 6728c4f6a..0938ba186 100644
--- a/mealie/Dockerfile
+++ b/mealie/Dockerfile
@@ -75,8 +75,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 RUN \
     # Add custom instructions to run.sh on armv7
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index e9ab87ec9..63d8bb275 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -92,8 +92,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index d7d870971..21f04d136 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -126,21 +126,12 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 # Correct modifications
 ARG CONFIGLOCATION="/www/nextcloud/config"
 # hadolint ignore=SC2015, SC2013, SC2086, SC2016
 RUN \
-    # Avoid using legacy cont-init.d
-    mkdir -p /scripts && mv /etc/cont-init.d/* /scripts && \
-    for file in 00-local_mounts.sh 00-smb_mounts.sh 00-banner.sh 01-custom_script.sh; do mkdir -p /scripts2 && mv /scripts/"$file" /scripts2; done && \
-    sed -i "s|/etc/cont-init.d|/scripts|g" /etc/entrypoint.sh && \
-    \
-    # Give permissions
-    chmod 777 /etc/entrypoint.sh /defaults/nextcloud-perms.sh /scripts/* /scripts2/* && \
-    \
     # Correct erroneous modifications
     for file in $(grep -Esril "/www/nextcloud/data/config" /etc /defaults); do sed -Ei "s=(/www/nextcloud/data/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done && \
     for file in $(grep -Esril "/data/data" /etc /defaults); do sed -Ei "s=(/data/data)+(/| |$|\"|\')=/data\2=g" $file; done && \
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
index 370db74b2..f2789d8be 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -92,8 +92,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/omada/Dockerfile b/omada/Dockerfile
index dbdd914f9..4f15a63b8 100644
--- a/omada/Dockerfile
+++ b/omada/Dockerfile
@@ -75,8 +75,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile
index 7ce142303..fb39fd357 100644
--- a/omada_v3/Dockerfile
+++ b/omada_v3/Dockerfile
@@ -76,8 +76,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index 01c1b8cf5..f8d680f69 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -92,8 +92,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index 32caf2b3c..8e2838b05 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -92,8 +92,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile
index e09c29459..6c880ceb0 100644
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -93,8 +93,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile
index 395d0b6fb..93e52452a 100644
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -72,8 +72,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 #WORKDIR /
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index f839f83d0..e458aa81e 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -102,8 +102,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile
index f805a7601..d7b6d2c6a 100644
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -79,8 +79,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 991bd9550..2f1959561 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -94,8 +94,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 # hadolint ignore=SC2013
 RUN \
diff --git a/plex/Dockerfile b/plex/Dockerfile
index 4196b1d99..47837f84e 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -104,8 +104,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile
index f846b9e6c..25a290053 100644
--- a/plex_meta_manager/Dockerfile
+++ b/plex_meta_manager/Dockerfile
@@ -100,8 +100,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/portainer/Dockerfile b/portainer/Dockerfile
index d24f84954..e80c70be1 100644
--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -90,8 +90,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 RUN chmod 777 /etc/services.d/*/*
 #
diff --git a/portainer_agent/Dockerfile b/portainer_agent/Dockerfile
index 9df9e922b..494c9adc7 100644
--- a/portainer_agent/Dockerfile
+++ b/portainer_agent/Dockerfile
@@ -76,8 +76,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 RUN chmod a+x /usr/sbin/healthcheck && \
     chmod a+x /usr/sbin/wait-for-signal
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index a7c74f5c9..33caf2db5 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -72,8 +72,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 WORKDIR /data
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index 56c4ebd1c..f5bbf7f92 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -95,8 +95,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index 6b1287dd5..fbcf96a7b 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -130,8 +130,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index de17f19e3..f72ae1d5d 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -96,8 +96,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index 899a5e684..a1071294e 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -93,8 +93,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index f07193541..e976bbcbd 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -95,8 +95,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index d249ca0d9..995e7c8d5 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -115,8 +115,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile
index 314cb21ff..d82cb6f43 100644
--- a/sabnzbd/Dockerfile
+++ b/sabnzbd/Dockerfile
@@ -92,8 +92,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index beb5d662f..627ecd54d 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -70,8 +70,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 
diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile
index beb5d662f..627ecd54d 100644
--- a/scrutiny_fa/Dockerfile
+++ b/scrutiny_fa/Dockerfile
@@ -70,8 +70,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 
diff --git a/seafile/Dockerfile b/seafile/Dockerfile
index 0f6e3e258..837f8c357 100644
--- a/seafile/Dockerfile
+++ b/seafile/Dockerfile
@@ -72,8 +72,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index a7d0dc754..74dadc8d4 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -96,8 +96,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/sponsorblockcast/Dockerfile b/sponsorblockcast/Dockerfile
index bfc119cad..ee97a1da2 100644
--- a/sponsorblockcast/Dockerfile
+++ b/sponsorblockcast/Dockerfile
@@ -69,8 +69,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 # Entrypoint logic
 
diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile
index 986246714..90ea34126 100644
--- a/spotweb/Dockerfile
+++ b/spotweb/Dockerfile
@@ -125,8 +125,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile
index 5ae0237c5..07acea548 100644
--- a/tandoor_recipes/Dockerfile
+++ b/tandoor_recipes/Dockerfile
@@ -66,8 +66,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 #WORKDIR /data/recipes
diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile
index 2ee7525be..42fd23b73 100644
--- a/tdarr/Dockerfile
+++ b/tdarr/Dockerfile
@@ -67,8 +67,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile
index 3399b42b6..46552804b 100644
--- a/teamspeak/Dockerfile
+++ b/teamspeak/Dockerfile
@@ -73,8 +73,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index 2b2566f63..d661c46a6 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -102,8 +102,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile
index 920d17576..f18514dcd 100644
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -97,8 +97,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 CMD [ "/ha_entrypoint.sh" ]
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index 106ccafc8..f38bf2413 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -105,8 +105,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile
index 2d8912c96..e2e26f93a 100644
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -91,8 +91,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 ############
 # 5 Labels #
diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index 8b225eede..4e36cf215 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -80,8 +80,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/wger/Dockerfile b/wger/Dockerfile
index f457ecb85..e962a10cc 100644
--- a/wger/Dockerfile
+++ b/wger/Dockerfile
@@ -77,8 +77,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 USER wger
diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile
index 4e9b2a434..b19a3d466 100644
--- a/whoogle/Dockerfile
+++ b/whoogle/Dockerfile
@@ -72,8 +72,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]
diff --git a/xteve/Dockerfile b/xteve/Dockerfile
index e33a03962..31bd95b05 100644
--- a/xteve/Dockerfile
+++ b/xteve/Dockerfile
@@ -72,8 +72,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 #
 #WORKDIR /
diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile
index 95f7fd13f..e15e732d3 100644
--- a/zoneminder/Dockerfile
+++ b/zoneminder/Dockerfile
@@ -77,8 +77,7 @@ ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/mas
 
 # Corrects permissions for s6 v3
 RUN 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 && \
-    if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
 
 
 ENTRYPOINT [ "/usr/bin/env" ]