diff --git a/templates/account-server.conf.erb b/templates/account-server.conf.erb
index f2c60127..069528f1 100644
--- a/templates/account-server.conf.erb
+++ b/templates/account-server.conf.erb
@@ -1,9 +1,9 @@
 [DEFAULT]
-<% if scope.lookupvar('devices') != :undefined -%>
+<% if has_variable?('devices') -%>
 devices = <%= devices %>
 <% end -%>
 bind_ip = <%= storage_local_net_ip %>
-<% if scope.lookupvar('bind_port') != :undefined -%>
+<% if has_variable?('bind_port') -%>
 bind_port = <%= bind_port %>
 <% end -%>
 mount_check = false
diff --git a/templates/container-server.conf.erb b/templates/container-server.conf.erb
index e9b89d71..b07296e0 100644
--- a/templates/container-server.conf.erb
+++ b/templates/container-server.conf.erb
@@ -1,9 +1,9 @@
 [DEFAULT]
-<% if scope.lookupvar('devices') != :undefined -%>
+<% if has_variable?('devices') -%>
 devices = <%= devices %>
 <% end -%>
 bind_ip = <%= storage_local_net_ip %>
-<% if scope.lookupvar('bind_port') != :undefined -%>
+<% if has_variable?('bind_port') -%>
 bind_port = <%= bind_port %>
 <% end -%>
 mount_check = false
diff --git a/templates/object-server.conf.erb b/templates/object-server.conf.erb
index ef4b5cc2..20f71d95 100644
--- a/templates/object-server.conf.erb
+++ b/templates/object-server.conf.erb
@@ -1,9 +1,9 @@
 [DEFAULT]
-<% if scope.lookupvar('devices') != :undefined -%>
+<% if has_variable?('devices') -%>
 devices = <%= devices %>
 <% end -%>
 bind_ip = <%= storage_local_net_ip %>
-<% if scope.lookupvar('bind_port') != :undefined -%>
+<% if has_variable?('bind_port') -%>
 bind_port = <%= bind_port %>
 <% end -%>
 mount_check = false