diff --git a/OpenCorePkg.fdf b/OpenCorePkg.fdf
index 99162e3b8ac..5f9d2dbeacb 100644
--- a/OpenCorePkg.fdf
+++ b/OpenCorePkg.fdf
@@ -99,8 +99,8 @@
   FILE DRIVER = $(NAMED_GUID) Checksum {
     COMPRESS TIANO {
       GUIDED {
-        DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
-        PE32         PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
+        DXE_DEPEX    DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex
+        UE           UE                     $(INF_OUTPUT)/$(MODULE_NAME).efi
         UI           STRING="$(MODULE_NAME) $(VERSION_STRING)" Optional
       }
     }
diff --git a/OpenDuetPkg.fdf b/OpenDuetPkg.fdf
index 876edda620a..052ff2b1b8b 100644
--- a/OpenDuetPkg.fdf
+++ b/OpenDuetPkg.fdf
@@ -55,29 +55,29 @@
 
 [Rule.Common.DXE_CORE]
   FILE DXE_CORE = $(NAMED_GUID) {
-    PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi
+    UE           UE                      $(INF_OUTPUT)/$(MODULE_NAME).efi
   }
 
 [Rule.Common.UEFI_DRIVER]
   FILE DRIVER = $(NAMED_GUID) {
     DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32         PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
+    UE           UE                      $(INF_OUTPUT)/$(MODULE_NAME).efi
   }
 
 [Rule.Common.UEFI_DRIVER.BINARY]
   FILE DRIVER = $(NAMED_GUID) {
     DXE_DEPEX    DXE_DEPEX Optional      |.depex
-    PE32         PE32                    |.efi
+    UE           UE                      |.efi
   }
 
 [Rule.Common.DXE_DRIVER]
   FILE DRIVER = $(NAMED_GUID) {
     DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32         PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
+    UE           UE                      $(INF_OUTPUT)/$(MODULE_NAME).efi
   }
 
 [Rule.Common.DXE_RUNTIME_DRIVER]
   FILE DRIVER = $(NAMED_GUID) {
     DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32         PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
+    UE           UE                      $(INF_OUTPUT)/$(MODULE_NAME).efi
   }