diff --git a/modules/gerrit/templates/contact_information.pub.erb b/modules/gerrit/templates/contact_information.pub.erb
index 2122bc484c..0e95adc7d3 100644
--- a/modules/gerrit/templates/contact_information.pub.erb
+++ b/modules/gerrit/templates/contact_information.pub.erb
@@ -1 +1 @@
-<%= contactstore_pubkey %>
+<%= @contactstore_pubkey %>
diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb
index a918328c64..adbd17c401 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -3,83 +3,83 @@
 
 [gerrit]
 	basePath = git
-	canonicalWebUrl = <%= canonicalweburl %>
+	canonicalWebUrl = <%= @canonicalweburl %>
 [database]
 	type = MYSQL
-	hostname = <%= mysql_host %>
+	hostname = <%= @mysql_host %>
 	database = reviewdb
 	username = gerrit2
-<% if database_poollimit != "" -%>
-	poolLimit = <%= database_poollimit %>
+<% if @database_poollimit != "" -%>
+	poolLimit = <%= @database_poollimit %>
 <% end -%>
 	connectionpool = true
 [auth]
-<% if gerrit_contributor_agreement -%>
+<% if @gerrit_contributor_agreement -%>
 	contributorAgreements = true
 <% end -%>
-	type = <%= gerrit_auth_type %>
+	type = <%= @gerrit_auth_type %>
 	cookieSecure = true
 	enableRunAs = true
-<% if gerrit_auth_type == 'OPENID_SSO' -%>
-	openIdSsoUrl = <%= openidssourl %>
+<% if @gerrit_auth_type == 'OPENID_SSO' -%>
+	openIdSsoUrl = <%= @openidssourl %>
 <% end -%>
-<% if gerrit_auth_type == 'LDAP' -%>
+<% if @gerrit_auth_type == 'LDAP' -%>
 [ldap]
-	server = <%= ldap_server %>
-	accountBase = <%= ldap_account_base %>
-	<% if ldap_username -%>username = <%= ldap_username %><%end%>
-	<% if ldap_password -%>password = <%= ldap_password %><%end%>
-	<% if ldap_accountfullname -%>accountFullName = <%= ldap_accountfullname %><%end%>
-	accountPattern = <%= ldap_account_pattern %>
-	accountEmailAddress = <%= ldap_account_email_address %>
-	sslVerify = <%= ldap_sslverify %>
-	<% if @ldap_ssh_account_name -%>accountSshUserName = <%= ldap_ssh_account_name %><%end%>
+	server = <%= @ldap_server %>
+	accountBase = <%= @ldap_account_base %>
+	<% if @ldap_username -%>username = <%= @ldap_username %><%end%>
+	<% if @ldap_password -%>password = <%= @ldap_password %><%end%>
+	<% if @ldap_accountfullname -%>accountFullName = <%= @ldap_accountfullname %><%end%>
+	accountPattern = <%= @ldap_account_pattern %>
+	accountEmailAddress = <%= @ldap_account_email_address %>
+	sslVerify = <%= @ldap_sslverify %>
+	<% if @ldap_ssh_account_name -%>accountSshUserName = <%= @ldap_ssh_account_name %><%end%>
 <% end %>
 [sendemail]
-	smtpServer = <%= smtpserver %>
-	from = <%= sendemail_from %>
+	smtpServer = <%= @smtpserver %>
+	from = <%= @sendemail_from %>
 [container]
 	user = gerrit2
-	javaHome = <%= java_home %>
-<% if container_heaplimit != "" -%>
-	heapLimit = <%= container_heaplimit %>
+	javaHome = <%= @java_home %>
+<% if @container_heaplimit != "" -%>
+	heapLimit = <%= @container_heaplimit %>
 <% end -%>
 [core]
-<% if core_packedgitopenfiles != "" -%>
-	packedGitOpenFiles = <%= core_packedgitopenfiles %>
+<% if @core_packedgitopenfiles != "" -%>
+	packedGitOpenFiles = <%= @core_packedgitopenfiles %>
 <% end -%>
-<% if core_packedgitlimit != "" -%>
-	packedGitLimit = <%= core_packedgitlimit %>
+<% if @core_packedgitlimit != "" -%>
+	packedGitLimit = <%= @core_packedgitlimit %>
 <% end -%>
-<% if core_packedgitwindowsize != "" -%>
-	packedGitWindowSize = <%= core_packedgitwindowsize %>
+<% if @core_packedgitwindowsize != "" -%>
+	packedGitWindowSize = <%= @core_packedgitwindowsize %>
 <% end -%>
 [sshd]
-	listenAddress = <%= sshd_listen_address %>
-<% if sshd_threads != "" -%>
-	threads = <%= sshd_threads %>
+	listenAddress = <%= @sshd_listen_address %>
+<% if @sshd_threads != "" -%>
+	threads = <%= @sshd_threads %>
 <% end -%>
 [httpd]
 	listenUrl = proxy-https://*:8081/
-<% if httpd_maxwait != "" -%>
-	maxWait = <%= httpd_maxwait %>
+<% if @httpd_maxwait != "" -%>
+	maxWait = <%= @httpd_maxwait %>
 <% end -%>
-<% if httpd_acceptorthreads != "" -%>
-	acceptorThreads = <%= httpd_acceptorthreads %>
+<% if @httpd_acceptorthreads != "" -%>
+	acceptorThreads = <%= @httpd_acceptorthreads %>
 <% end -%>
-<% if httpd_minthreads != "" -%>
-	minThreads = <%= httpd_minthreads %>
+<% if @httpd_minthreads != "" -%>
+	minThreads = <%= @httpd_minthreads %>
 <% end -%>
-<% if httpd_maxthreads != "" -%>
-	maxThreads = <%= httpd_maxthreads %>
+<% if @httpd_maxthreads != "" -%>
+	maxThreads = <%= @httpd_maxthreads %>
 <% end -%>
 [cache]
 	directory = cache
 [cache "web_sessions"]
 	maxAge = 1d
 [user]
-	email = <%= email %>
-<% commentlinks.each do |commentlink| -%>
+	email = <%= @email %>
+<% @commentlinks.each do |commentlink| -%>
 [commentlink "<%= commentlink['name'] %>"]
 	match = "<%= commentlink['match'] %>"
 <% if commentlink['link'] != "" -%>
@@ -99,10 +99,10 @@
 	tableOddRowColor = ffffff
 	tableEvenRowColor = f5f5ff
 [melody]
-	monitoring = <%= enable_melody %>
-	session = <%= melody_session %>
+	monitoring = <%= @enable_melody %>
+	session = <%= @melody_session %>
 [plugin "javamelody"]
-        allowTopMenu = <%= enable_javamelody_top_menu %>
+        allowTopMenu = <%= @enable_javamelody_top_menu %>
 <% if gitweb or cgit -%>
 [gitweb]
 <% if gitweb -%>
@@ -116,12 +116,12 @@
 <% end -%>
 <% if contactstore == true -%>
 [contactstore]
-	appsec = <%= contactstore_appsec %>
-	url = <%= contactstore_url %>
+	appsec = <%= @contactstore_appsec %>
+	url = <%= @contactstore_url %>
 <% end -%>
-<% if secondary_index == true -%>
+<% if @secondary_index == true -%>
 [index]
-	type = <%= secondary_index_type %>
+	type = <%= @secondary_index_type %>
 <% end -%>
 [mimetype "image/*"]
 	safe = true
diff --git a/modules/gerrit/templates/replication.config.erb b/modules/gerrit/templates/replication.config.erb
index 3ab3283e6a..6d597b68fb 100644
--- a/modules/gerrit/templates/replication.config.erb
+++ b/modules/gerrit/templates/replication.config.erb
@@ -1,7 +1,7 @@
 # This file is managed by puppet.
 # https://git.openstack.org/cgit/openstack-infra/config
 
-<% replication.each do |replication| -%>
+<% @replication.each do |replication| -%>
 [remote "<%= replication['name'] %>"]
 	url = <%= replication['url'] %>${name}.git
 <% if replication['replicationDelay'] != nil -%>
diff --git a/modules/gerrit/templates/secure.config.erb b/modules/gerrit/templates/secure.config.erb
index 51af8c1e0e..a33100c737 100644
--- a/modules/gerrit/templates/secure.config.erb
+++ b/modules/gerrit/templates/secure.config.erb
@@ -1,4 +1,4 @@
 [database]
-	password = <%= mysql_password %>
+	password = <%= @mysql_password %>
 [auth]
-	registerEmailPrivateKey = <%= email_private_key %>
+	registerEmailPrivateKey = <%= @email_private_key %>