[TASK] Avoid ACL issues