diff --git a/src/build/buildpnor/genPnorImages.pl b/src/build/buildpnor/genPnorImages.pl
index 19e6c47799e..45665639569 100755
--- a/src/build/buildpnor/genPnorImages.pl
+++ b/src/build/buildpnor/genPnorImages.pl
@@ -546,8 +546,8 @@ sub manipulateImages
         #$isNormalSecure ||= ($eyeCatch eq "SBEC");
         $isNormalSecure ||= ($eyeCatch eq "PAYLOAD");
         $isNormalSecure ||= ($eyeCatch eq "OCC");
-        #$isNormalSecure ||= ($eyeCatch eq "CAPP");
-        #$isNormalSecure ||= ($eyeCatch eq "BOOTKERNEL");
+        $isNormalSecure ||= ($eyeCatch eq "CAPP");
+        $isNormalSecure ||= ($eyeCatch eq "BOOTKERNEL");
         $isNormalSecure ||= ($eyeCatch eq "HCODE");
         $isNormalSecure ||= ($eyeCatch eq "WOFDATA");