diff --git a/isc_dhcp/files/dhcpd.conf b/isc_dhcp/files/dhcpd.conf
index 8ba6ca1..d0f93d2 100644
--- a/isc_dhcp/files/dhcpd.conf
+++ b/isc_dhcp/files/dhcpd.conf
@@ -83,18 +83,9 @@
 option fqdn.rcode2            255;
 option pxegrub code 150 = text ;
 
-{#
-
-<% if has_variable?( 'pxeserver' ) &&
-  has_variable?( 'pxefilename' ) &&
-  @pxeserver &&
-  @pxefilename -%>
-# PXE Handoff.
-next-server <%= @pxeserver %>;
-filename "<%= @pxefilename %>";
-<% end -%>
-
-#}
+{%- if server.pxeserver is defined %}
+next-server {{ server.pxeserver }};
+{%- endif %}
 
 include "{{ server.config_dir }}/dhcpd.hosts";
 include "{{ server.config_dir }}/dhcpd.subnets";