diff --git a/Library/OcBootManagementLib/ImageLoader.c b/Library/OcBootManagementLib/ImageLoader.c
index f070567f..8db485fe 100644
--- a/Library/OcBootManagementLib/ImageLoader.c
+++ b/Library/OcBootManagementLib/ImageLoader.c
@@ -297,7 +297,7 @@ OcImageLoaderLoad (
                   SourceBuffer,
                   (UINT32)SourceSize,
                   UEFI_IMAGE_SOURCE_FV,
-                  UefiImageOriginFv
+                  UefiImageOriginUserImage
                   );
   if (EFI_ERROR (ImageStatus)) {
     DEBUG ((DEBUG_INFO, "OCB: PeCoff init failure - %r\n", ImageStatus));
diff --git a/Library/OcPeCoffExtLib/OcPeCoffExtLib.c b/Library/OcPeCoffExtLib/OcPeCoffExtLib.c
index b10a7c83..76168f5d 100644
--- a/Library/OcPeCoffExtLib/OcPeCoffExtLib.c
+++ b/Library/OcPeCoffExtLib/OcPeCoffExtLib.c
@@ -467,7 +467,7 @@ PeCoffVerifyAppleSignature (
                   &ImageContext,
                   PeImage,
                   *ImageSize,
-                  UefiImageOriginFv
+                  UefiImageOriginUserImage
                   );
   if (EFI_ERROR (ImageStatus)) {
     DEBUG ((DEBUG_INFO, "OCPE: PeCoff verify init failure - %r\n", ImageStatus));
@@ -563,7 +563,7 @@ PeCoffGetApfsDriverVersion (
                   &ImageContext,
                   DriverBuffer,
                   DriverSize,
-                  UefiImageOriginFv
+                  UefiImageOriginUserImage
                   );
   if (EFI_ERROR (ImageStatus)) {
     DEBUG ((DEBUG_INFO, "OCPE: PeCoff apfs init failure - %r\n", ImageStatus));
diff --git a/Utilities/AppleEfiSignTool/AppleEfiSignTool.c b/Utilities/AppleEfiSignTool/AppleEfiSignTool.c
index 97b136c7..0dc532e0 100644
--- a/Utilities/AppleEfiSignTool/AppleEfiSignTool.c
+++ b/Utilities/AppleEfiSignTool/AppleEfiSignTool.c
@@ -118,7 +118,7 @@ VerifySignatureAndApfs (
                       &Context,
                       Image,
                       ImageSize,
-                      UefiImageOriginFv
+                      UefiImageOriginUserImage
                       );
   }