diff --git a/contiki-nrf52/Makefile b/contiki-nrf52/Makefile
index 342cdfc..0918881 100644
--- a/contiki-nrf52/Makefile
+++ b/contiki-nrf52/Makefile
@@ -41,7 +41,7 @@ clean:
 	rm -f tags
 	
 $(BOOT_IMG)_v1_signed.bin: $(BOOT_ELF)
-	python3 $(WOLFBOOT)/tools/keytools/sign.py $(BOOT_IMG).bin $(WOLFBOOT)/ed25519.der 1
+	$(WOLFBOOT)/tools/keytools/sign --ed25519 $(BOOT_IMG).bin $(WOLFBOOT)/ed25519.der 1
 
 $(DTLS_OTA)/dtls-ota-signed.bin: $(BOOT_IMG)_v1_signed.bin
 	mv $^ $@
diff --git a/freeRTOS-Freescale-K64F-https-TLS1.3/Makefile b/freeRTOS-Freescale-K64F-https-TLS1.3/Makefile
index 6ca8707..6553c39 100644
--- a/freeRTOS-Freescale-K64F-https-TLS1.3/Makefile
+++ b/freeRTOS-Freescale-K64F-https-TLS1.3/Makefile
@@ -112,11 +112,11 @@ vpath %.c $(dir $(WOLFSSL_ROOT)/wolfcrypt/src)
 
 wolfboot:LSCRIPT:=k64f_wolfboot.ld
 wolfboot: image.bin wolfboot-align.bin
-	python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 1
+	../wolfBoot/tools/keytools/sign --ecc256 image.bin ../wolfBoot/ecc256.der 1
 	cat wolfboot-align.bin image_v1_signed.bin >factory.bin
 	sleep 1
 	touch image.bin
-	python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 2
+	../wolfBoot/tools/keytools/sign --ecc256 image.bin ../wolfBoot/ecc256.der 2
 
 wolfboot-align.bin:CFLAGS=-mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-unused \
 		-Isrc \
diff --git a/freeRTOS-Freescale-K64F-https-TLS1.3/src/wolfboot.config b/freeRTOS-Freescale-K64F-https-TLS1.3/src/wolfboot.config
index ac397c9..904737a 100644
--- a/freeRTOS-Freescale-K64F-https-TLS1.3/src/wolfboot.config
+++ b/freeRTOS-Freescale-K64F-https-TLS1.3/src/wolfboot.config
@@ -6,24 +6,11 @@ MCUXPRESSO?=$(HOME)/src/FRDM-K64F
 MCUXPRESSO_CPU?=MK64FN1M0VLL12
 MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK64F12
 MCUXPRESSO_CMSIS?=$(HOME)/src/FRDM-K64F/CMSIS
-FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk
-DEBUG?=0
 VTOR?=1
-CORTEX_M0?=0
-NO_ASM?=0
-EXT_FLASH?=0
-SPI_FLASH?=0
-ALLOW_DOWNGRADE?=0
-NVM_FLASH_WRITEONCE?=1
-WOLFBOOT_VERSION?=0
-V?=0
 SPMATH?=1
-RAM_CODE?=0
-DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
-PKA?=0
 WOLFBOOT_PARTITION_SIZE?=0x7A000
 WOLFBOOT_SECTOR_SIZE?=0x1000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xA000
 WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x84000
 WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xff000
+NVM_FLASH_WRITEONCE?=1
diff --git a/freeRTOS-Freescale-K64F-scp/Makefile b/freeRTOS-Freescale-K64F-scp/Makefile
index 094e5c1..3cd6b69 100644
--- a/freeRTOS-Freescale-K64F-scp/Makefile
+++ b/freeRTOS-Freescale-K64F-scp/Makefile
@@ -124,11 +124,11 @@ vpath %.c $(dir $(WOLFSSL_ROOT)/wolfcrypt/src)
 
 wolfboot:LSCRIPT:=k64f_wolfboot.ld
 wolfboot: image.bin wolfboot-align.bin
-	python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 1
+	../wolfBoot/tools/keytools/sign --ecc256 image.bin ../wolfBoot/ecc256.der 1
 	cat wolfboot-align.bin image_v1_signed.bin >factory.bin
 	sleep 1
 	touch image.bin
-	python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 2
+	../wolfBoot/tools/keytools/sign --ecc256 image.bin ../wolfBoot/ecc256.der 2
 
 wolfboot-align.bin:CFLAGS=-mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-unused \
 		-Isrc \
diff --git a/freeRTOS-Freescale-K64F-scp/src/wolfboot.config b/freeRTOS-Freescale-K64F-scp/src/wolfboot.config
index ac397c9..904737a 100644
--- a/freeRTOS-Freescale-K64F-scp/src/wolfboot.config
+++ b/freeRTOS-Freescale-K64F-scp/src/wolfboot.config
@@ -6,24 +6,11 @@ MCUXPRESSO?=$(HOME)/src/FRDM-K64F
 MCUXPRESSO_CPU?=MK64FN1M0VLL12
 MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK64F12
 MCUXPRESSO_CMSIS?=$(HOME)/src/FRDM-K64F/CMSIS
-FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk
-DEBUG?=0
 VTOR?=1
-CORTEX_M0?=0
-NO_ASM?=0
-EXT_FLASH?=0
-SPI_FLASH?=0
-ALLOW_DOWNGRADE?=0
-NVM_FLASH_WRITEONCE?=1
-WOLFBOOT_VERSION?=0
-V?=0
 SPMATH?=1
-RAM_CODE?=0
-DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
-PKA?=0
 WOLFBOOT_PARTITION_SIZE?=0x7A000
 WOLFBOOT_SECTOR_SIZE?=0x1000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xA000
 WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x84000
 WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xff000
+NVM_FLASH_WRITEONCE?=1
diff --git a/test-app-STM32F4-measured-boot/Makefile b/test-app-STM32F4-measured-boot/Makefile
index 7a1a628..1216a79 100644
--- a/test-app-STM32F4-measured-boot/Makefile
+++ b/test-app-STM32F4-measured-boot/Makefile
@@ -100,8 +100,8 @@ wolfboot-example: wolfboot_align.bin image.bin
 wolfboot-align.bin:LSCRIPT:=$(WOLFBOOT_ROOT)/target.ld
 wolfboot_align.bin:CFLAGS+=-DWOLFBOOT_HASH_SHA256
 wolfboot_align.bin: wolfboot_target
-	make -C $(WOLFBOOT_ROOT) align
-	cp $(WOLFBOOT_ROOT)/wolfboot-align.bin .
+	# Create an empty aligned binary since 'align' target is no longer available
+	dd if=/dev/zero of=wolfboot-align.bin bs=1 count=0 seek=131072
 	cp $(WOLFBOOT_ROOT)/wolfboot.elf .
 
 image.bin: wolfboot_target image.elf
diff --git a/test-app-STM32F4-measured-boot/measured.wolfboot.config b/test-app-STM32F4-measured-boot/measured.wolfboot.config
index 005cc73..c94bb06 100644
--- a/test-app-STM32F4-measured-boot/measured.wolfboot.config
+++ b/test-app-STM32F4-measured-boot/measured.wolfboot.config
@@ -2,25 +2,14 @@ ARCH?=ARM
 TARGET?=stm32f4
 SIGN?=ECC256
 HASH?=SHA256
-DEBUG?=1
 VTOR?=1
-CORTEX_M0?=0
-NO_ASM?=0
-EXT_FLASH?=0
-SPI_FLASH?=0
-ALLOW_DOWNGRADE?=0
-NVM_FLASH_WRITEONCE?=0
-WOLFBOOT_VERSION?=0
-V?=0
 SPMATH?=1
-RAM_CODE?=0
-DUALBANK_SWAP?=0
-IMAGE_HEADER_SIZE?=256
 WOLFBOOT_PARTITION_SIZE?=0x20000
 WOLFBOOT_SECTOR_SIZE?=0x20000
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x40000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x60000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08020000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x08040000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x08060000
 WOLFTPM?=1
 MEASURED_BOOT?=1
 MEASURED_PCR_A?=16
+DEBUG?=1
diff --git a/wolfBoot b/wolfBoot
index 75a7e57..44f987c 160000
--- a/wolfBoot
+++ b/wolfBoot
@@ -1 +1 @@
-Subproject commit 75a7e57279b1c70ca741111705e98aff6307c333
+Subproject commit 44f987ccce2feb6860fbf38189d104d909b01d98