diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index b35af0106146da17070f6f04d1f7a14654a91ba5..fc17065f08f81e48965cc07b5b73cb710e262d87 100644
--- a/lib/refrepo/gen/wiki/generators/hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/hardware.rb
@@ -247,6 +247,7 @@ class G5KHardwareGenerator < WikiGenerator
     generated_content += "\n= Storage ="
     generated_content += "\n== Nodes with several disks ==\n"
     generated_content +=  generate_storage
+    generated_content += "\n''*: disk is [[Disk_reservation|reservable]]''"
 
     generated_content += "\n= Accelerators (GPU, Xeon Phi) ="
     generated_content += "\n== Accelerator families ==\n"
@@ -327,7 +328,7 @@ class G5KHardwareGenerator < WikiGenerator
   end
 
   def generate_storage
-    table_columns = ["Site", "Cluster", "Number of nodes", "Main disk", "Additional HDDs", "Additional SSDs", "[[Disk_reservation|Disk reservation]]"]
+    table_columns = ["Site", "Cluster", "Number of nodes", "Main disk", "Additional HDDs", "Additional SSDs"]
     table_data = []
     global_hash = get_global_hash
 
@@ -346,13 +347,19 @@ class G5KHardwareGenerator < WikiGenerator
           if hdds.count == 0
             hdd_t = "0"
           else
-            hdd_t = hdds.count.to_s + " (" + hdds.map { |d| G5K.get_size(d['size'],'metric') }.join(', ') + ")"
+            hdd_t = hdds.count.to_s + " (" + hdds.map { |d|
+              G5K.get_size(d['size'],'metric') +
+              ((!d['reservation'].nil? && d['reservation']) ? '[[Disk_reservation|*]]' : '')
+            }.join(', ') + ")"
           end
           ssds = other.select { |d| d['storage'] == 'SSD' }
           if ssds.count == 0
             ssd_t = "0"
           else
-            ssd_t = ssds.count.to_s + " (" + ssds.map { |d| G5K.get_size(d['size'],'metric') }.join(', ') + ")"
+            ssd_t = ssds.count.to_s + " (" + ssds.map { |d|
+              G5K.get_size(d['size'],'metric') +
+              ((!d['reservation'].nil? && d['reservation']) ? '[[Disk_reservation|*]]' : '')
+            }.join(', ') + ")"
           end
           queues = cluster_hash['queues'] - ['admin', 'default']
           queue_t = (queues.nil? || (queues.empty? ? '' : "_.28" + queues[0].gsub(' ', '_') + ' queue.29'))
@@ -374,7 +381,6 @@ class G5KHardwareGenerator < WikiGenerator
               data['main'],
               data['hdd'],
               data['ssd'],
-              data['reservation'] ? 'yes' : 'no'
           ]
         end
       end
diff --git a/lib/refrepo/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb
index f358ddb111627710c632f5ed5afdfad885fb8792..18ee3712d7778b34b20ff2631e39e5d21884acc8 100644
--- a/lib/refrepo/gen/wiki/generators/site_hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/site_hardware.rb
@@ -230,7 +230,8 @@ def get_hardware(sites)
             'model' => v['model'],
             'driver' => v['driver'],
             'path' => v['by_path'] || v['by_id'],
-            'count' => node_hash['storage_devices'].count
+            'count' => node_hash['storage_devices'].count,
+            'reservation' => v['reservation'].nil? ? false : v['reservation']
           }
         end
 
@@ -242,7 +243,8 @@ def get_hardware(sites)
             e['interface'],
             e['vendor'],
             e['model'],
-            ' (driver: ' + (e['driver'] || 'MISSING') + ', path: ' + (e['path'] || 'MISSING') + ')'
+            ' (driver: ' + (e['driver'] || 'MISSING') + ', path: ' + (e['path'] || 'MISSING') + ')',
+            e['reservation'] ? '[[Disk_reservation|(reservable)]]' : ''
           ].join(' ')
         }.join('<br />')