diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java b/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java
index 0242e712cceb5..a2cf1891bad5a 100644
--- a/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java
+++ b/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java
@@ -188,7 +188,7 @@ private String readSingleLine(final Path path) throws IOException {
     }
 
     // pattern for lines in /proc/self/cgroup
-    private static final Pattern CONTROL_GROUP_PATTERN = Pattern.compile("\\d+:([^:,]+(?:,[^:,]+)?):(/.*)");
+    private static final Pattern CONTROL_GROUP_PATTERN = Pattern.compile("\\d+:([^:]+):(/.*)");
 
     // this property is to support a hack to workaround an issue with Docker containers mounting the cgroups hierarchy inconsistently with
     // respect to /proc/self/cgroup; for Docker containers this should be set to "/"
diff --git a/core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java b/core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java
index 5b110c928c37a..c987e44c1086f 100644
--- a/core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java
+++ b/core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java
@@ -155,16 +155,15 @@ public void testCgroupProbe() {
             @Override
             List<String> readProcSelfCgroup() {
                 return Arrays.asList(
-                    "11:freezer:/",
-                    "10:net_cls,net_prio:/",
-                    "9:pids:/",
-                    "8:cpuset:/",
+                    "10:freezer:/",
+                    "9:net_cls,net_prio:/",
+                    "8:pids:/",
                     "7:blkio:/",
                     "6:memory:/",
                     "5:devices:/user.slice",
                     "4:hugetlb:/",
                     "3:perf_event:/",
-                    "2:cpu,cpuacct:/" + hierarchy,
+                    "2:cpu,cpuacct,cpuset:/" + hierarchy,
                     "1:name=systemd:/user.slice/user-1000.slice/session-2359.scope");
             }