diff --git a/.gitignore b/.gitignore
index a4b4d240..ae120f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,6 +164,12 @@ tools/unit-tests/unit-multiboot
 tools/unit-tests/unit-psa_store
 tools/unit-tests/unit-qspi-flash
 tools/unit-tests/unit-tpm-rsa-exp
+tools/unit-tests/unit-image-nopart
+tools/unit-tests/unit-image-sha3-384
+tools/unit-tests/unit-image-sha384
+tools/unit-tests/unit-store-sbrk
+tools/unit-tests/unit-tpm-blob
+tools/unit-tests/unit-update-disk
 
 
 
diff --git a/options.mk b/options.mk
index be66a7dd..8e7d914f 100644
--- a/options.mk
+++ b/options.mk
@@ -793,6 +793,7 @@ ifeq ($(WOLFCRYPT_TZ_PKCS11),1)
   CFLAGS+=-I$(WOLFBOOT_LIB_WOLFPKCS11)
   CFLAGS+=-DWP11_HASH_PIN_COST=3
   LDFLAGS+=--specs=nano.specs
+  WOLFCRYPT_OBJS+=src/store_sbrk.o
   WOLFCRYPT_OBJS+=src/pkcs11_store.o
   WOLFCRYPT_OBJS+=src/pkcs11_callable.o
   WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/pwdbased.o
@@ -839,6 +840,7 @@ ifeq ($(WOLFCRYPT_TZ_PSA),1)
   WOLFPSA_CFLAGS+=-I$(WOLFBOOT_LIB_WOLFPSA)
   WOLFPSA_CFLAGS+=-I$(WOLFBOOT_LIB_WOLFPSA)/wolfpsa
   LDFLAGS+=--specs=nano.specs
+  WOLFCRYPT_OBJS+=src/store_sbrk.o
   WOLFCRYPT_OBJS+=src/psa_store.o
   WOLFCRYPT_OBJS+=src/arm_tee_psa_veneer.o
   WOLFCRYPT_OBJS+=src/arm_tee_psa_ipc.o