diff --git a/lib-injection/build/docker/python/dd-lib-python-init-test-django-27/Dockerfile b/lib-injection/build/docker/python/dd-lib-python-init-test-django-27/Dockerfile
index eea7cec4169..ecc0eee89fa 100644
--- a/lib-injection/build/docker/python/dd-lib-python-init-test-django-27/Dockerfile
+++ b/lib-injection/build/docker/python/dd-lib-python-init-test-django-27/Dockerfile
@@ -9,4 +9,4 @@ EXPOSE 18080
 
 # Many users run a non-root user, ensure this is supported by the injection mechanism
 USER 1000
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/lib-injection/build/docker/python/dd-lib-python-init-test-django-gunicorn-alpine/Dockerfile b/lib-injection/build/docker/python/dd-lib-python-init-test-django-gunicorn-alpine/Dockerfile
index f9532edf7ab..b5cddfde864 100644
--- a/lib-injection/build/docker/python/dd-lib-python-init-test-django-gunicorn-alpine/Dockerfile
+++ b/lib-injection/build/docker/python/dd-lib-python-init-test-django-gunicorn-alpine/Dockerfile
@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django gunicorn
 EXPOSE 18080
-CMD gunicorn --bind :18080 django_app:application
+CMD ["gunicorn", "--bind", ":18080", "django_app:application"]
diff --git a/lib-injection/build/docker/python/dd-lib-python-init-test-django-gunicorn/Dockerfile b/lib-injection/build/docker/python/dd-lib-python-init-test-django-gunicorn/Dockerfile
index 2517a97b778..6f04d8d5732 100644
--- a/lib-injection/build/docker/python/dd-lib-python-init-test-django-gunicorn/Dockerfile
+++ b/lib-injection/build/docker/python/dd-lib-python-init-test-django-gunicorn/Dockerfile
@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django gunicorn
 EXPOSE 18080
-CMD gunicorn --bind :18080 django_app:application
+CMD ["gunicorn", "--bind", ":18080", "django_app:application"]
diff --git a/lib-injection/build/docker/python/dd-lib-python-init-test-django-preinstalled/Dockerfile b/lib-injection/build/docker/python/dd-lib-python-init-test-django-preinstalled/Dockerfile
index ab366dbc43a..dae75c83d78 100644
--- a/lib-injection/build/docker/python/dd-lib-python-init-test-django-preinstalled/Dockerfile
+++ b/lib-injection/build/docker/python/dd-lib-python-init-test-django-preinstalled/Dockerfile
@@ -11,4 +11,4 @@ EXPOSE 18080
 
 # Many users run a non-root user, ensure this is supported by the injection mechanism
 USER 1000
-CMD ddtrace-run python -m django runserver 0.0.0.0:18080
+CMD ["ddtrace-run", "python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/lib-injection/build/docker/python/dd-lib-python-init-test-django-unsupported-package-force/Dockerfile b/lib-injection/build/docker/python/dd-lib-python-init-test-django-unsupported-package-force/Dockerfile
index be2237161b7..e2599e9fc40 100644
--- a/lib-injection/build/docker/python/dd-lib-python-init-test-django-unsupported-package-force/Dockerfile
+++ b/lib-injection/build/docker/python/dd-lib-python-init-test-django-unsupported-package-force/Dockerfile
@@ -8,4 +8,4 @@ ADD . /src
 RUN pip install django structlog==16.0.0
 
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/lib-injection/build/docker/python/dd-lib-python-init-test-django-uvicorn/Dockerfile b/lib-injection/build/docker/python/dd-lib-python-init-test-django-uvicorn/Dockerfile
index 91658ad1110..21cf1311c53 100644
--- a/lib-injection/build/docker/python/dd-lib-python-init-test-django-uvicorn/Dockerfile
+++ b/lib-injection/build/docker/python/dd-lib-python-init-test-django-uvicorn/Dockerfile
@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django uvicorn
 EXPOSE 18080
-CMD uvicorn --host 0.0.0.0 --port 18080 django_app:application
+CMD ["uvicorn", "--host", "0.0.0.0", "--port", "18080", "django_app:application"]
diff --git a/lib-injection/build/docker/python/dd-lib-python-init-test-django/Dockerfile b/lib-injection/build/docker/python/dd-lib-python-init-test-django/Dockerfile
index f232ab9d4fb..80e136d363f 100644
--- a/lib-injection/build/docker/python/dd-lib-python-init-test-django/Dockerfile
+++ b/lib-injection/build/docker/python/dd-lib-python-init-test-django/Dockerfile
@@ -9,4 +9,4 @@ EXPOSE 18080
 
 # Many users run a non-root user, ensure this is supported by the injection mechanism
 USER 1000
-CMD python -m django runserver 0.0.0.0:18080
\ No newline at end of file
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
\ No newline at end of file
diff --git a/utils/build/docker/cpp_httpd/httpd.Dockerfile b/utils/build/docker/cpp_httpd/httpd.Dockerfile
index 56287e5197a..494cd3c1522 100644
--- a/utils/build/docker/cpp_httpd/httpd.Dockerfile
+++ b/utils/build/docker/cpp_httpd/httpd.Dockerfile
@@ -24,9 +24,9 @@ RUN a2enmod datadog
 # Create C++ application
 RUN echo "Hello world\n" > /app/index.html
 WORKDIR /app
-RUN echo "#!/bin/bash\napachectl -D FOREGROUND" > app.sh
+RUN echo "#!/bin/bash\nexec apachectl -D FOREGROUND" > app.sh
 RUN chmod +x app.sh
 
 EXPOSE 7777
 
-CMD ./app.sh
+CMD ["./app.sh"]
diff --git a/utils/build/docker/java/spring-boot-openliberty.Dockerfile b/utils/build/docker/java/spring-boot-openliberty.Dockerfile
index 4916db458ae..e58e7a70d93 100644
--- a/utils/build/docker/java/spring-boot-openliberty.Dockerfile
+++ b/utils/build/docker/java/spring-boot-openliberty.Dockerfile
@@ -28,6 +28,6 @@ ENV DD_TRACE_HEADER_TAGS='user-agent:http.request.headers.user-agent'
 
 ENV JVM_ARGS='-javaagent:/app/dd-java-agent.jar'
 
-RUN echo "#!/bin/bash\njava -Xmx362m -jar /app/app.jar" > app.sh
+RUN echo "#!/bin/bash\nexec java -Xmx362m -jar /app/app.jar" > app.sh
 RUN chmod +x app.sh
 CMD [ "/app/app.sh" ]
diff --git a/utils/build/docker/java/spring-boot/app.sh b/utils/build/docker/java/spring-boot/app.sh
index 97666910497..d6e5975799d 100755
--- a/utils/build/docker/java/spring-boot/app.sh
+++ b/utils/build/docker/java/spring-boot/app.sh
@@ -4,7 +4,7 @@ if [ ${UDS_WEBLOG:-} = "1" ]; then
     ./set-uds-transport.sh
 fi
 
-java \
+exec java \
     -Xmx362m \
     -XX:ErrorFile=/var/log/system-tests/hs_err_%p_%t_%u.log \
     -javaagent:/app/dd-java-agent.jar \
diff --git a/utils/build/docker/java_otel/spring-boot-native.Dockerfile b/utils/build/docker/java_otel/spring-boot-native.Dockerfile
index 6c7bebfe3eb..3391c4a1d1a 100644
--- a/utils/build/docker/java_otel/spring-boot-native.Dockerfile
+++ b/utils/build/docker/java_otel/spring-boot-native.Dockerfile
@@ -17,6 +17,6 @@ RUN mvn clean package
 # Set up required args
 RUN echo $OTEL_VERSION > SYSTEM_TESTS_LIBRARY_VERSION
 
-RUN echo "#!/bin/bash\njava -jar target/myproject-3.0.0-SNAPSHOT.jar --server.port=7777" > app.sh
+RUN echo "#!/bin/bash\nexec java -jar target/myproject-3.0.0-SNAPSHOT.jar --server.port=7777" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/java_otel/spring-boot/app.sh b/utils/build/docker/java_otel/spring-boot/app.sh
index b3759b90dd4..09e4b76d6fc 100644
--- a/utils/build/docker/java_otel/spring-boot/app.sh
+++ b/utils/build/docker/java_otel/spring-boot/app.sh
@@ -4,4 +4,4 @@ if [ ${UDS_WEBLOG:-} = "1" ]; then
     ./set-uds-transport.sh
 fi
 
-java -Xmx362m -javaagent:/app/dd-java-agent.jar -jar /app/myproject-0.0.1-SNAPSHOT.jar --server.port=7777
+exec java -Xmx362m -javaagent:/app/dd-java-agent.jar -jar /app/myproject-0.0.1-SNAPSHOT.jar --server.port=7777
diff --git a/utils/build/docker/nodejs/anthropic-js.Dockerfile b/utils/build/docker/nodejs/anthropic-js.Dockerfile
index e22fa6bae6d..bc0193daa43 100644
--- a/utils/build/docker/nodejs/anthropic-js.Dockerfile
+++ b/utils/build/docker/nodejs/anthropic-js.Dockerfile
@@ -24,5 +24,5 @@ RUN /binaries/install_ddtrace.sh
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
\ No newline at end of file
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
diff --git a/utils/build/docker/nodejs/express4-typescript.Dockerfile b/utils/build/docker/nodejs/express4-typescript.Dockerfile
index cacd72d0b6d..a0de2c6863e 100644
--- a/utils/build/docker/nodejs/express4-typescript.Dockerfile
+++ b/utils/build/docker/nodejs/express4-typescript.Dockerfile
@@ -24,8 +24,8 @@ ENV DD_DATA_STREAMS_ENABLED=true
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node dist/app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node dist/app.js' >> app.sh
+CMD ["./app.sh"]
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
 
diff --git a/utils/build/docker/nodejs/express4.Dockerfile b/utils/build/docker/nodejs/express4.Dockerfile
index 245e9a4cba0..c6f68043218 100644
--- a/utils/build/docker/nodejs/express4.Dockerfile
+++ b/utils/build/docker/nodejs/express4.Dockerfile
@@ -31,8 +31,8 @@ ENV DD_DATA_STREAMS_ENABLED=true
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
 RUN chmod +x app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
 RUN /binaries/install_ddtrace.sh
diff --git a/utils/build/docker/nodejs/express5.Dockerfile b/utils/build/docker/nodejs/express5.Dockerfile
index 9df68642695..23393a6290d 100644
--- a/utils/build/docker/nodejs/express5.Dockerfile
+++ b/utils/build/docker/nodejs/express5.Dockerfile
@@ -29,8 +29,8 @@ ENV DD_DATA_STREAMS_ENABLED=true
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
 RUN chmod +x app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
 RUN /binaries/install_ddtrace.sh
diff --git a/utils/build/docker/nodejs/fastify.Dockerfile b/utils/build/docker/nodejs/fastify.Dockerfile
index f8552f28b68..90b6d7f09e5 100644
--- a/utils/build/docker/nodejs/fastify.Dockerfile
+++ b/utils/build/docker/nodejs/fastify.Dockerfile
@@ -28,8 +28,8 @@ ENV DD_DATA_STREAMS_ENABLED=true
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
 RUN chmod +x app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
 RUN /binaries/install_ddtrace.sh
diff --git a/utils/build/docker/nodejs/google_genai-js.Dockerfile b/utils/build/docker/nodejs/google_genai-js.Dockerfile
index 027a21ee443..62f91a5b625 100644
--- a/utils/build/docker/nodejs/google_genai-js.Dockerfile
+++ b/utils/build/docker/nodejs/google_genai-js.Dockerfile
@@ -24,5 +24,5 @@ RUN /binaries/install_ddtrace.sh
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
\ No newline at end of file
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
diff --git a/utils/build/docker/nodejs/nextjs.Dockerfile b/utils/build/docker/nodejs/nextjs.Dockerfile
index 476eb8af508..dfcf052a9cd 100644
--- a/utils/build/docker/nodejs/nextjs.Dockerfile
+++ b/utils/build/docker/nodejs/nextjs.Dockerfile
@@ -25,6 +25,6 @@ ENV DD_DATA_STREAMS_ENABLED=true
 ENV PORT=7777
 ENV HOSTNAME=0.0.0.0
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf './node_modules/.bin/next start' >> app.sh
 ENV NODE_OPTIONS="--import dd-trace/initialize.mjs"
-CMD ./app.sh
+RUN printf 'exec ./node_modules/.bin/next start' >> app.sh
+CMD ["./app.sh"]
diff --git a/utils/build/docker/nodejs/openai-js.Dockerfile b/utils/build/docker/nodejs/openai-js.Dockerfile
index 8ab2c81d541..da7be603909 100644
--- a/utils/build/docker/nodejs/openai-js.Dockerfile
+++ b/utils/build/docker/nodejs/openai-js.Dockerfile
@@ -24,5 +24,5 @@ RUN /binaries/install_ddtrace.sh
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
\ No newline at end of file
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
diff --git a/utils/build/docker/nodejs/parametric/app.sh b/utils/build/docker/nodejs/parametric/app.sh
index c3f9c53d771..4eceb259bc7 100755
--- a/utils/build/docker/nodejs/parametric/app.sh
+++ b/utils/build/docker/nodejs/parametric/app.sh
@@ -13,4 +13,4 @@ if [ -e /volumes/dd-trace-js ]; then
 fi
 
 # shellcheck disable=SC2086
-node server.js ${SYSTEM_TESTS_EXTRA_COMMAND_ARGUMENTS:-}
\ No newline at end of file
+exec node server.js ${SYSTEM_TESTS_EXTRA_COMMAND_ARGUMENTS:-}
\ No newline at end of file
diff --git a/utils/build/docker/nodejs/uds-express4.Dockerfile b/utils/build/docker/nodejs/uds-express4.Dockerfile
index f77f889d6c4..074769c7068 100644
--- a/utils/build/docker/nodejs/uds-express4.Dockerfile
+++ b/utils/build/docker/nodejs/uds-express4.Dockerfile
@@ -33,9 +33,9 @@ ENV DD_DATA_STREAMS_ENABLED=true
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node app.js' >> app.sh
 COPY utils/build/docker/set-uds-transport.sh set-uds-transport.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
 RUN /binaries/install_ddtrace.sh
diff --git a/utils/build/docker/nodejs_otel/express4-otel.Dockerfile b/utils/build/docker/nodejs_otel/express4-otel.Dockerfile
index d2438714692..74b69fe8fa0 100644
--- a/utils/build/docker/nodejs_otel/express4-otel.Dockerfile
+++ b/utils/build/docker/nodejs_otel/express4-otel.Dockerfile
@@ -40,5 +40,5 @@ RUN npm install --save opentelemetry-instrumentation-mssql || npm install --save
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node --require @opentelemetry/auto-instrumentations-node/register app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node --require @opentelemetry/auto-instrumentations-node/register app.js' >> app.sh
+CMD ["./app.sh"]
diff --git a/utils/build/docker/php/apache-mod-7.0-zts.Dockerfile b/utils/build/docker/php/apache-mod-7.0-zts.Dockerfile
index 7a206f1d7c2..f59c3f4032e 100644
--- a/utils/build/docker/php/apache-mod-7.0-zts.Dockerfile
+++ b/utils/build/docker/php/apache-mod-7.0-zts.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-7.0.Dockerfile b/utils/build/docker/php/apache-mod-7.0.Dockerfile
index b4e3d01743f..ab6b896aa7a 100644
--- a/utils/build/docker/php/apache-mod-7.0.Dockerfile
+++ b/utils/build/docker/php/apache-mod-7.0.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-7.1-zts.Dockerfile b/utils/build/docker/php/apache-mod-7.1-zts.Dockerfile
index 6dc8497b724..0b4c9cbb29e 100644
--- a/utils/build/docker/php/apache-mod-7.1-zts.Dockerfile
+++ b/utils/build/docker/php/apache-mod-7.1-zts.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-7.1.Dockerfile b/utils/build/docker/php/apache-mod-7.1.Dockerfile
index 1812bdf9470..77cd6af29fb 100644
--- a/utils/build/docker/php/apache-mod-7.1.Dockerfile
+++ b/utils/build/docker/php/apache-mod-7.1.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-7.2-zts.Dockerfile b/utils/build/docker/php/apache-mod-7.2-zts.Dockerfile
index 772d2399ec8..8344a21c947 100644
--- a/utils/build/docker/php/apache-mod-7.2-zts.Dockerfile
+++ b/utils/build/docker/php/apache-mod-7.2-zts.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-7.2.Dockerfile b/utils/build/docker/php/apache-mod-7.2.Dockerfile
index 5829a267d9d..f58bcdfebd8 100644
--- a/utils/build/docker/php/apache-mod-7.2.Dockerfile
+++ b/utils/build/docker/php/apache-mod-7.2.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-7.3-zts.Dockerfile b/utils/build/docker/php/apache-mod-7.3-zts.Dockerfile
index 7e7f2efe791..a6764cc80f6 100644
--- a/utils/build/docker/php/apache-mod-7.3-zts.Dockerfile
+++ b/utils/build/docker/php/apache-mod-7.3-zts.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-7.3.Dockerfile b/utils/build/docker/php/apache-mod-7.3.Dockerfile
index 16f631d6183..92119de4d1d 100644
--- a/utils/build/docker/php/apache-mod-7.3.Dockerfile
+++ b/utils/build/docker/php/apache-mod-7.3.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-7.4-zts.Dockerfile b/utils/build/docker/php/apache-mod-7.4-zts.Dockerfile
index 892c539cd63..bc4f137eff8 100644
--- a/utils/build/docker/php/apache-mod-7.4-zts.Dockerfile
+++ b/utils/build/docker/php/apache-mod-7.4-zts.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-7.4.Dockerfile b/utils/build/docker/php/apache-mod-7.4.Dockerfile
index 013c9154e5a..263e554ed43 100644
--- a/utils/build/docker/php/apache-mod-7.4.Dockerfile
+++ b/utils/build/docker/php/apache-mod-7.4.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-8.0-zts.Dockerfile b/utils/build/docker/php/apache-mod-8.0-zts.Dockerfile
index a28a4a0b2f2..e6d241b56cb 100644
--- a/utils/build/docker/php/apache-mod-8.0-zts.Dockerfile
+++ b/utils/build/docker/php/apache-mod-8.0-zts.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-8.0.Dockerfile b/utils/build/docker/php/apache-mod-8.0.Dockerfile
index 21949b81e1a..836e86072dd 100644
--- a/utils/build/docker/php/apache-mod-8.0.Dockerfile
+++ b/utils/build/docker/php/apache-mod-8.0.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-8.1-zts.Dockerfile b/utils/build/docker/php/apache-mod-8.1-zts.Dockerfile
index e2f1055c805..a590d82290b 100644
--- a/utils/build/docker/php/apache-mod-8.1-zts.Dockerfile
+++ b/utils/build/docker/php/apache-mod-8.1-zts.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-8.1.Dockerfile b/utils/build/docker/php/apache-mod-8.1.Dockerfile
index bd3ff83bb38..99ffc901f07 100644
--- a/utils/build/docker/php/apache-mod-8.1.Dockerfile
+++ b/utils/build/docker/php/apache-mod-8.1.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-8.2-zts.Dockerfile b/utils/build/docker/php/apache-mod-8.2-zts.Dockerfile
index f00b2ddffc1..d7a47c018e5 100644
--- a/utils/build/docker/php/apache-mod-8.2-zts.Dockerfile
+++ b/utils/build/docker/php/apache-mod-8.2-zts.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/apache-mod-8.2.Dockerfile b/utils/build/docker/php/apache-mod-8.2.Dockerfile
index e7f576fb573..fa5f5e971cd 100644
--- a/utils/build/docker/php/apache-mod-8.2.Dockerfile
+++ b/utils/build/docker/php/apache-mod-8.2.Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/app.sh b/utils/build/docker/php/app.sh
index d5136918380..cb890a9a2d1 100644
--- a/utils/build/docker/php/app.sh
+++ b/utils/build/docker/php/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-#Nothing to do here. This file is to allow --sleep execution
+exec dumb-init /entrypoint.sh
diff --git a/utils/build/docker/php/php-fpm-7.0.Dockerfile b/utils/build/docker/php/php-fpm-7.0.Dockerfile
index 115d39b2f47..b2f503590bc 100644
--- a/utils/build/docker/php/php-fpm-7.0.Dockerfile
+++ b/utils/build/docker/php/php-fpm-7.0.Dockerfile
@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/php-fpm-7.1.Dockerfile b/utils/build/docker/php/php-fpm-7.1.Dockerfile
index a1e77992b1e..6fd9e97ef45 100644
--- a/utils/build/docker/php/php-fpm-7.1.Dockerfile
+++ b/utils/build/docker/php/php-fpm-7.1.Dockerfile
@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/php-fpm-7.2.Dockerfile b/utils/build/docker/php/php-fpm-7.2.Dockerfile
index b8e5c53ba81..b62d20cb390 100644
--- a/utils/build/docker/php/php-fpm-7.2.Dockerfile
+++ b/utils/build/docker/php/php-fpm-7.2.Dockerfile
@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/php-fpm-7.3.Dockerfile b/utils/build/docker/php/php-fpm-7.3.Dockerfile
index c6433e2f2e6..319ab60820b 100644
--- a/utils/build/docker/php/php-fpm-7.3.Dockerfile
+++ b/utils/build/docker/php/php-fpm-7.3.Dockerfile
@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/php-fpm-7.4.Dockerfile b/utils/build/docker/php/php-fpm-7.4.Dockerfile
index e5618b89ec6..a9d1314d670 100644
--- a/utils/build/docker/php/php-fpm-7.4.Dockerfile
+++ b/utils/build/docker/php/php-fpm-7.4.Dockerfile
@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/php-fpm-8.0.Dockerfile b/utils/build/docker/php/php-fpm-8.0.Dockerfile
index 3f0a811085b..53c91196c87 100644
--- a/utils/build/docker/php/php-fpm-8.0.Dockerfile
+++ b/utils/build/docker/php/php-fpm-8.0.Dockerfile
@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/php-fpm-8.1.Dockerfile b/utils/build/docker/php/php-fpm-8.1.Dockerfile
index 66dd9c35ff9..398760ea8b5 100644
--- a/utils/build/docker/php/php-fpm-8.1.Dockerfile
+++ b/utils/build/docker/php/php-fpm-8.1.Dockerfile
@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/php-fpm-8.2.Dockerfile b/utils/build/docker/php/php-fpm-8.2.Dockerfile
index 76867f2f429..a4e076a6aa9 100644
--- a/utils/build/docker/php/php-fpm-8.2.Dockerfile
+++ b/utils/build/docker/php/php-fpm-8.2.Dockerfile
@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/php/php-fpm-8.5.Dockerfile b/utils/build/docker/php/php-fpm-8.5.Dockerfile
index b076e190697..6c4635dd43c 100644
--- a/utils/build/docker/php/php-fpm-8.5.Dockerfile
+++ b/utils/build/docker/php/php-fpm-8.5.Dockerfile
@@ -19,6 +19,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/proxy.Dockerfile b/utils/build/docker/proxy.Dockerfile
index ca9ad7a0156..26e5d24fd20 100644
--- a/utils/build/docker/proxy.Dockerfile
+++ b/utils/build/docker/proxy.Dockerfile
@@ -7,4 +7,4 @@ RUN pip install requests-toolbelt==1.0.0 grpcio-tools==1.56.0 opentelemetry-prot
 
 COPY utils/proxy /app/utils/proxy
 
-CMD python utils/proxy/core.py
+CMD ["python", "utils/proxy/core.py"]
diff --git a/utils/build/docker/python/django-poc.Dockerfile b/utils/build/docker/python/django-poc.Dockerfile
index ad7be4d193a..bad25dd5e10 100644
--- a/utils/build/docker/python/django-poc.Dockerfile
+++ b/utils/build/docker/python/django-poc.Dockerfile
@@ -24,7 +24,7 @@ ENV DD_REMOTECONFIG_POLL_SECONDS=1
 ENV _DD_APPSEC_DEDUPLICATION_ENABLED=false
 
 # docker startup
-CMD ./app.sh
+CMD ["./app.sh"]
 
 # docker build -f utils/build/docker/python/django-poc.Dockerfile -t test .
 # docker run -ti -p 7777:7777 test
diff --git a/utils/build/docker/python/django-py3.13.Dockerfile b/utils/build/docker/python/django-py3.13.Dockerfile
index c4f0050d358..b40f7971caa 100644
--- a/utils/build/docker/python/django-py3.13.Dockerfile
+++ b/utils/build/docker/python/django-py3.13.Dockerfile
@@ -21,7 +21,7 @@ ENV DD_REMOTECONFIG_POLL_SECONDS=1
 ENV _DD_APPSEC_DEDUPLICATION_ENABLED=false
 
 # docker startup
-CMD ./app.sh
+CMD ["./app.sh"]
 
 # docker build -f utils/build/docker/python/django-py3.13.Dockerfile -t test .
 # docker run -ti -p 7777:7777 test
diff --git a/utils/build/docker/python/fastapi.Dockerfile b/utils/build/docker/python/fastapi.Dockerfile
index 6be5f4c5ae2..25a720c3915 100644
--- a/utils/build/docker/python/fastapi.Dockerfile
+++ b/utils/build/docker/python/fastapi.Dockerfile
@@ -19,7 +19,7 @@ ENV _DD_APPSEC_DEDUPLICATION_ENABLED=false
 ENV DD_CODE_ORIGIN_FOR_SPANS_ENABLED=0
 
 # docker startup
-CMD ./app.sh
+CMD ["./app.sh"]
 
 # docker build -f utils/build/docker/python/fastapi.Dockerfile -t test .
 # docker run -ti -p 7777:7777 test
diff --git a/utils/build/docker/python/flask-poc.Dockerfile b/utils/build/docker/python/flask-poc.Dockerfile
index 6855d928228..fccf785b794 100644
--- a/utils/build/docker/python/flask-poc.Dockerfile
+++ b/utils/build/docker/python/flask-poc.Dockerfile
@@ -25,7 +25,7 @@ ENV LOG_LEVEL='DEBUG'
 # FIXME: Ensure gevent patching occurs before ddtrace
 
 ENV FLASK_APP=app.py
-CMD ./app.sh
+CMD ["./app.sh"]
 
 # docker build -f utils/build/docker/python/flask-poc.Dockerfile -t test .
 # docker run -ti -p 7777:7777 test
diff --git a/utils/build/docker/python/python3.12.Dockerfile b/utils/build/docker/python/python3.12.Dockerfile
index 2383ada3f43..5e9e281f648 100644
--- a/utils/build/docker/python/python3.12.Dockerfile
+++ b/utils/build/docker/python/python3.12.Dockerfile
@@ -21,7 +21,7 @@ ENV DD_REMOTECONFIG_POLL_SECONDS=1
 ENV _DD_APPSEC_DEDUPLICATION_ENABLED=false
 
 # docker startup
-CMD ./app.sh
+CMD ["./app.sh"]
 
 # docker build -f utils/build/docker/python/django-poc.Dockerfile -t test .
 # docker run -ti -p 7777:7777 test
diff --git a/utils/build/docker/python/tornado.Dockerfile b/utils/build/docker/python/tornado.Dockerfile
index 2e7e1fa98e5..eb975dcda9d 100644
--- a/utils/build/docker/python/tornado.Dockerfile
+++ b/utils/build/docker/python/tornado.Dockerfile
@@ -16,7 +16,7 @@ COPY utils/build/docker/python/tornado/main.py /app/main.py
 COPY utils/build/docker/python/iast.py /app/iast.py
 
 # docker startup
-CMD ./app.sh
+CMD ["./app.sh"]
 
 # docker build -f utils/build/docker/python/tornado.Dockerfile -t test .
 # docker run -ti -p 7777:7777 test
diff --git a/utils/build/docker/python/uds-flask.Dockerfile b/utils/build/docker/python/uds-flask.Dockerfile
index 8d17aa066af..41de5c4c424 100644
--- a/utils/build/docker/python/uds-flask.Dockerfile
+++ b/utils/build/docker/python/uds-flask.Dockerfile
@@ -26,7 +26,7 @@ RUN apt-get update && apt-get install socat -y
 ENV UDS_WEBLOG=1
 COPY utils/build/docker/set-uds-transport.sh set-uds-transport.sh
 
-CMD ./app.sh
+CMD ["./app.sh"]
 
 # docker build -f utils/build/docker/python.flask-poc.Dockerfile -t test .
 # docker run -ti -p 7777:7777 test
diff --git a/utils/build/docker/python_otel/flask-poc-otel.Dockerfile b/utils/build/docker/python_otel/flask-poc-otel.Dockerfile
index e1ad5193d74..6a142ce4c6a 100644
--- a/utils/build/docker/python_otel/flask-poc-otel.Dockerfile
+++ b/utils/build/docker/python_otel/flask-poc-otel.Dockerfile
@@ -21,5 +21,5 @@ RUN pip freeze | grep opentelemetry
 
 ENV OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED=true
 ENV FLASK_APP=app.py
-CMD ./app.sh
+CMD ["./app.sh"]
 
diff --git a/utils/build/docker/python_otel/flask-poc-otel/app.sh b/utils/build/docker/python_otel/flask-poc-otel/app.sh
index 54f5165e22f..524b2a59d69 100755
--- a/utils/build/docker/python_otel/flask-poc-otel/app.sh
+++ b/utils/build/docker/python_otel/flask-poc-otel/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-opentelemetry-instrument gunicorn -w 1 -b 0.0.0.0:7777 --access-logfile - app:app -k gevent
\ No newline at end of file
+exec opentelemetry-instrument gunicorn -w 1 -b 0.0.0.0:7777 --access-logfile - app:app -k gevent
\ No newline at end of file
diff --git a/utils/build/docker/ruby/graphql23/app.sh b/utils/build/docker/ruby/graphql23/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/graphql23/app.sh
+++ b/utils/build/docker/ruby/graphql23/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/rack/app.sh b/utils/build/docker/ruby/rack/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/rack/app.sh
+++ b/utils/build/docker/ruby/rack/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/rails42/app.sh b/utils/build/docker/ruby/rails42/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/rails42/app.sh
+++ b/utils/build/docker/ruby/rails42/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/rails52/app.sh b/utils/build/docker/ruby/rails52/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/rails52/app.sh
+++ b/utils/build/docker/ruby/rails52/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/rails61/app.sh b/utils/build/docker/ruby/rails61/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/rails61/app.sh
+++ b/utils/build/docker/ruby/rails61/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/rails72/app.sh b/utils/build/docker/ruby/rails72/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/rails72/app.sh
+++ b/utils/build/docker/ruby/rails72/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/rails80/app.sh b/utils/build/docker/ruby/rails80/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/rails80/app.sh
+++ b/utils/build/docker/ruby/rails80/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/sinatra14/app.sh b/utils/build/docker/ruby/sinatra14/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/sinatra14/app.sh
+++ b/utils/build/docker/ruby/sinatra14/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/sinatra22/app.sh b/utils/build/docker/ruby/sinatra22/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/sinatra22/app.sh
+++ b/utils/build/docker/ruby/sinatra22/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/sinatra32/app.sh b/utils/build/docker/ruby/sinatra32/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/sinatra32/app.sh
+++ b/utils/build/docker/ruby/sinatra32/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/sinatra41/app.sh b/utils/build/docker/ruby/sinatra41/app.sh
index 5432d180f6e..a5e2176dcda 100755
--- a/utils/build/docker/ruby/sinatra41/app.sh
+++ b/utils/build/docker/ruby/sinatra41/app.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
+exec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1
diff --git a/utils/build/docker/ruby/uds-rails.Dockerfile b/utils/build/docker/ruby/uds-rails.Dockerfile
index 17c4cd1f5f0..cfdeebc6f74 100644
--- a/utils/build/docker/ruby/uds-rails.Dockerfile
+++ b/utils/build/docker/ruby/uds-rails.Dockerfile
@@ -21,7 +21,7 @@ RUN bundle exec rails db:prepare
 
 COPY utils/build/docker/set-uds-transport.sh set-uds-transport.sh
 
-RUN echo "#!/bin/bash\n./set-uds-transport.sh\nbundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1" > app.sh
+RUN echo "#!/bin/bash\n./set-uds-transport.sh\nexec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1" > app.sh
 RUN chmod +x app.sh
 
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/ruby/uds-sinatra.Dockerfile b/utils/build/docker/ruby/uds-sinatra.Dockerfile
index 1af1de426eb..bb89ad55905 100644
--- a/utils/build/docker/ruby/uds-sinatra.Dockerfile
+++ b/utils/build/docker/ruby/uds-sinatra.Dockerfile
@@ -16,6 +16,6 @@ ENV DD_TRACE_HEADER_TAGS=user-agent
 ENV DD_APM_RECEIVER_SOCKET=/var/run/datadog/apm.socket
 
 COPY utils/build/docker/set-uds-transport.sh set-uds-transport.sh
-RUN echo "#!/bin/bash\n./set-uds-transport.sh\nbundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1" > app.sh
+RUN echo "#!/bin/bash\n./set-uds-transport.sh\nexec bundle exec puma -b tcp://0.0.0.0 -p 7777 -w 1" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]
diff --git a/utils/build/docker/runner.Dockerfile b/utils/build/docker/runner.Dockerfile
index 312eab4eb7b..7227841cdfb 100644
--- a/utils/build/docker/runner.Dockerfile
+++ b/utils/build/docker/runner.Dockerfile
@@ -24,4 +24,4 @@ COPY manifests /app/manifests
 COPY conftest.py /app/
 COPY run.sh /app/
 
-CMD ./run.sh
+CMD ["./run.sh"]
diff --git a/utils/build/ssi/nodejs/js-app.Dockerfile b/utils/build/ssi/nodejs/js-app.Dockerfile
index 63de6cc8136..e07eb6816a7 100644
--- a/utils/build/ssi/nodejs/js-app.Dockerfile
+++ b/utils/build/ssi/nodejs/js-app.Dockerfile
@@ -22,4 +22,4 @@ EXPOSE 18080
 # We need pid 1 to be bash and to properly configure nvm
 # doing this via `RUN` doesn't seem to work
 COPY utils/build/ssi/nodejs/run.sh /app/
-CMD /app/run.sh
+CMD ["/app/run.sh"]
diff --git a/utils/build/ssi/python/py-app.Dockerfile b/utils/build/ssi/python/py-app.Dockerfile
index 0e50927c3ba..16eebd2d7e8 100644
--- a/utils/build/ssi/python/py-app.Dockerfile
+++ b/utils/build/ssi/python/py-app.Dockerfile
@@ -10,4 +10,4 @@ ENV PYENV_ROOT $HOME/.pyenv
 ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver --noreload 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "--noreload", "0.0.0.0:18080"]
diff --git a/utils/build/ssi/ruby/rails6-app-deployment-mode.Dockerfile b/utils/build/ssi/ruby/rails6-app-deployment-mode.Dockerfile
index 809d0257263..a11ba819d19 100644
--- a/utils/build/ssi/ruby/rails6-app-deployment-mode.Dockerfile
+++ b/utils/build/ssi/ruby/rails6-app-deployment-mode.Dockerfile
@@ -15,5 +15,5 @@ ENV RBENV_ROOT $HOME/.rbenv
 ENV PATH $RBENV_ROOT/shims:$RBENV_ROOT/bin:$PATH
 RUN env DD_APM_INSTRUMENTATION_DEBUG=false sh -c 'bundle lock --update && bundle config set --local deployment true && bundle install && rbenv rehash'
 EXPOSE 18080
-CMD bin/rails server -b 0.0.0.0 -p 18080
+CMD ["bin/rails", "server", "-b", "0.0.0.0", "-p", "18080"]
 
diff --git a/utils/build/ssi/ruby/rails6-app-vendored-mode.Dockerfile b/utils/build/ssi/ruby/rails6-app-vendored-mode.Dockerfile
index 953ade31129..75dc4098333 100644
--- a/utils/build/ssi/ruby/rails6-app-vendored-mode.Dockerfile
+++ b/utils/build/ssi/ruby/rails6-app-vendored-mode.Dockerfile
@@ -16,4 +16,4 @@ ENV PATH $RBENV_ROOT/shims:$RBENV_ROOT/bin:$PATH
 ENV BUNDLE_PATH=/bundle
 RUN env DD_APM_INSTRUMENTATION_DEBUG=false bundle install && rbenv rehash
 EXPOSE 18080
-CMD bin/rails server -b 0.0.0.0 -p 18080
+CMD ["bin/rails", "server", "-b", "0.0.0.0", "-p", "18080"]
diff --git a/utils/build/ssi/ruby/rails6-app.Dockerfile b/utils/build/ssi/ruby/rails6-app.Dockerfile
index de613885360..018c984294d 100644
--- a/utils/build/ssi/ruby/rails6-app.Dockerfile
+++ b/utils/build/ssi/ruby/rails6-app.Dockerfile
@@ -15,4 +15,4 @@ ENV RBENV_ROOT $HOME/.rbenv
 ENV PATH $RBENV_ROOT/shims:$RBENV_ROOT/bin:$PATH
 RUN env DD_APM_INSTRUMENTATION_DEBUG=false bundle install && rbenv rehash
 EXPOSE 18080
-CMD rails server -b 0.0.0.0 -p 18080
+CMD ["rails", "server", "-b", "0.0.0.0", "-p", "18080"]
diff --git a/utils/build/ssi/ruby/ruby-app-deployment-mode.Dockerfile b/utils/build/ssi/ruby/ruby-app-deployment-mode.Dockerfile
index 4f4f8acefca..22a5d1020eb 100644
--- a/utils/build/ssi/ruby/ruby-app-deployment-mode.Dockerfile
+++ b/utils/build/ssi/ruby/ruby-app-deployment-mode.Dockerfile
@@ -15,5 +15,5 @@ ENV RBENV_ROOT $HOME/.rbenv
 ENV PATH $RBENV_ROOT/shims:$RBENV_ROOT/bin:$PATH
 RUN env DD_APM_INSTRUMENTATION_DEBUG=false sh -c 'bundle lock --update && bundle config set --local deployment true && bundle install && rbenv rehash'
 EXPOSE 18080
-CMD bin/rails server -b 0.0.0.0 -p 18080
+CMD ["bin/rails", "server", "-b", "0.0.0.0", "-p", "18080"]
 
diff --git a/utils/build/ssi/ruby/ruby-app-vendored-mode.Dockerfile b/utils/build/ssi/ruby/ruby-app-vendored-mode.Dockerfile
index 4effdc93f90..49745c39e92 100644
--- a/utils/build/ssi/ruby/ruby-app-vendored-mode.Dockerfile
+++ b/utils/build/ssi/ruby/ruby-app-vendored-mode.Dockerfile
@@ -16,4 +16,4 @@ ENV PATH $RBENV_ROOT/shims:$RBENV_ROOT/bin:$PATH
 ENV BUNDLE_PATH=/bundle
 RUN env DD_APM_INSTRUMENTATION_DEBUG=false bundle install && rbenv rehash
 EXPOSE 18080
-CMD bin/rails server -b 0.0.0.0 -p 18080
+CMD ["bin/rails", "server", "-b", "0.0.0.0", "-p", "18080"]
diff --git a/utils/build/ssi/ruby/ruby-app.Dockerfile b/utils/build/ssi/ruby/ruby-app.Dockerfile
index cb31bd1bb04..c12b4c3ddac 100644
--- a/utils/build/ssi/ruby/ruby-app.Dockerfile
+++ b/utils/build/ssi/ruby/ruby-app.Dockerfile
@@ -15,4 +15,4 @@ ENV RBENV_ROOT $HOME/.rbenv
 ENV PATH $RBENV_ROOT/shims:$RBENV_ROOT/bin:$PATH
 RUN env DD_APM_INSTRUMENTATION_DEBUG=false bundle install && rbenv rehash
 EXPOSE 18080
-CMD rails server -b 0.0.0.0 -p 18080
+CMD ["rails", "server", "-b", "0.0.0.0", "-p", "18080"]
diff --git a/utils/build/virtual_machine/microvm/Dockerfile.amazonlinux2023 b/utils/build/virtual_machine/microvm/Dockerfile.amazonlinux2023
index c96413c3273..148c945d618 100644
--- a/utils/build/virtual_machine/microvm/Dockerfile.amazonlinux2023
+++ b/utils/build/virtual_machine/microvm/Dockerfile.amazonlinux2023
@@ -28,4 +28,4 @@ COPY systemctl /usr/bin/systemctl
 COPY sudo.sh /usr/bin/sudo
 RUN chmod +x /usr/bin/systemctl
 RUN chmod +x /usr/bin/sudo
-ENTRYPOINT sleep infinity
\ No newline at end of file
+ENTRYPOINT ["sleep", "infinity"]
\ No newline at end of file
diff --git a/utils/build/virtual_machine/microvm/Dockerfile.ubuntu22 b/utils/build/virtual_machine/microvm/Dockerfile.ubuntu22
index f5d51440e0c..a89f3163500 100644
--- a/utils/build/virtual_machine/microvm/Dockerfile.ubuntu22
+++ b/utils/build/virtual_machine/microvm/Dockerfile.ubuntu22
@@ -23,4 +23,4 @@ COPY systemctl /usr/bin/systemctl
 COPY sudo.sh /usr/bin/sudo
 RUN chmod +x /usr/bin/systemctl
 RUN chmod +x /usr/bin/sudo
-ENTRYPOINT sleep infinity
+ENTRYPOINT ["sleep", "infinity"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-alpine/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python-alpine/Dockerfile.template
index c2b90ba1b94..9d485444b63 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-alpine/Dockerfile.template
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-alpine/Dockerfile.template
@@ -8,4 +8,4 @@ WORKDIR /src
 ADD . /src
 RUN pip3 install django
 EXPOSE 18080
-CMD python3 -m django runserver 0.0.0.0:18080
+CMD ["python3", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_10-alpine b/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_10-alpine
index 5ff08186144..883c2205b29 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_10-alpine
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_10-alpine
@@ -7,4 +7,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_11-alpine b/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_11-alpine
index 650807023d7..d32595d6a32 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_11-alpine
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_11-alpine
@@ -7,4 +7,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_12-alpine b/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_12-alpine
index ebaf365f305..15c203078e4 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_12-alpine
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_12-alpine
@@ -7,4 +7,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_8-alpine b/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_8-alpine
index 49b9eff10b1..2382341ccbb 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_8-alpine
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_8-alpine
@@ -7,4 +7,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_9-alpine b/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_9-alpine
index d1861e02aff..edaa338d703 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_9-alpine
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_9-alpine
@@ -7,4 +7,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_10 b/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_10
index 2b1b9f292f4..e269c3bd229 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_10
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_10
@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_11 b/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_11
index 80c8105f860..a501cea3ca6 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_11
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_11
@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_12 b/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_12
index e53d686eabe..0608bb5069a 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_12
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_12
@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_8 b/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_8
index c372114a876..530930959a9 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_8
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_8
@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_9 b/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_9
index 1bb3bff87fe..abd0676a2f9 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_9
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python-multicontainer/Dockerfile.python_3_9
@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]
diff --git a/utils/build/virtual_machine/weblogs/python/test-app-python37-container/Dockerfile.template b/utils/build/virtual_machine/weblogs/python/test-app-python37-container/Dockerfile.template
index f3bd08a7c0b..6ae6813edc0 100644
--- a/utils/build/virtual_machine/weblogs/python/test-app-python37-container/Dockerfile.template
+++ b/utils/build/virtual_machine/weblogs/python/test-app-python37-container/Dockerfile.template
@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]