diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
index 814eeb0a6ed3e19ebbed38052ff6c6fff3e985f2..16b934a7c061d94db47e773fba7b7586031554da 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
index 19d9b841c49569374b18510d0b27c277b779ab4c..0cea66da1de190b887cdc35c3cc7e76c9bcb48dd 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
index 606ce66366aefe7873497012b02ebccee7eea42d..965043d944e6f364a76429b7eed86d2c209138cd 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
index 6f7f4ac685c5648f379ef84916171ac67c7007fa..c5f88a061a259b510c9a7af373921de9f6b13a29 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
index 3c25bc5db4ab0e1c4a36e621ed46ef75f7031064..738d8645a82bada3bd028cb0de2a3f040dfc2f8f 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
index a7be309ff27ba5b10007726fee401e9f6bb0751d..722378b198bc649a3d9e1780488d27bda14715b6 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
index 04e02e3691bf8e27d27e048cfb119925910689f4..a19eb140b6faea404e5db24c439fbdf15a1fb4c2 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
index 5a45d7985923f1e3b9bbf9ed4fa43d080f06bbba..82a07849fe4b92755f671867b7a52be97706b71b 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
index 1d1410df3be61da3ed5e5777c7d708cb4f1040ad..3f2ce103d8d74d8721c3d1f979a0d2e445b694fa 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
index 66b7fd2c340bcf0cece2bca862ce31a7b712b43a..9acc6af3411536ada6cac6ecdd928bff01cbc8fc 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
index 989023ff50696a297864b4b2854f46c85db274f6..391e250228df7a2a53655fe471f9dadc9bc8f2a0 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
index e13a3daf635c92cc6979a5b909c0ca376b3155bd..a9a626cedcad2e1a525d59c715c5c5e1b8a5c12f 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
index 7fec69af5c4940b76badaec3f75ee6772a05a174..cd526f7c38510d9af09bda0112e45be8d5db0e57 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
index 7f9068038232c7ca2d2d0c353f4d63c5ad586205..c149ca8c66a3ecaebf5da6bc4da5ba58e1a45c20 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
index b59e831ea48b6f5e79ba504605989107fb906bda..aff0cb26348b5c03db4d22e4a1a8cae2da148b61 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
@@ -136,9 +136,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
index b559d0de5be3586e65dce5f18a0a8ab6f825c581..8ff6a8d5e692f09a7e96e514e37689d31b5cc3d0 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
@@ -139,9 +139,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
index 93fee5704767ef9432d1e120d5a1a360754499e4..38228506272f3cb1e6cf13492cc56679f0f6510e 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
@@ -139,9 +139,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
index f3cadf397c446581952418c9f31c7666a2a335e3..adc51806d9b030e474b6801482420b948686b20f 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
@@ -139,9 +139,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
index 49715d0a0c9b9d071d0ef21331ce09c0c9ba6e6b..940a284a0cd7cb2c23986415020aa59f05470752 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
@@ -139,9 +139,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
index ec29e71ea5e7cf90b9bb9cec5b468dad79515bef..5696342655f78e8ae7f289d75a57a2cd6cde5148 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
@@ -139,9 +139,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
index 106334f6cfe5a593f06b6a0090837a9ec8988aca..8f740cd8edd68840f16e8c6192dfcf746ab3ed24 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
@@ -139,9 +139,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
index 5231e3124f3ab93fa99533dd12c8c7501ed620e0..44ee68c948dcae9ae1c7776c1644f6c71cf506c6 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
@@ -139,9 +139,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
index 3ea8e75357cef8ab85eb80bd6095cc0e2f2e879a..34d77d9ffce9c50e115f9005775a4b1c7edcb89a 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
@@ -139,9 +139,9 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "intel_idle",
+    "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "cstate_max_id": 2,
+    "cstate_max_id": 1,
     "ht_enabled": true,
     "kernel": "3.16.0-4-amd64",
     "name": "debian",
diff --git a/grid5000-all.json b/grid5000-all.json
index dfaee41d7c111fa5d1f3b02f40c6afdfd35e0b51..bcede4efa9227be8be1145dc4670fd8be6c94a08 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -22559,9 +22559,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -22787,9 +22787,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -23015,9 +23015,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -23243,9 +23243,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -23471,9 +23471,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -23699,9 +23699,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -23927,9 +23927,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -24155,9 +24155,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -24383,9 +24383,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -24611,9 +24611,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -24839,9 +24839,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -25067,9 +25067,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -25295,9 +25295,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -25523,9 +25523,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -25751,9 +25751,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -25996,9 +25996,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -26254,9 +26254,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -26512,9 +26512,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -26770,9 +26770,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -27028,9 +27028,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -27286,9 +27286,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -27544,9 +27544,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
@@ -27802,9 +27802,9 @@
                 }
               ],
               "operating_system": {
-                "cstate_driver": "intel_idle",
+                "cstate_driver": "acpi_idle",
                 "cstate_governor": "menu",
-                "cstate_max_id": 2,
+                "cstate_max_id": 1,
                 "ht_enabled": true,
                 "kernel": "3.16.0-4-amd64",
                 "name": "debian",
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
index 075e7bfcf1ce16a655dae8ddfb27302c24a822f2..ac3f2ac4ca01912abb0d018b1902c9630b619638 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
@@ -68,9 +68,9 @@ chetemi-1:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
index cbaaa9541f2023f2ba2c069603ac23341127ca94..5948ec6b84588d7430f5aa1856828f8bb66a9c9d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
@@ -68,9 +68,9 @@ chetemi-10:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
index efa17f24f9d5e7215e1d3892c51e15d79ed93f3e..6272522fb57d1a08ee25efe99cc91f19ea82a6ad 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
@@ -68,9 +68,9 @@ chetemi-11:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
index b457d42ba5abacf052f3c8262e797b823b45cd9c..a76e76f093a409f1171e7582148894b76efbdfa7 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
@@ -68,9 +68,9 @@ chetemi-12:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
index 414b5ab1ad1ecbbc816d969f699c00f04f71305b..07403cfe4acdb1da115de5381f499371982c466a 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
@@ -68,9 +68,9 @@ chetemi-13:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
index f39dc51eeb2504920b0ebe05d0dd4886234c8445..0ca6f5ae3788a289451c62e829f01c0e4ffe9bf3 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
@@ -68,9 +68,9 @@ chetemi-14:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
index 846d30a9ec5a74ae0ff3a4d80bd3f2ff78e76b04..be6cac691bd0f1f0806aa912f0a4a2cab1407602 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
@@ -68,9 +68,9 @@ chetemi-15:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
index 727e67020c60c68f1f9acdcdf8e5ba973fbd6ea8..d499fedbbb60dd6d2bf6a6b89902f715c8b3ab0d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
@@ -68,9 +68,9 @@ chetemi-2:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
index 6a668764ee7fa2b73ebd84b3a436dfccd348c270..4df9c593c8a67a1d7f0336ab983ccca4eb2f821d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
@@ -68,9 +68,9 @@ chetemi-3:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
index 168370041a804245897588f08da8b7a705bd8902..be3ba9c59086688a6067bd4f0e983b7e758fa1f0 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
@@ -68,9 +68,9 @@ chetemi-4:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
index 196b2a36695dcaa704329a9062b6c6c9c584439d..0713691b1919361184968e9430c1769249fb91a2 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
@@ -68,9 +68,9 @@ chetemi-5:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
index 5a73e56016475dcef5327b44e7991d2d90fc42bd..a66e52bb883d53b3db2396a861d927ee95c09118 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
@@ -68,9 +68,9 @@ chetemi-6:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
index 98eef616252c6a9ce1c07e198111cbef3548ab6a..50086c7160283222496b3fc26c2d3c34fd421e46 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
@@ -68,9 +68,9 @@ chetemi-7:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
index ac2ac684ac82265ad4101772503dc51964934506..b531c167b9dfe63b57db31b13a67e5d2ba887f04 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
@@ -68,9 +68,9 @@ chetemi-8:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
index cb7d9da991ba1705ace7b402421fa0f7ed1ca408..8ce38315e3f2380c3d9349aec023dc894bd64a49 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
@@ -68,9 +68,9 @@ chetemi-9:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
index 48538a894f518db5a18584bfb3524b893aebf9aa..2a5cef296a66e0be6240542eaa51dabfe44ce0cd 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
@@ -68,9 +68,9 @@ chifflet-1:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
index cf245f7b848db4b9ab64302ca0df231b81e127ab..bebc24d38433599668339a0944d910dc03fbb246 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
@@ -68,9 +68,9 @@ chifflet-2:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
index 09040fa4224110b40e80bd49ed5bec48380aac12..d638cc5e3ff0c77483f63446192f5c3ff3e56329 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
@@ -68,9 +68,9 @@ chifflet-3:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
index 3ec0be19f538a3ebe4cc18b88be5f1d795d86961..6b76404ef00bf5f6276cc2230e79c59fcc5ee66b 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
@@ -68,9 +68,9 @@ chifflet-4:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
index f32cfdbe1c21766b68b77053edf0debde5c7a4e2..4df81c0002d0ff642c0e0bbf78e55bcb5d0e08d8 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
@@ -68,9 +68,9 @@ chifflet-5:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
index aa1541ba878d0ccceb501535289cdbd9fbf9e637..bebe25dc6a40f7f05d755c77cec6e63e5af155bf 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
@@ -68,9 +68,9 @@ chifflet-6:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
index f03012594f313787dd2c436f0549eb25e27f75ea..cc5b198f77d957f2d6ca52176412c811d32b399a 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
@@ -68,9 +68,9 @@ chifflet-7:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
index a772192e98d011d27830af27d14338712e90b769..8b7e9cbd2b017a069a7bac978d1446b790c72c5d 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
@@ -68,9 +68,9 @@ chifflet-8:
       rate: 0
       vendor: Intel
   operating_system:
-    cstate_driver: intel_idle
+    cstate_driver: acpi_idle
     cstate_governor: menu
-    cstate_max_id: 2
+    cstate_max_id: 1
     ht_enabled: true
     kernel: 3.16.0-4-amd64
     name: debian