diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh
index b81c393b8..c602b2c31 100644
--- a/usr/lib/archboot/installer/bootloader.sh
+++ b/usr/lib/archboot/installer/bootloader.sh
@@ -137,7 +137,6 @@ _uefi_common() {
     [[ -f "${_DESTDIR}/usr/bin/efibootmgr" ]] || _PACKAGES="${_PACKAGES} efibootmgr"
     if [[ -n "${_UEFI_SECURE_BOOT}" ]]; then
         [[ -f "${_DESTDIR}/usr/bin/mokutil" ]] || _PACKAGES="${_PACKAGES} mokutil"
-        [[ -f "${_DESTDIR}/usr/bin/efi-readvar" ]] || _PACKAGES="${_PACKAGES} efitools"
         [[ -f "${_DESTDIR}/usr/bin/sbsign" ]] || _PACKAGES="${_PACKAGES} sbsigntools"
     fi
     if [[ -n "${_PACKAGES}" ]]; then
diff --git a/usr/lib/archboot/iso.sh b/usr/lib/archboot/iso.sh
index f42b90a63..aa0bde8ed 100644
--- a/usr/lib/archboot/iso.sh
+++ b/usr/lib/archboot/iso.sh
@@ -125,12 +125,6 @@ _prepare_fedora_shim_bootloaders_aarch64 () {
     cp "/usr/share/archboot/bootloader/BOOTAA64.efi" "${_ISODIR}/EFI/BOOT/BOOTAA64.EFI"
 }
 
-_prepare_efitools_uefi () {
-    echo "Preparing efitools..."
-    cp  "/usr/share/efitools/efi/HashTool.efi" "${_ISODIR}/EFI/TOOLS/HASHTOOL.EFI"
-    cp  "/usr/share/efitools/efi/KeyTool.efi" "${_ISODIR}/EFI/TOOLS/KEYTOOL.EFI"
-}
-
 _prepare_uefi_shell_tianocore() {
     echo "Preparing UEFI shell..."
     ## Installing Tianocore UDK/EDK2 UEFI X64 "Full Shell"
diff --git a/usr/lib/archboot/run/iso.sh b/usr/lib/archboot/run/iso.sh
index f89bbce36..a9bb619cc 100755
--- a/usr/lib/archboot/run/iso.sh
+++ b/usr/lib/archboot/run/iso.sh
@@ -25,7 +25,6 @@ if echo "${_BASENAME}" | grep -qw aarch64 || echo "${_BASENAME}" | grep -qw x86_
         _prepare_uefi_IA32 || exit 1
         _prepare_memtest || exit 1
     fi
-    _prepare_efitools_uefi || exit 1
     _prepare_background || exit 1
     _reproducibility
     _prepare_uefi_image || exit 1
diff --git a/usr/share/archboot/grub/archboot-main-grub.cfg b/usr/share/archboot/grub/archboot-main-grub.cfg
index d707902a4..dc99d6276 100644
--- a/usr/share/archboot/grub/archboot-main-grub.cfg
+++ b/usr/share/archboot/grub/archboot-main-grub.cfg
@@ -35,17 +35,6 @@ function _menu_running {
     echo "Please wait ..."
     }
 
-function _secure_boot_tools {
-    menuentry "Secure Boot KeyTool" {
-        _menu_running
-        chainloader /efi/tools/keytool.efi
-    }
-    menuentry "Secure Boot HashTool" {
-        _menu_running
-        chainloader /efi/tools/hashtool.efi
-    }
-}
-
 function _efi_shell {
     if [ ${grub_cpu} == "x86_64" ]; then
         menuentry "UEFI Shell" {
@@ -98,9 +87,6 @@ if [ ${grub_platform} == "efi" ]; then
         }
         _efi_shell
     fi
-    submenu "UEFI Secure Boot Tools" {
-        _secure_boot_tools
-    }
     menuentry "UEFI Firmware Setup" {
         _menu_running
         fwsetup