diff --git a/arch.mk b/arch.mk
index fc9d80e54..dad435544 100644
--- a/arch.mk
+++ b/arch.mk
@@ -100,8 +100,9 @@ ifeq ($(ARCH),AARCH64)
   endif
   ifeq ($(NO_ARM_ASM),0)
     ARCH_FLAGS=-mstrict-align
-    CFLAGS+=$(ARCH_FLAGS) -DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_INLINE -DWC_HASH_DATA_ALIGNMENT=8
-    WOLFCRYPT_OBJS += lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha256.o \
+    CFLAGS+=$(ARCH_FLAGS) -DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_INLINE -DWC_HASH_DATA_ALIGNMENT=8 -DWOLFSSL_AARCH64_PRIVILEGE_MODE
+    WOLFCRYPT_OBJS += lib/wolfssl/wolfcrypt/src/cpuid.o \
+                      lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha256.o \
                       lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha512.o \
                       lib/wolfssl/wolfcrypt/src/port/arm/armv8-aes.o \
                       lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha512-asm_c.o \
diff --git a/lib/wolfHSM b/lib/wolfHSM
index ea3e9579b..6ce59d6da 160000
--- a/lib/wolfHSM
+++ b/lib/wolfHSM
@@ -1 +1 @@
-Subproject commit ea3e9579b94a1ddf2b5fb8d8482cb9a80a3a7ebd
+Subproject commit 6ce59d6da341eed9ad41ae383b8246121dc788a8
diff --git a/lib/wolfPKCS11 b/lib/wolfPKCS11
index a1ddeba8a..7808688fd 160000
--- a/lib/wolfPKCS11
+++ b/lib/wolfPKCS11
@@ -1 +1 @@
-Subproject commit a1ddeba8ae03eb5d177dc17b0300af27c6cdb693
+Subproject commit 7808688fdeb05150496a10ae6c4de4f797b9d6b0
diff --git a/lib/wolfTPM b/lib/wolfTPM
index a5f6c912a..6e1205b1e 160000
--- a/lib/wolfTPM
+++ b/lib/wolfTPM
@@ -1 +1 @@
-Subproject commit a5f6c912ac6903872d9666238440a76bc9f92517
+Subproject commit 6e1205b1e11e600c31e4a14764331e33def7beb4
diff --git a/lib/wolfssl b/lib/wolfssl
index 1bfbdb6c7..239b85c80 160000
--- a/lib/wolfssl
+++ b/lib/wolfssl
@@ -1 +1 @@
-Subproject commit 1bfbdb6c7f5976d4242279c3cd166f1a8e0f965f
+Subproject commit 239b85c80438bf60d9a5b9e0ebe9ff097a760d0d