diff --git a/project-lakitu/app-admin/cgroup-helper/cgroup-helper-0.0.1-r1.ebuild b/project-lakitu/app-admin/cgroup-helper/cgroup-helper-0.0.1-r2.ebuild
similarity index 100%
rename from project-lakitu/app-admin/cgroup-helper/cgroup-helper-0.0.1-r1.ebuild
rename to project-lakitu/app-admin/cgroup-helper/cgroup-helper-0.0.1-r2.ebuild
diff --git a/project-lakitu/app-admin/cgroup-helper/files/cgroup_helper b/project-lakitu/app-admin/cgroup-helper/files/cgroup_helper
index 5e9d8ed..5ccec62 100644
--- a/project-lakitu/app-admin/cgroup-helper/files/cgroup_helper
+++ b/project-lakitu/app-admin/cgroup-helper/files/cgroup_helper
@@ -22,7 +22,7 @@
 readonly PROG_NAME
 SECURE_BOOT_CMD="/usr/share/cloud/is-secure-boot"
 readonly SECURE_BOOT_CMD
-ESP_PARTITION="/dev/sda12"
+ESP_PARTITION="/dev/disk/by-partlabel/EFI-SYSTEM"
 readonly ESP_PARTITION
 PROC_CMDLINE="/proc/cmdline"
 readonly PROC_CMDLINE
@@ -114,7 +114,8 @@
     echo "Cgroup is already configured as 'unified'."
     exit 0
   fi
-  local dir="$(mktemp -d)"
+  local dir
+  dir="$(mktemp -d)"
   mount "${ESP_PARTITION}" "${dir}"
   local search="systemd.unified_cgroup_hierarchy=false "
   search+="systemd.legacy_systemd_cgroup_controller=false"