diff --git a/agent/agent.go b/agent/agent.go
index 5e82e625f..408219620 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -96,7 +96,11 @@ func (a *Agent) prep(w *model.Work) (*yaml.Config, error) {
 
 	var err error
 	w.Yaml, err = envsubst.Eval(w.Yaml, func(s string) string {
-		return envs[s]
+		env := envs[s]
+		if strings.Contains(env, "\n") {
+			env = fmt.Sprintf("%q", env)
+		}
+		return env
 	})
 	if err != nil {
 		return nil, err