diff --git a/manjaro/lxqt/Packages-Live b/manjaro/lxqt/Packages-Live
index fcb0cc8..2f86f47 100644
--- a/manjaro/lxqt/Packages-Live
+++ b/manjaro/lxqt/Packages-Live
@@ -15,8 +15,6 @@ open-vm-tools
 squashfs-tools
 >systemd manjaro-live-systemd
 virtualbox-guest-utils
->x86_64 efitools
->x86_64 manjaro-efi-utils
 xf86-input-acecad
 xf86-input-elographics
 xf86-input-evdev
diff --git a/manjaro/netinstall/Packages-Live b/manjaro/netinstall/Packages-Live
index 688c4d8..2dcafb3 100644
--- a/manjaro/netinstall/Packages-Live
+++ b/manjaro/netinstall/Packages-Live
@@ -28,8 +28,6 @@ sddm-andromeda-qt-theme
 >systemd networkmanager
 >systemd sddm
 virtualbox-guest-utils
->x86_64 efitools
->x86_64 manjaro-efi-utils
 xcursor-breeze
 xf86-input-acecad
 xf86-input-elographics
diff --git a/shared/Packages-Live b/shared/Packages-Live
index f391e2d..87b3cae 100644
--- a/shared/Packages-Live
+++ b/shared/Packages-Live
@@ -8,8 +8,6 @@ nbd
 >sonar sonar-syslinux-theme
 squashfs-tools
 >systemd manjaro-live-systemd
->x86_64 manjaro-efi-utils
->x86_64 efibootmgr
 
 # unfinished plymouth handling
 #>manjaro_plymouth plymouth-theme-manjaro-elegant
diff --git a/shared/Packages-Live-Xorg b/shared/Packages-Live-Xorg
index 711a605..0d48700 100644
--- a/shared/Packages-Live-Xorg
+++ b/shared/Packages-Live-Xorg
@@ -17,8 +17,6 @@ primus
 squashfs-tools
 >systemd bumblebee
 >systemd manjaro-live-systemd
->x86_64 efitools
->x86_64 manjaro-efi-utils
 xf86-input-vmmouse
 xf86-video-amdgpu
 xf86-video-apm
diff --git a/shared/Packages-Root b/shared/Packages-Root
index ae7564e..170d2f0 100644
--- a/shared/Packages-Root
+++ b/shared/Packages-Root
@@ -1,3 +1,4 @@
+## Base packages
 acpi
 b43-fwcutter
 bash
@@ -101,3 +102,7 @@ which
 xfsprogs
 zd1211-firmware
 zsh
+
+## Efi support (only x86_64)
+>x86_64 manjaro-efi-utils
+>x86_64 efibootmgr