diff --git a/entrypoint.sh b/entrypoint.sh
index c46e9a11..9375dd3f 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -27,6 +27,12 @@ stderr_logfile=\/dev\/stderr\
 stderr_logfile_maxbytes=0' ${DD_ETC_ROOT}/supervisor.conf
 fi
 
+##### Trace Agent config #####
+if [ ! "${DD_TRACE_CONF_ENV}" = "" ]; then
+  sed -i -e '$ a [trace.config]' ${DD_ETC_ROOT}/datadog.conf
+  sed -i -e "$ a env = ${DD_TRACE_CONF_ENV}" ${DD_ETC_ROOT}/datadog.conf
+fi
+
 ##### Integrations config #####
 
 if [ $KUBERNETES ]; then