diff --git a/site-modules/profile/templates/jenkins/agent/jenkins-agent.defaults.erb b/site-modules/profile/templates/jenkins/agent/jenkins-agent.defaults.erb
index 88d100f4..abe4ce10 100644
--- a/site-modules/profile/templates/jenkins/agent/jenkins-agent.defaults.erb
+++ b/site-modules/profile/templates/jenkins/agent/jenkins-agent.defaults.erb
@@ -1,6 +1,6 @@
 # File managed by puppet (module profile::jenkins::agent)
 # Local modifications will be lost.
 
-AGENT_WORKDIR=<%- @workdir %>
-JNLP_URL=<%- @jenkins_jnlp_url %>
-JNLP_SECRET=<%- @jenkins_jnlp_token %>
+AGENT_WORKDIR="<%= @workdir %>"
+JNLP_URL="<%= @jenkins_jnlp_url %>"
+JNLP_SECRET="<%= @jenkins_jnlp_token %>"
diff --git a/site-modules/profile/templates/jenkins/agent/jenkins-agent.service.erb b/site-modules/profile/templates/jenkins/agent/jenkins-agent.service.erb
index eb8ae42d..46e81a5c 100644
--- a/site-modules/profile/templates/jenkins/agent/jenkins-agent.service.erb
+++ b/site-modules/profile/templates/jenkins/agent/jenkins-agent.service.erb
@@ -1,20 +1,20 @@
 [Unit]
 Description=Jenkins agent
 Documentation=https://wiki.jenkins.io/display/JENKINS/Distributed+builds
 After=network.target
 
 [Service]
 EnvironmentFile=/etc/default/jenkins-agent
-ExecStart=/usr/bin/java -jar <%- @jenkins_agent_jar %> -jnlpUrl "$JNLP_URL" -secret "$JNLP_SECRET" -workDir "$AGENT_WORKDIR"
+ExecStart=/usr/bin/java -jar <%= @jenkins_agent_jar %> -jnlpUrl $JNLP_URL -secret $JNLP_SECRET -workDir $AGENT_WORKDIR
 UnsetEnvironment=JNLP_URL JNLP_SECRET AGENT_WORKDIR
 
 User=jenkins
 Group=jenkins
 
 KillMode=process
 
 Restart=always
 RestartSec=5s
 
 [Install]
 WantedBy=multi-user.target