diff --git a/puppetserver/docker-entrypoint.sh b/puppetserver/docker-entrypoint.sh
index 1a16c6f1..47c50b2f 100755
--- a/puppetserver/docker-entrypoint.sh
+++ b/puppetserver/docker-entrypoint.sh
@@ -12,8 +12,10 @@ if [ -d /docker-custom-entrypoint.d/ ]; then
     find /docker-custom-entrypoint.d/ -type f -name "*.sh" \
         -exec chmod +x {} \;
     sync
-    find /docker-custom-entrypoint.d/ -type f -name "*.sh" \
-        -exec echo Running {} \; -exec {} \;
+    for f in /docker-custom-entrypoint.d/*.sh; do
+        echo "Running $f"
+        "$f"
+    done
 fi
 
 exec /opt/puppetlabs/bin/puppetserver "$@"