From 8a925613a7ccd231f227448589219cb972aa2b58 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Tue, 5 Sep 2023 12:05:39 +0200
Subject: [PATCH] User docker-mods for entrypoint when available

---
 addons_updater/rootfs/entrypoint.sh              | 1 +
 arpspoof/rootfs/entrypoint.sh                    | 1 +
 autobrr/Dockerfile                               | 5 ++++-
 autobrr/rootfs/entrypoint.sh                     | 1 +
 autobrr/rootfs/etc/entrypoint.sh                 | 1 +
 baikal/rootfs/entrypoint.sh                      | 1 +
 bazarr/Dockerfile                                | 5 ++++-
 binance-trading-bot/rootfs/entrypoint.sh         | 1 +
 booksonic_air/Dockerfile                         | 5 ++++-
 browserless_chrome/rootfs/entrypoint.sh          | 1 +
 calibre/Dockerfile                               | 5 ++++-
 calibre_web/Dockerfile                           | 5 ++++-
 cloudcommander/rootfs/entrypoint.sh              | 1 +
 code-server/Dockerfile                           | 5 ++++-
 emby/Dockerfile                                  | 5 ++++-
 enedisgateway2mqtt/rootfs/entrypoint.sh          | 1 +
 enedisgateway2mqtt_dev/rootfs/entrypoint.sh      | 1 +
 epicgamesfree/rootfs/entrypoint.sh               | 1 +
 filebrowser/rootfs/entrypoint.sh                 | 1 +
 fireflyiii/rootfs/entrypoint.sh                  | 1 +
 fireflyiii_data_importer/rootfs/entrypoint.sh    | 1 +
 fireflyiii_fints_importer/rootfs/entrypoint.sh   | 1 +
 flaresolverr/rootfs/entrypoint.sh                | 1 +
 flexget/Dockerfile                               | 5 ++++-
 free_games_claimer/rootfs/entrypoint.sh          | 1 +
 gazpar2mqtt/rootfs/entrypoint.sh                 | 1 +
 gitea/rootfs/entrypoint.sh                       | 1 +
 grav/Dockerfile                                  | 5 ++++-
 immich/Dockerfile                                | 5 ++++-
 inadyn/rootfs/entrypoint.sh                      | 1 +
 jackett/Dockerfile                               | 5 ++++-
 jellyfin/Dockerfile                              | 5 ++++-
 jellyseerr/rootfs/entrypoint.sh                  | 1 +
 joal/rootfs/entrypoint.sh                        | 1 +
 joplin/rootfs/entrypoint.sh                      | 1 +
 lidarr/Dockerfile                                | 5 ++++-
 mealie/rootfs/run.txt                            | 1 +
 mylar3/Dockerfile                                | 5 ++++-
 nextcloud/Dockerfile                             | 5 ++++-
 nextcloud/rootfs/etc/entrypoint.sh               | 1 +
 nzbget/Dockerfile                                | 5 ++++-
 ombi/Dockerfile                                  | 5 ++++-
 organizr/Dockerfile                              | 5 ++++-
 overseerr/Dockerfile                             | 5 ++++-
 paperless_ngx/rootfs/entrypoint.sh               | 1 +
 papermerge/Dockerfile                            | 5 ++++-
 photoprism/rootfs/entrypoint.sh                  | 1 +
 piwigo/Dockerfile                                | 5 ++++-
 plex/Dockerfile                                  | 5 ++++-
 plex_meta_manager/Dockerfile                     | 5 ++++-
 postgres/rootfs/entrypoint.sh                    | 1 +
 prowlarr/Dockerfile                              | 5 ++++-
 qbittorrent/Dockerfile                           | 5 ++++-
 radarr/Dockerfile                                | 5 ++++-
 readarr/Dockerfile                               | 5 ++++-
 requestrr/Dockerfile                             | 5 ++++-
 resiliosync/Dockerfile                           | 5 ++++-
 sabnzbd/Dockerfile                               | 5 ++++-
 seafile/rootfs/entrypoint.sh                     | 1 +
 sonarr/Dockerfile                                | 5 ++++-
 sponsorblockcast/rootfs/entrypoint.sh            | 1 +
 tandoor_recipes/rootfs/entrypoint.sh             | 1 +
 transmission/Dockerfile                          | 5 ++++-
 transmission_openvpn/Dockerfile                  | 5 ++++-
 transmission_openvpn/rootfs/entrypoint.sh        | 1 +
 ubooquity/Dockerfile                             | 5 ++++-
 unpackerr/Dockerfile                             | 5 ++++-
 webtop_kde/Dockerfile                            | 8 +++++---
 webtop_kde/{docker-mods => rootfs}/entrypoint.sh | 0
 webtrees/rootfs/entrypoint.sh                    | 1 +
 wger/rootfs/entrypoint.sh                        | 1 +
 whoogle/rootfs/entrypoint.sh                     | 1 +
 zoneminder/rootfs/entrypoint.sh                  | 1 +
 73 files changed, 181 insertions(+), 38 deletions(-)
 rename webtop_kde/{docker-mods => rootfs}/entrypoint.sh (100%)
 mode change 100755 => 100644

diff --git a/addons_updater/rootfs/entrypoint.sh b/addons_updater/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/addons_updater/rootfs/entrypoint.sh
+++ b/addons_updater/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/arpspoof/rootfs/entrypoint.sh b/arpspoof/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/arpspoof/rootfs/entrypoint.sh
+++ b/arpspoof/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile
index 3cc84206e..2bf6ef653 100644
--- a/autobrr/Dockerfile
+++ b/autobrr/Dockerfile
@@ -51,7 +51,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/autobrr/rootfs/entrypoint.sh b/autobrr/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/autobrr/rootfs/entrypoint.sh
+++ b/autobrr/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/autobrr/rootfs/etc/entrypoint.sh b/autobrr/rootfs/etc/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/autobrr/rootfs/etc/entrypoint.sh
+++ b/autobrr/rootfs/etc/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/baikal/rootfs/entrypoint.sh b/baikal/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/baikal/rootfs/entrypoint.sh
+++ b/baikal/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index b17cd421f..8632b264f 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -51,7 +51,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/binance-trading-bot/rootfs/entrypoint.sh b/binance-trading-bot/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/binance-trading-bot/rootfs/entrypoint.sh
+++ b/binance-trading-bot/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index 28230be5e..4790a69eb 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -53,7 +53,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/browserless_chrome/rootfs/entrypoint.sh b/browserless_chrome/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/browserless_chrome/rootfs/entrypoint.sh
+++ b/browserless_chrome/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/calibre/Dockerfile b/calibre/Dockerfile
index 332fc27ab..1ae5f281d 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -52,7 +52,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 # Specific images modifications
 RUN \
diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile
index 410d4cf2a..5f0f8a1b5 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -57,7 +57,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 # Specific images modifications
 RUN \
diff --git a/cloudcommander/rootfs/entrypoint.sh b/cloudcommander/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/cloudcommander/rootfs/entrypoint.sh
+++ b/cloudcommander/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index f1a9c6037..e8b93db28 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -51,7 +51,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/emby/Dockerfile b/emby/Dockerfile
index a269ddbde..94fa1de7b 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -51,7 +51,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/enedisgateway2mqtt/rootfs/entrypoint.sh b/enedisgateway2mqtt/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/enedisgateway2mqtt/rootfs/entrypoint.sh
+++ b/enedisgateway2mqtt/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/enedisgateway2mqtt_dev/rootfs/entrypoint.sh b/enedisgateway2mqtt_dev/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/enedisgateway2mqtt_dev/rootfs/entrypoint.sh
+++ b/enedisgateway2mqtt_dev/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/epicgamesfree/rootfs/entrypoint.sh b/epicgamesfree/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/epicgamesfree/rootfs/entrypoint.sh
+++ b/epicgamesfree/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/filebrowser/rootfs/entrypoint.sh b/filebrowser/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/filebrowser/rootfs/entrypoint.sh
+++ b/filebrowser/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/fireflyiii/rootfs/entrypoint.sh b/fireflyiii/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/fireflyiii/rootfs/entrypoint.sh
+++ b/fireflyiii/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/fireflyiii_data_importer/rootfs/entrypoint.sh b/fireflyiii_data_importer/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/fireflyiii_data_importer/rootfs/entrypoint.sh
+++ b/fireflyiii_data_importer/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/fireflyiii_fints_importer/rootfs/entrypoint.sh b/fireflyiii_fints_importer/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/fireflyiii_fints_importer/rootfs/entrypoint.sh
+++ b/fireflyiii_fints_importer/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/flaresolverr/rootfs/entrypoint.sh b/flaresolverr/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/flaresolverr/rootfs/entrypoint.sh
+++ b/flaresolverr/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index e4184f8fb..2fd3d0ca9 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -60,7 +60,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/free_games_claimer/rootfs/entrypoint.sh b/free_games_claimer/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/free_games_claimer/rootfs/entrypoint.sh
+++ b/free_games_claimer/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/gazpar2mqtt/rootfs/entrypoint.sh b/gazpar2mqtt/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/gazpar2mqtt/rootfs/entrypoint.sh
+++ b/gazpar2mqtt/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/gitea/rootfs/entrypoint.sh b/gitea/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/gitea/rootfs/entrypoint.sh
+++ b/gitea/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/grav/Dockerfile b/grav/Dockerfile
index ea826aa1d..5884ddf4d 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -51,7 +51,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/immich/Dockerfile b/immich/Dockerfile
index 61aea3897..0190ee072 100644
--- a/immich/Dockerfile
+++ b/immich/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 USER root
 
diff --git a/inadyn/rootfs/entrypoint.sh b/inadyn/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/inadyn/rootfs/entrypoint.sh
+++ b/inadyn/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index 707f5a4de..04d9a42ad 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 # Changes config directory
 ENV XDG_CONFIG_HOME="/config/addons_config"
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index 8970255b9..05d4670b9 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -51,7 +51,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 RUN \
     sed -i "s|contenv bash|contenv bashio|g" /etc/s6-overlay/s6-rc.d/svc-jellyfin/run && \
diff --git a/jellyseerr/rootfs/entrypoint.sh b/jellyseerr/rootfs/entrypoint.sh
index 85d8a9212..59f91276b 100755
--- a/jellyseerr/rootfs/entrypoint.sh
+++ b/jellyseerr/rootfs/entrypoint.sh
@@ -24,4 +24,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/joal/rootfs/entrypoint.sh b/joal/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/joal/rootfs/entrypoint.sh
+++ b/joal/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/joplin/rootfs/entrypoint.sh b/joplin/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/joplin/rootfs/entrypoint.sh
+++ b/joplin/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index fef324b7a..a5a0b7ed3 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/mealie/rootfs/run.txt b/mealie/rootfs/run.txt
index 4633a1c83..56663d6eb 100644
--- a/mealie/rootfs/run.txt
+++ b/mealie/rootfs/run.txt
@@ -17,6 +17,7 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
 
 ####################
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index ea3d50408..116cd409f 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index a7d89a876..a66ad4c8f 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -82,7 +82,10 @@ RUN \
     && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $file ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/nextcloud/rootfs/etc/entrypoint.sh b/nextcloud/rootfs/etc/entrypoint.sh
index 85d8a9212..59f91276b 100755
--- a/nextcloud/rootfs/etc/entrypoint.sh
+++ b/nextcloud/rootfs/etc/entrypoint.sh
@@ -24,4 +24,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
index 83d709c2b..d29756143 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index 1d814ada6..e09ceb9b6 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index 5276e4773..90588b55a 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -49,7 +49,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile
index e17f8e685..9777965cd 100644
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -51,7 +51,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/paperless_ngx/rootfs/entrypoint.sh b/paperless_ngx/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/paperless_ngx/rootfs/entrypoint.sh
+++ b/paperless_ngx/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index fcfa3036a..a5256373a 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -57,7 +57,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/photoprism/rootfs/entrypoint.sh b/photoprism/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/photoprism/rootfs/entrypoint.sh
+++ b/photoprism/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index d39c4276a..e8c4e3fec 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/plex/Dockerfile b/plex/Dockerfile
index 92edd0c4f..df9317a92 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -59,7 +59,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 
 ##################
diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile
index 5e03321de..9d90b87bc 100644
--- a/plex_meta_manager/Dockerfile
+++ b/plex_meta_manager/Dockerfile
@@ -58,7 +58,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/postgres/rootfs/entrypoint.sh b/postgres/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/postgres/rootfs/entrypoint.sh
+++ b/postgres/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index dfd57584b..f091f84e4 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index 57d2d4aa1..95cfbfaff 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -79,7 +79,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index 43cc6a866..fbdcd47d2 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index 4fc93a497..2549d972c 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -51,7 +51,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index ed662496f..01fe5c9ea 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index dc1e6181c..fffbc7147 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -69,7 +69,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile
index 8f4ad1488..aee850bde 100644
--- a/sabnzbd/Dockerfile
+++ b/sabnzbd/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/seafile/rootfs/entrypoint.sh b/seafile/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/seafile/rootfs/entrypoint.sh
+++ b/seafile/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index 42438ec4d..8d45e71fc 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -51,7 +51,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/sponsorblockcast/rootfs/entrypoint.sh b/sponsorblockcast/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/sponsorblockcast/rootfs/entrypoint.sh
+++ b/sponsorblockcast/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/tandoor_recipes/rootfs/entrypoint.sh b/tandoor_recipes/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/tandoor_recipes/rootfs/entrypoint.sh
+++ b/tandoor_recipes/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index cff1978e6..305c6e163 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -60,7 +60,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "2a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods && chmod +x /docker-mods ; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile
index 3f95a3870..cff79b2b5 100644
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -55,7 +55,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/transmission_openvpn/rootfs/entrypoint.sh b/transmission_openvpn/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/transmission_openvpn/rootfs/entrypoint.sh
+++ b/transmission_openvpn/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index 411e18662..d0b5e17aa 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -60,7 +60,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile
index 5d6b0c002..a8d2b5028 100644
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -50,7 +50,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile
index e6bd253a7..8f8a0f6fc 100644
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -60,7 +60,10 @@ RUN \
     #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
     \
     # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
+    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi && \
+    \
+    # Add entrypoint if existing
+    && if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then echo "/./entrypoint.sh" >> /docker-mods; fi
 
 ##################
 # 3 Install apps #
@@ -72,8 +75,7 @@ COPY rootfs/ /
 # 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 /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi && \
-    if [ -f /docker-mods/entrypoint.sh ]; then chmod 755 /docker-mods/entrypoint.sh; fi
+    if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi
 
 # Modules
 ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-dns_set.sh"
diff --git a/webtop_kde/docker-mods/entrypoint.sh b/webtop_kde/rootfs/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from webtop_kde/docker-mods/entrypoint.sh
rename to webtop_kde/rootfs/entrypoint.sh
diff --git a/webtrees/rootfs/entrypoint.sh b/webtrees/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/webtrees/rootfs/entrypoint.sh
+++ b/webtrees/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/wger/rootfs/entrypoint.sh b/wger/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/wger/rootfs/entrypoint.sh
+++ b/wger/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/whoogle/rootfs/entrypoint.sh b/whoogle/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/whoogle/rootfs/entrypoint.sh
+++ b/whoogle/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done
diff --git a/zoneminder/rootfs/entrypoint.sh b/zoneminder/rootfs/entrypoint.sh
index 68c3fec4d..0b33a2d10 100755
--- a/zoneminder/rootfs/entrypoint.sh
+++ b/zoneminder/rootfs/entrypoint.sh
@@ -13,4 +13,5 @@ for SCRIPTS in /etc/cont-init.d/*; do
     # Change shebang if no s6 supervision
     sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
     /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    rm "$SCRIPTS"
 done