diff --git a/Dockerfile b/Dockerfile
index e8bbd2cebb4..09fa0e70cef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -74,7 +74,8 @@ exec /image/scripts/start
 EOF
 
 COPY --chmod=755 scripts/auto/* /image/scripts/auto/
-COPY --chmod=755 files/shims/ /usr/local/bin/
+COPY --chmod=755 scripts/shims/* /image/scripts/shims/
+RUN ln -s /image/scripts/shims/* /usr/local/bin/
 COPY --chmod=755 files/* /image/
 
 RUN curl -fsSL -o /image/Log4jPatcher.jar https://github.com/CreeperHost/Log4jPatcher/releases/download/v1.0.1/Log4jPatcher-1.0.1.jar
diff --git a/files/shims/rcon-cmds-daemon.sh b/scripts/auto/rcon-cmds-daemon.sh
similarity index 100%
rename from files/shims/rcon-cmds-daemon.sh
rename to scripts/auto/rcon-cmds-daemon.sh
diff --git a/files/shims/mc-health b/scripts/shims/mc-health
similarity index 100%
rename from files/shims/mc-health
rename to scripts/shims/mc-health
diff --git a/files/shims/mc-send-to-console b/scripts/shims/mc-send-to-console
similarity index 100%
rename from files/shims/mc-send-to-console
rename to scripts/shims/mc-send-to-console
diff --git a/files/shims/mcstatus b/scripts/shims/mcstatus
similarity index 100%
rename from files/shims/mcstatus
rename to scripts/shims/mcstatus
diff --git a/scripts/start-rconcmds b/scripts/start-rconcmds
index f6608f96c16..551e60b111e 100644
--- a/scripts/start-rconcmds
+++ b/scripts/start-rconcmds
@@ -25,4 +25,4 @@ isDebugging && set -x
 isNumericElseSetToDefault RCON_CMDS_PERIOD 10
 checkIfNotZeroElseSetToDefault RCON_CMDS_PERIOD 10
 
-/usr/local/bin/rcon-cmds-daemon.sh &
+"$(dirname "$0")/auto/rcon-cmds-daemon.sh" &