diff --git a/docker.io/library/ubuntu/20.04.json b/docker.io/library/ubuntu/20.04.json
index ccc6503c7..794fe0aca 100644
--- a/docker.io/library/ubuntu/20.04.json
+++ b/docker.io/library/ubuntu/20.04.json
@@ -1,133 +1,6 @@
 {
     "docker.io/library/ubuntu:20.04": {
         "paths": {
-            "/sbin": [
-                "add-shell",
-                "addgroup",
-                "adduser",
-                "agetty",
-                "badblocks",
-                "blkdiscard",
-                "blkid",
-                "blkzone",
-                "blockdev",
-                "cfdisk",
-                "chcpu",
-                "chgpasswd",
-                "chmem",
-                "chpasswd",
-                "chroot",
-                "cpgr",
-                "cppw",
-                "ctrlaltdel",
-                "debugfs",
-                "delgroup",
-                "deluser",
-                "dpkg-preconfigure",
-                "dpkg-reconfigure",
-                "dumpe2fs",
-                "e2freefrag",
-                "e2fsck",
-                "e2image",
-                "e2label",
-                "e2mmpstatus",
-                "e2scrub",
-                "e2scrub_all",
-                "e2undo",
-                "e4crypt",
-                "e4defrag",
-                "faillock",
-                "fdformat",
-                "fdisk",
-                "filefrag",
-                "findfs",
-                "fsck",
-                "fsck.cramfs",
-                "fsck.ext2",
-                "fsck.ext3",
-                "fsck.ext4",
-                "fsck.minix",
-                "fsfreeze",
-                "fstab-decode",
-                "fstrim",
-                "getty",
-                "groupadd",
-                "groupdel",
-                "groupmems",
-                "groupmod",
-                "grpck",
-                "grpconv",
-                "grpunconv",
-                "hwclock",
-                "iconvconfig",
-                "initctl",
-                "installkernel",
-                "invoke-rc.d",
-                "isosize",
-                "killall5",
-                "ldattach",
-                "ldconfig",
-                "ldconfig.real",
-                "logsave",
-                "losetup",
-                "mke2fs",
-                "mkfs",
-                "mkfs.bfs",
-                "mkfs.cramfs",
-                "mkfs.ext2",
-                "mkfs.ext3",
-                "mkfs.ext4",
-                "mkfs.minix",
-                "mkhomedir_helper",
-                "mklost+found",
-                "mkswap",
-                "newusers",
-                "nologin",
-                "pam-auth-update",
-                "pam_extrausers_chkpwd",
-                "pam_extrausers_update",
-                "pam_getenv",
-                "pam_tally",
-                "pam_tally2",
-                "pam_timestamp_check",
-                "pivot_root",
-                "policy-rc.d",
-                "pwck",
-                "pwconv",
-                "pwunconv",
-                "raw",
-                "readprofile",
-                "remove-shell",
-                "resize2fs",
-                "rmt",
-                "rmt-tar",
-                "rtcwake",
-                "runuser",
-                "service",
-                "sfdisk",
-                "shadowconfig",
-                "start-stop-daemon",
-                "sulogin",
-                "swaplabel",
-                "swapoff",
-                "swapon",
-                "switch_root",
-                "sysctl",
-                "tarcat",
-                "tune2fs",
-                "unix_chkpwd",
-                "unix_update",
-                "update-passwd",
-                "update-rc.d",
-                "useradd",
-                "userdel",
-                "usermod",
-                "vigr",
-                "vipw",
-                "wipefs",
-                "zic",
-                "zramctl"
-            ],
             "/usr/local/sbin": [
                 "unminimize"
             ],
@@ -436,6 +309,133 @@
                 "zmore",
                 "znew"
             ],
+            "/usr/sbin": [
+                "add-shell",
+                "addgroup",
+                "adduser",
+                "agetty",
+                "badblocks",
+                "blkdiscard",
+                "blkid",
+                "blkzone",
+                "blockdev",
+                "cfdisk",
+                "chcpu",
+                "chgpasswd",
+                "chmem",
+                "chpasswd",
+                "chroot",
+                "cpgr",
+                "cppw",
+                "ctrlaltdel",
+                "debugfs",
+                "delgroup",
+                "deluser",
+                "dpkg-preconfigure",
+                "dpkg-reconfigure",
+                "dumpe2fs",
+                "e2freefrag",
+                "e2fsck",
+                "e2image",
+                "e2label",
+                "e2mmpstatus",
+                "e2scrub",
+                "e2scrub_all",
+                "e2undo",
+                "e4crypt",
+                "e4defrag",
+                "faillock",
+                "fdformat",
+                "fdisk",
+                "filefrag",
+                "findfs",
+                "fsck",
+                "fsck.cramfs",
+                "fsck.ext2",
+                "fsck.ext3",
+                "fsck.ext4",
+                "fsck.minix",
+                "fsfreeze",
+                "fstab-decode",
+                "fstrim",
+                "getty",
+                "groupadd",
+                "groupdel",
+                "groupmems",
+                "groupmod",
+                "grpck",
+                "grpconv",
+                "grpunconv",
+                "hwclock",
+                "iconvconfig",
+                "initctl",
+                "installkernel",
+                "invoke-rc.d",
+                "isosize",
+                "killall5",
+                "ldattach",
+                "ldconfig",
+                "ldconfig.real",
+                "logsave",
+                "losetup",
+                "mke2fs",
+                "mkfs",
+                "mkfs.bfs",
+                "mkfs.cramfs",
+                "mkfs.ext2",
+                "mkfs.ext3",
+                "mkfs.ext4",
+                "mkfs.minix",
+                "mkhomedir_helper",
+                "mklost+found",
+                "mkswap",
+                "newusers",
+                "nologin",
+                "pam-auth-update",
+                "pam_extrausers_chkpwd",
+                "pam_extrausers_update",
+                "pam_getenv",
+                "pam_tally",
+                "pam_tally2",
+                "pam_timestamp_check",
+                "pivot_root",
+                "policy-rc.d",
+                "pwck",
+                "pwconv",
+                "pwunconv",
+                "raw",
+                "readprofile",
+                "remove-shell",
+                "resize2fs",
+                "rmt",
+                "rmt-tar",
+                "rtcwake",
+                "runuser",
+                "service",
+                "sfdisk",
+                "shadowconfig",
+                "start-stop-daemon",
+                "sulogin",
+                "swaplabel",
+                "swapoff",
+                "swapon",
+                "switch_root",
+                "sysctl",
+                "tarcat",
+                "tune2fs",
+                "unix_chkpwd",
+                "unix_update",
+                "update-passwd",
+                "update-rc.d",
+                "useradd",
+                "userdel",
+                "usermod",
+                "vigr",
+                "vipw",
+                "wipefs",
+                "zic",
+                "zramctl"
+            ],
             "/usr/bin": [
                 "[",
                 "addpart",
@@ -740,7 +740,7 @@
                 "zmore",
                 "znew"
             ],
-            "/usr/sbin": [
+            "/sbin": [
                 "add-shell",
                 "addgroup",
                 "adduser",