diff --git a/openpower/configs/p10ebmc_defconfig b/openpower/configs/p10ebmc_defconfig
index 5a54f8e..fedb20f 100644
--- a/openpower/configs/p10ebmc_defconfig
+++ b/openpower/configs/p10ebmc_defconfig
@@ -75,7 +75,7 @@
 BR2_IMA_CATALOG_P10_FILENAME="ima_catalog.bin"
 BR2_PACKAGE_PETITBOOT=y
 BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
+# BR2_PACKAGE_CAPP_UCODE is not set
 BR2_PACKAGE_LOADKEYS=y
 BR2_IMA_CATALOG_DTS="POWER9"
 BR2_PACKAGE_OCMB_EXPLORER_FW=y
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index 76525ce..f18f90e 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -68,7 +68,7 @@
 BR2_IMA_CATALOG_P10_FILENAME="ima_catalog.bin"
 BR2_PACKAGE_PETITBOOT=y
 BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
+# BR2_PACKAGE_CAPP_UCODE is not set
 BR2_PACKAGE_LOADKEYS=y
 BR2_IMA_CATALOG_DTS="POWER9"
 BR2_PACKAGE_OCMB_EXPLORER_FW=y
diff --git a/openpower/package/openpower-pnor-p10/Config.in b/openpower/package/openpower-pnor-p10/Config.in
index 09ad1e9..a308149 100644
--- a/openpower/package/openpower-pnor-p10/Config.in
+++ b/openpower/package/openpower-pnor-p10/Config.in
@@ -7,7 +7,6 @@
         select BR2_PACKAGE_SKIBOOT
         select BR2_PACKAGE_OPENPOWER_FFS
         select BR2_PACKAGE_OCC_P10
-        select BR2_PACKAGE_CAPP_UCODE
         select BR2_PACKAGE_IMA_CATALOG
         select BR2_PACKAGE_HOST_OPENPOWER_VPNOR
         select BR2_PACKAGE_RAINIER_2U_XML
diff --git a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
index 4fb6353..e5468bd 100644
--- a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
+++ b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
@@ -14,7 +14,7 @@
 
 OPENPOWER_PNOR_P10_LICENSE = Apache-2.0
 OPENPOWER_PNOR_P10_LICENSE_FILES = LICENSE
-OPENPOWER_PNOR_P10_DEPENDENCIES = hostboot-binaries skiboot host-openpower-ffs capp-ucode host-openpower-pnor-util host-xz host-sb-signing-utils hostboot-p10 occ-p10 sbe-p10 hcode-p10 ocmb-explorer-fw $(call qstrip,$(BR2_OPENPOWER_P10_XMLS))
+OPENPOWER_PNOR_P10_DEPENDENCIES = hostboot-binaries skiboot host-openpower-ffs host-openpower-pnor-util host-xz host-sb-signing-utils hostboot-p10 occ-p10 sbe-p10 hcode-p10 ocmb-explorer-fw $(call qstrip,$(BR2_OPENPOWER_P10_XMLS))
 
 ifeq ($(BR2_PACKAGE_IMA_CATALOG),y)
 OPENPOWER_PNOR_P10_DEPENDENCIES += ima-catalog
@@ -35,7 +35,7 @@
 
 # Subpackages we want to include in the version info (do not include openpower-pnor-p10)
 # This is used inside pkg-versions.mk
-OPENPOWER_PNOR_P10_VERSIONED_SUBPACKAGES = skiboot linux petitboot hostboot-binaries capp-ucode pdata hostboot-p10 occ-p10 sbe-p10 hcode-p10 ocmb-explorer-fw $(call qstrip,$(BR2_OPENPOWER_P10_XMLS))
+OPENPOWER_PNOR_P10_VERSIONED_SUBPACKAGES = skiboot linux petitboot hostboot-binaries pdata hostboot-p10 occ-p10 sbe-p10 hcode-p10 ocmb-explorer-fw $(call qstrip,$(BR2_OPENPOWER_P10_XMLS))
 
 OPENPOWER_PNOR_P10_OCMB_URL = $(call qstrip,$(OCMB_EXPLORER_FW_SITE)/$(OCMB_EXPLORER_FW_SOURCE))
 
@@ -91,7 +91,6 @@
             -sbec_binary_filename $(BR2_HOSTBOOT_P10_BINARY_SBEC_FILENAME) \
             -wink_binary_filename $(BR2_HOSTBOOT_P10_BINARY_WINK_FILENAME) \
             -occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_P10_BIN_FILENAME) \
-            -capp_binary_filename $(BINARIES_DIR)/$(BR2_CAPP_UCODE_BIN_FILENAME) \
             -ima_catalog_binary_filename $(BINARIES_DIR)/$(BR2_IMA_CATALOG_P10_FILENAME) \
             -openpower_version_filename $(OPENPOWER_PNOR_P10_VERSION_FILE) \
             -wof_binary_filename $(STAGING_DIR)/openpower_mrw_scratch/$(WOF_BINARY_FILENAME) \
@@ -212,11 +211,6 @@
             $(INSTALL) -m 0644 -D $(PNOR_SCRATCH_DIR)/$(LINUX_IMAGE_NAME) \
                 $(BINARIES_DIR)/mmc/BOOTKERNEL.P10
 
-        # CAPP
-        test -f "$(BINARIES_DIR)/mmc/CAPP.P10" ||\
-            $(INSTALL) -m 0644 -D $(PNOR_SCRATCH_DIR)/cappucode.bin.ecc \
-                $(BINARIES_DIR)/mmc/CAPP.P10
-
         # VERSION
         test -f "$(BINARIES_DIR)/mmc/VERSION.P10" ||\
             $(INSTALL) -m 0644 -D $(PNOR_SCRATCH_DIR)/openpower_pnor_version.bin \