diff --git a/targets/stm32l432/bootloader/pubkey_nitrokey_bootloader.c b/targets/stm32l432/bootloader/pubkey_bootloader.c
similarity index 100%
rename from targets/stm32l432/bootloader/pubkey_nitrokey_bootloader.c
rename to targets/stm32l432/bootloader/pubkey_bootloader.c
diff --git a/fido2/version_check.c b/targets/stm32l432/bootloader/version_check.c
similarity index 100%
rename from fido2/version_check.c
rename to targets/stm32l432/bootloader/version_check.c
diff --git a/targets/stm32l432/build/bootloader.mk b/targets/stm32l432/build/bootloader.mk
index 4fa4513..473360b 100644
--- a/targets/stm32l432/build/bootloader.mk
+++ b/targets/stm32l432/build/bootloader.mk
@@ -2,6 +2,7 @@ include build/common.mk
 
 # ST related
 SRC = bootloader/main.c bootloader/bootloader.c
+SRC += bootloader/pubkey_bootloader.c bootloader/version_check.c
 SRC += src/init.c src/redirect.c src/flash.c src/rng.c src/led.c src/device.c
 SRC += src/fifo.c src/crypto.c src/attestation.c src/sense.c
 SRC += src/startup_stm32l432xx.s src/system_stm32l4xx.c