diff --git a/lib/refrepo/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb
index d66cf5b393638f3dc843b0f930f617e0f15f8ef9..72f3f19e3fe3482be918668a9e713fcacfd45a48 100644
--- a/lib/refrepo/gen/wiki/generators/site_hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/site_hardware.rb
@@ -62,7 +62,7 @@ class SiteHardwareGenerator < WikiGenerator
     output = ''
     [
       [ '== Default queue resources ==', /(^$|exotic)/ ],
-      [ '== Production queue resources ==', /production/],
+      [ '== Abaca queue resources ==', /production/],
       [ '== Testing queue resources ==', /testing/]
     ].each do |title,regexp|
       if table_data.select{ |row| row[column] =~ regexp}.length > 0
@@ -115,7 +115,7 @@ class SiteHardwareGenerator < WikiGenerator
       summary += MW::TABLE_CELL + ' width="50%" valign="top" ' + MW::TABLE_CELL + MW::LINE_FEED
       ## 2st inner table
       summary += MW::TABLE_START + ' width="100%"' + MW::LINE_FEED
-      summary += print_header_summary('=== Production queue resources ===', 'production', store)
+      summary += print_header_summary('=== Abaca queue resources ===', 'production', store)
       summary += MW::TABLE_END + MW::LINE_FEED
 
       ## End outer-tablie
@@ -194,7 +194,7 @@ class SiteHardwareGenerator < WikiGenerator
       queue = cluster_hash.map { |_k, v| v['queue']}.first
       access_conditions = []
       if queue == 'production'
-        access_conditions << "<b>[[Grid5000:UsagePolicy#Rules_for_the_production_queue|#{queue}]]</b>&nbsp;queue"
+        access_conditions << "<b>[[Grid5000:UsagePolicy#Rules_for_the_production_queue|abaca]]</b>&nbsp;queue"
       elsif queue != ''
         access_conditions << "<b>#{queue}</b>&nbsp;queue"
       end
@@ -269,7 +269,7 @@ class SiteHardwareGenerator < WikiGenerator
 
         reservation_cmd = "\n{{Term|location=f#{site}|cmd="
         reservation_cmd += "<code class=\"command\">oarsub</code> "
-        reservation_cmd += "<code class=\"replace\">-q #{queue}</code> "
+        reservation_cmd += "<code class=\"replace\">-q #{queue == 'production' ? 'abaca' : queue}</code> "
         reservation_cmd += "<code class=\"replace\">-t exotic</code> " if cluster_hash.map { |_k, v| v['exotic']}.first
         reservation_cmd += "<code class=\"env\">-p #{cluster_uid}</code> "
         reservation_cmd += "<code>-I</code>"