diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index 72f9040d860f5c0d8023962d8c5294da4863b9d5..439889112790538346d68761fb87248e4d751485 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -9,9 +9,6 @@ class MissingProperty < StandardError; end
 
 MiB = 1024**2
 
-# CPU distribution can be: round-robin | continuous
-DEFAULT_CPUSET_MAPPING = "continuous"
-
 # GPU distribution can be: round-robin | continuous
 DEFAULT_GPUSET_MAPPING = "continuous"
 
@@ -1072,7 +1069,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
     gpu_count = first_node.key?("gpu_devices") ? first_node["gpu_devices"].length : 0
 
     cpu_model = "#{first_node['processor']['model']} #{first_node['processor']['version']}"
-    cpuset_mapping = first_node.key?("cpuset_mapping") ? first_node["cpuset_mapping"] : DEFAULT_CPUSET_MAPPING
+    core_numbering = first_node['architecture']['cpu_core_numbering']
     # Detect how 'GPUSETs' are distributed over CPUs/GPUs of servers of this cluster
     gpuset_mapping = DEFAULT_GPUSET_MAPPING
 
@@ -1206,7 +1203,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
         gpu_idx += 1
       end
 
-      if cpuset_mapping == 'continuous'
+      if core_numbering == 'continuous'
         cpuset = 0
       end
 
@@ -1278,7 +1275,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
           ############################################
           # (2-d) Associate a cpuset to each core
           ############################################
-          if cpuset_mapping == 'continuous'
+          if core_numbering == 'continuous'
             row[:cpuset] = cpuset
           else
             # CPUSETs starts at 0
@@ -1310,7 +1307,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
 
           core_idx += 1
 
-          if cpuset_mapping == 'continuous'
+          if core_numbering == 'continuous'
             cpuset += 1
           end