diff --git a/libs/devlib b/libs/devlib
index 741157c0001d8aa6ae39115024398ce1cd9f1c0a..1dc1e1364c205b4814e664b521f54ec07e446d9d 160000
--- a/libs/devlib
+++ b/libs/devlib
@@ -1 +1 @@
-Subproject commit 741157c0001d8aa6ae39115024398ce1cd9f1c0a
+Subproject commit 1dc1e1364c205b4814e664b521f54ec07e446d9d
diff --git a/libs/wlgen/wlgen/workload.py b/libs/wlgen/wlgen/workload.py
index 5ef334826a647b2d05bae0be14a0c984bb695836..a93155bead0f365cc478a680d6c2310af7ddc45f 100644
--- a/libs/wlgen/wlgen/workload.py
+++ b/libs/wlgen/wlgen/workload.py
@@ -207,7 +207,7 @@ class Workload(object):
 
         # Prepend eventually required taskset command
         if self.cgroup and self.cgroup_cmd == '':
-            self.cgroup_cmd = '{0:s}/cgroup_run_into.sh {1:s}'\
+            self.cgroup_cmd = 'cgroups_run_into {1:s}'\
                 .format(self.target.executables_directory,
                         self.cgroup)
             self.command = '{0:s} \'{1:s}\''\
@@ -236,8 +236,12 @@ class Workload(object):
             logging.info('%14s -    %s', 'WlGen', self.command)
 
             # Run command and wait for it to complete
-            results = self.target.execute(self.command,
-                    timeout=None, as_root=as_root)
+            if cgroup:
+                results = self.target._execute_util(self.command,
+                                                  as_root=True)
+            else:
+                results = self.target.execute(self.command,
+                        timeout=None, as_root=as_root)
             # print type(results)
             self.output['executor'] = results