diff --git a/.github/workflows/test-tpm.yml b/.github/workflows/test-tpm.yml
index 0b1903648..2e0303753 100644
--- a/.github/workflows/test-tpm.yml
+++ b/.github/workflows/test-tpm.yml
@@ -113,7 +113,7 @@ jobs:
     with:
       arch: host
       config-file: ./config/examples/sim-tpm-seal.config
-      make-args: SIGN=ECC256 HASH=SHA256 POLICY_FILE=policy.bin
+      make-args: SIGN=ECC256 HASH=SHA256 POLICY_FILE=policy.bin IMAGE_HEADER_SIZE=512
       keyauthstr: TestAuth
       sealauthstr: SealAuth
 
@@ -143,7 +143,7 @@ jobs:
     with:
       arch: host
       config-file: ./config/examples/sim-tpm-seal.config
-      make-args: SIGN=ECC256 HASH=SHA256 POLICY_FILE=policy.bin
+      make-args: SIGN=ECC256 HASH=SHA256 POLICY_FILE=policy.bin IMAGE_HEADER_SIZE=512
       keyauthstr: TestAuth
 
   sim_tpm_seal_noauth_ecc384:
diff --git a/include/image.h b/include/image.h
index 60aaea8ff..24960518a 100644
--- a/include/image.h
+++ b/include/image.h
@@ -87,7 +87,10 @@ int wolfBot_get_dts_size(void *dts_addr);
 #endif
 #if defined (WOLFBOOT_SIGN_PRIMARY_RSA2048) || \
     defined (WOLFBOOT_SIGN_PRIMARY_RSA3072) || \
-    defined (WOLFBOOT_SIGN_PRIMARY_RSA4096)
+    defined (WOLFBOOT_SIGN_PRIMARY_RSA4096) || \
+    defined (WOLFBOOT_SIGN_PRIMARY_RSA2048ENC) || \
+    defined (WOLFBOOT_SIGN_PRIMARY_RSA3072ENC) || \
+    defined (WOLFBOOT_SIGN_PRIMARY_RSA4096ENC)
 #define wolfBoot_verify_signature_primary wolfBoot_verify_signature_rsa
 #endif
 #if defined (WOLFBOOT_SIGN_PRIMARY_ECC256) || \
@@ -113,7 +116,10 @@ int wolfBot_get_dts_size(void *dts_addr);
 #endif
 #if defined (WOLFBOOT_SIGN_SECONDARY_RSA2048) || \
     defined (WOLFBOOT_SIGN_SECONDARY_RSA3072) || \
-    defined (WOLFBOOT_SIGN_SECONDARY_RSA4096)
+    defined (WOLFBOOT_SIGN_SECONDARY_RSA4096) || \
+    defined (WOLFBOOT_SIGN_SECONDARY_RSA2048ENC) || \
+    defined (WOLFBOOT_SIGN_SECONDARY_RSA3072ENC) || \
+    defined (WOLFBOOT_SIGN_SECONDARY_RSA4096ENC)
 #define wolfBoot_verify_signature_secondary wolfBoot_verify_signature_rsa
 #endif
 #if defined (WOLFBOOT_SIGN_SECONDARY_ECC256) || \