diff --git a/lib/refrepo/gen/puppet/templates/dhcp.erb b/lib/refrepo/gen/puppet/templates/dhcp.erb
index 89ce12f6aaaa2bf7c141cdc7e7271a7b3747eace..e60d750740a7834d8eeb7c7da0d65643e4389871 100644
--- a/lib/refrepo/gen/puppet/templates/dhcp.erb
+++ b/lib/refrepo/gen/puppet/templates/dhcp.erb
@@ -21,6 +21,7 @@
             else
               uid_net = h['name']
           end
+
           if dhcpkind == 'dhcpv6'
             if h['ip6']
               dhcp_entries.push({ 'uid_net' => uid_net, 'ipv6' => h['ip6'], 'mac' => h['mac'] })
@@ -50,6 +51,9 @@ group {
     fixed-address6          <%= node['ipv6'] %>;
 <% else -%>
     fixed-address           <%= node['ipv4'] %>;
+<% end -%>
+<% if node['uid_net'] =~ /^(troll|gros)-\d+$/ -%>
+    filename                "/pxelinux.0"
 <% end -%>
   }
 <%    } %>
diff --git a/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
index d199139c3c8e33011f6b76898373f0c649436ec9..89b5a1977aaec356d6c325e85919bed30e28f097 100644
--- a/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
+++ b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
@@ -21,7 +21,7 @@ trusted_deployment:
 <% end %>
 kexec:
   server_precmd: "true"
-  script: /etc/kadeploy3-dev/kexec.sh
+  script: /etc/kadeploy3<%= suffix %>/kexec.sh
   <% if ! data['partitioning.disable_swap'].nil? %>disable_swap: <%= data['partitioning.disable_swap'] %><% end %>
 timeouts:
   reboot: <%= data['reboot.timeout'] %>
diff --git a/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb b/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
index 5c81af0ceee37b7ccd3a2ebf6c5f4b76b3522e02..f0b8899d2828b7aef259cd062550cacc5758f5b4 100644
--- a/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
+++ b/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
@@ -116,6 +116,9 @@ host <%= node_uid %><%= interface['mounted']? "" : "-"+interface['device'] %>-ka
 <%     if kavlan_id.to_i > 9 -%>
   next-server kadeploy.<%= site %>.grid5000.fr;
 <%     end -%>
+<% if node_uid =~ /^(troll|gros)-\d+$/ -%>
+  filename                "/pxelinux.0"
+<% end -%>
 }
 <%
              elsif dhcpkind == 'dhcpd6'