diff --git a/deployment/puppet/nailgun/spec/hosts/default_spec.rb b/deployment/puppet/nailgun/spec/hosts/default_spec.rb
index 4c74889f91..747c452eed 100644
--- a/deployment/puppet/nailgun/spec/hosts/default_spec.rb
+++ b/deployment/puppet/nailgun/spec/hosts/default_spec.rb
@@ -48,6 +48,12 @@ describe 'default' do
       it { should contain_file("/etc/dnsmasq.d/#{resource_name}.conf") \
            .with_content(/^dhcp-range=#{resource_name}.*#{netmask},120m\n|,boothost,#{admin_network['ipaddress']}\n/)
       }
+      it { should contain_file("/etc/dnsmasq.d/#{resource_name}.conf") \
+           .with_content(/^dhcp-match=set:ipxe,175$/)
+      }
+      it { should contain_file("/etc/dnsmasq.d/#{resource_name}.conf") \
+           .with_content(/^dhcp-option-force=tag:ipxe,210,http:/)
+      }
     end
   end
 
diff --git a/deployment/puppet/nailgun/templates/dnsmasq.dhcp-range.erb b/deployment/puppet/nailgun/templates/dnsmasq.dhcp-range.erb
index b18546a26b..25ad52ed15 100644
--- a/deployment/puppet/nailgun/templates/dnsmasq.dhcp-range.erb
+++ b/deployment/puppet/nailgun/templates/dnsmasq.dhcp-range.erb
@@ -2,5 +2,5 @@
 dhcp-range=<%= @range_name %>,<%= @dhcp_start_address %>,<%= @dhcp_end_address %>,<%= @dhcp_netmask %>,<%= @lease_time %>
 dhcp-option=net:<%= @range_name %>,option:router,<%= @dhcp_gateway %>
 dhcp-boot=net:<%= @range_name %>,pxelinux.0,boothost,<%= @next_server %>
-dhcp-match=ipxe,175
-dhcp-option-force=net:ipxe,210,http://<%= @next_server %>/cobbler/boot/
+dhcp-match=set:ipxe,175
+dhcp-option-force=tag:ipxe,210,http://<%= @next_server %>/cobbler/boot/