diff --git a/core/SConscript.bootloader b/core/SConscript.bootloader
index a926ceff56..ecd7197742 100644
--- a/core/SConscript.bootloader
+++ b/core/SConscript.bootloader
@@ -18,7 +18,6 @@ FEATURES_WANTED = [
     "dma2d",
     "input",
     "iwdg",
-    "optiga",
     "power_manager",
     "rgb_led",
     "rtc",
@@ -142,7 +141,7 @@ SOURCE_BOOTLOADER = [
     'embed/projects/bootloader/version_check.c',
 ]
 
-if 'optiga' in FEATURES_AVAILABLE:
+if ('LOCKABLE_BOOTLOADER', '1') in CPPDEFINES_HAL:
     SOURCE_BOOTLOADER += [
         'embed/projects/bootloader/workflow/wf_unlock_bootloader.c',
     ]
diff --git a/core/SConscript.bootloader_ci b/core/SConscript.bootloader_ci
index 7ccbad3ca1..4ba295fa77 100644
--- a/core/SConscript.bootloader_ci
+++ b/core/SConscript.bootloader_ci
@@ -11,7 +11,6 @@ FEATURES_WANTED = [
     "consumption_mask",
     "display",
     "input",
-    "optiga",
     "powerctl",
     "rgb_led",
     "usb",
diff --git a/core/SConscript.bootloader_emu b/core/SConscript.bootloader_emu
index b8aff1d277..41100dcd12 100644
--- a/core/SConscript.bootloader_emu
+++ b/core/SConscript.bootloader_emu
@@ -24,7 +24,6 @@ FEATURES_WANTED = [
     "display",
     "dma2d",
     "input",
-    "optiga",
     "power_manager",
     "rgb_led",
     ]
@@ -139,7 +138,7 @@ env = Environment(
 
 FEATURES_AVAILABLE = models.configure_board(TREZOR_MODEL, HW_REVISION, FEATURES_WANTED, env, CPPDEFINES_HAL, SOURCE_UNIX, PATH_HAL)
 
-if 'optiga' in FEATURES_AVAILABLE:
+if ('LOCKABLE_BOOTLOADER', '1') in CPPDEFINES_HAL:
     SOURCE_BOOTLOADER += [
         'embed/projects/bootloader/workflow/wf_unlock_bootloader.c',
     ]
diff --git a/core/embed/projects/bootloader/main.c b/core/embed/projects/bootloader/main.c
index b111713da0..944ab1c4fa 100644
--- a/core/embed/projects/bootloader/main.c
+++ b/core/embed/projects/bootloader/main.c
@@ -38,9 +38,6 @@
 #ifdef USE_PVD
 #include <sys/pvd.h>
 #endif
-#ifdef USE_OPTIGA
-#include <sec/optiga_hal.h>
-#endif
 #ifdef USE_TOUCH
 #include <io/touch.h>
 #endif
@@ -245,10 +242,6 @@ static void drivers_init(secbool manufacturing_mode,
   }
 #endif
 
-#ifdef USE_OPTIGA
-  optiga_hal_init();
-#endif
-
 #ifdef USE_CONSUMPTION_MASK
   consumption_mask_init();
 #endif
diff --git a/core/embed/sys/suspend/stm32u5/suspend_io.c b/core/embed/sys/suspend/stm32u5/suspend_io.c
index 3384fb4399..22345d0271 100644
--- a/core/embed/sys/suspend/stm32u5/suspend_io.c
+++ b/core/embed/sys/suspend/stm32u5/suspend_io.c
@@ -106,12 +106,8 @@ void resume_secure_drivers() {
   secure_aes_init();
 #endif
 #ifdef USE_OPTIGA
-#ifdef BOOTLOADER
-  optiga_hal_init();
-#else
   optiga_init_and_configure();
 #endif
-#endif
 #if defined(USE_TROPIC) && !defined(BOOTLOADER)
   tropic_init();
 #endif