diff --git a/lib/refrepo/gen/puppet/templates/kwollect-wattmetre-mapping.erb b/lib/refrepo/gen/puppet/templates/kwollect-wattmetre-mapping.erb
index e3f55d7f8a4a3a042fdd14e21101b7c952c304ce..0ec8a7132f3cbc1511253570b01f1f3b50b99cb9 100644
--- a/lib/refrepo/gen/puppet/templates/kwollect-wattmetre-mapping.erb
+++ b/lib/refrepo/gen/puppet/templates/kwollect-wattmetre-mapping.erb
@@ -4,7 +4,8 @@
 #
 
 <%-
-wattmetre_port_per_node.each {|node, ports|
+  # Sort by cluster and node number
+  wattmetre_port_per_node.to_a.sort_by { |e| n = e[0].split('-') ; n[1] = n[1].to_i ; n }.each { |e| node, ports = e
 -%>
 <%= node %>: [<%= ports.join(',') %>]
 <%-