diff --git a/deployment/puppet/cobbler/templates/dnsmasq.template.erb b/deployment/puppet/cobbler/templates/dnsmasq.template.erb
index d86d49268f..b2d6ff7068 100644
--- a/deployment/puppet/cobbler/templates/dnsmasq.template.erb
+++ b/deployment/puppet/cobbler/templates/dnsmasq.template.erb
@@ -12,6 +12,9 @@ dhcp-lease-max=<%= @dhcp_lease_max %>
 server=/<%= @domain_name %>/
 <% end %>
 server=/<%= @dns_domain %>/
+<%- @dns_upstream.split(',').each do |dns| -%>
+server=/<%= @dns_domain %>/<%= dns %>
+<%- end -%>
 resolv-file=/etc/dnsmasq.upstream
 interface=<%= @dhcp_interface %>