diff --git a/internal/tagger/jobclasses/highload.json b/internal/tagger/jobclasses/highload.json
index 444ca4d..bab37be 100644
--- a/internal/tagger/jobclasses/highload.json
+++ b/internal/tagger/jobclasses/highload.json
@@ -1,7 +1,6 @@
 {
   "name": "Excessive CPU load",
   "tag": "excessiveload",
-  "comment": "Assumptions: all nodes have the same number of cores.",
   "parameters": [
     "excessivecpuload_threshold_factor",
     "job_min_duration_seconds",
@@ -19,9 +18,9 @@
     },
     {
       "name": "load_perc",
-      "expr": "cpu_load.avg / load_threshold"
+      "expr": "cpu_load.avg / cpu_load.limits.peak"
     }
   ],
-  "rule": "cpu_load > load_threshold",
-  "hint": "This job was detected as excessiveload because the average cpu load {{.cpu_load}} falls above the threshold {{.load_threshold}}."
+  "rule": "cpu_load.avg > cpu_load.limits.peak",
+  "hint": "This job was detected as excessiveload because the average cpu load {{.cpu_load.avg}} falls above the threshold {{.cpu_load.limits.peak}}."
 }
diff --git a/internal/tagger/jobclasses/lowload.json b/internal/tagger/jobclasses/lowload.json
index 1d7e041..2212bd1 100644
--- a/internal/tagger/jobclasses/lowload.json
+++ b/internal/tagger/jobclasses/lowload.json
@@ -18,9 +18,9 @@
     },
     {
       "name": "load_perc",
-      "expr": "1.0 - (cpu_load / load_threshold)"
+      "expr": "1.0 - (cpu_load.avg / cpu_load.limits.peak)"
     }
   ],
-  "rule": "cpu_load.avg < load_threshold",
-  "hint": "This job was detected as lowload because the average cpu load {{.cpu_load}} falls below the threshold {{.load_threshold}}."
+  "rule": "cpu_load.avg < cpu_load.limits.caution",
+  "hint": "This job was detected as lowload because the average cpu load {{.cpu_load}} falls below the threshold {{.cpu_load.limits.caution}}."
 }