diff --git a/templates/zuul.conf.erb b/templates/zuul.conf.erb
index a2e6ea4..86408a7 100644
--- a/templates/zuul.conf.erb
+++ b/templates/zuul.conf.erb
@@ -1,56 +1,56 @@
 [gearman]
-server=<%= gearman_server %>
+server=<%= @gearman_server %>
 
 [gearman_server]
-start=<%= internal_gearman %>
+start=<%= @internal_gearman %>
 log_config=/etc/zuul/gearman-logging.conf
 
 [gerrit]
-server=<%= gerrit_server %>
-user=<%= gerrit_user %>
+server=<%= @gerrit_server %>
+user=<%= @gerrit_user %>
 sshkey=/var/lib/zuul/ssh/id_rsa
-<% if gerrit_baseurl != "" -%>
-baseurl=<%= gerrit_baseurl %>
+<% if @gerrit_baseurl != "" -%>
+baseurl=<%= @gerrit_baseurl %>
 <% end -%>
 
 [zuul]
 layout_config=/etc/zuul/layout/layout.yaml
 log_config=/etc/zuul/logging.conf
 state_dir=/var/lib/zuul
-url_pattern=<%= url_pattern %>
-status_url=<%= status_url %>
-job_name_in_report=<%= job_name_in_report %>
+url_pattern=<%= @url_pattern %>
+status_url=<%= @status_url %>
+job_name_in_report=<%= @job_name_in_report %>
 
 [merger]
 git_dir=/var/lib/zuul/git
-zuul_url=<%= zuul_url %>
+zuul_url=<%= @zuul_url %>
 log_config=/etc/zuul/merger-logging.conf
-<% if git_email != "" -%>
-git_user_email=<%= git_email %>
+<% if @git_email != "" -%>
+git_user_email=<%= @git_email %>
 <% end -%>
-<% if git_name != "" -%>
-git_user_name=<%= git_name %>
+<% if @git_name != "" -%>
+git_user_name=<%= @git_name %>
 <% end -%>
 
-<% if swift_authurl != "" -%>
+<% if @swift_authurl != "" -%>
 [swift]
-authurl=<%= swift_authurl %>
-user=<%= swift_user %>
-key=<%= swift_key %>
-tenant_name=<%= swift_tenant_name %>
-region_name=<%= swift_region_name %>
-default_container=<%= swift_default_container %>
-default_logserver_prefix=<%= swift_default_logserver_prefix %>
+authurl=<%= @swift_authurl %>
+user=<%= @swift_user %>
+key=<%= @swift_key %>
+tenant_name=<%= @swift_tenant_name %>
+region_name=<%= @swift_region_name %>
+default_container=<%= @swift_default_container %>
+default_logserver_prefix=<%= @swift_default_logserver_prefix %>
 default_expiry=<%= swift_default_expiry %>
-<% if swift_auth_version != "" -%>
-auth_version=<%= swift_auth_version %>
+<% if @swift_auth_version != "" -%>
+auth_version=<%= @swift_auth_version %>
 <% end -%>
 <% end -%>
 
-<% if smtp_host != "" -%>
+<% if @smtp_host != "" -%>
 [smtp]
-server=<%= smtp_host %>
-port=<%= smtp_port %>
-default_from=<%= smtp_default_from %>
-default_to=<%= smtp_default_to %>
+server=<%= @smtp_host %>
+port=<%= @smtp_port %>
+default_from=<%= @smtp_default_from %>
+default_to=<%= @smtp_default_to %>
 <% end -%>
diff --git a/templates/zuul.default.erb b/templates/zuul.default.erb
index e5c2732..7aaeae8 100644
--- a/templates/zuul.default.erb
+++ b/templates/zuul.default.erb
@@ -1,4 +1,4 @@
-<% if scope.lookupvar("zuul::statsd_host") != "" %>
-export STATSD_HOST=<%= scope.lookupvar("zuul::statsd_host") %>
+<% if @statsd_host != "" %>
+export STATSD_HOST=<%= @statsd_host %>
 export STATSD_PORT=8125
 <% end %>