diff --git a/meta-hpe/meta-gxp/classes/gxp-bootblock-n-poc.bbclass b/meta-hpe/meta-gxp/classes/gxp-bootblock-n-poc.bbclass
index 6e96ee2..8ced8e0 100644
--- a/meta-hpe/meta-gxp/classes/gxp-bootblock-n-poc.bbclass
+++ b/meta-hpe/meta-gxp/classes/gxp-bootblock-n-poc.bbclass
@@ -1,7 +1,3 @@
-LICENSE = "CLOSED"
-LIC_FILES_CHKSUM = ""
-
-
 BBRANCH = "master"
 SRC_URI = "git://github.com/HewlettPackard/gxp-bootblock.git;branch=${BBRANCH};protocol=https"
 SRCREV = "bab416f8ca8c8465d308cfeb7f8d5abc21ba343b"
@@ -15,5 +11,3 @@
 
 }
 
-addtask deploy before do_build after do_compile
-
diff --git a/meta-hpe/meta-gxp/classes/gxp-bootblock-n.bbclass b/meta-hpe/meta-gxp/classes/gxp-bootblock-n.bbclass
index bd69e16..e452545 100644
--- a/meta-hpe/meta-gxp/classes/gxp-bootblock-n.bbclass
+++ b/meta-hpe/meta-gxp/classes/gxp-bootblock-n.bbclass
@@ -1,6 +1,3 @@
-LICENSE = "CLOSED"
-LIC_FILES_CHKSUM = ""
-
 # TODO:  Manually copy the U-Boot signing key and customer-key-block here:
 HPE_GXP_KEY_FILES_DIR = "${COREBASE}/meta-hpe/meta-gxp/recipes-bsp/image/files"
 
@@ -21,6 +18,3 @@
   # Copy in the customer keyblock
   install -m 644 ${HPE_GXP_KEY_FILES_DIR}/customer-key-block ${DEPLOYDIR}/customer-key-block
 }
-
-addtask deploy before do_build after do_compile
-
diff --git a/meta-hpe/meta-gxp/classes/gxp-bootblock.bbclass b/meta-hpe/meta-gxp/classes/gxp-bootblock.bbclass
new file mode 100644
index 0000000..e5a8f2c
--- /dev/null
+++ b/meta-hpe/meta-gxp/classes/gxp-bootblock.bbclass
@@ -0,0 +1,5 @@
+LICENSE = "CLOSED"
+LIC_FILES_CHKSUM = ""
+
+addtask deploy before do_build after do_compile
+
diff --git a/meta-hpe/meta-gxp/classes/gxp2-bootblock-n.bbclass b/meta-hpe/meta-gxp/classes/gxp2-bootblock-n.bbclass
new file mode 100644
index 0000000..3ee93ff
--- /dev/null
+++ b/meta-hpe/meta-gxp/classes/gxp2-bootblock-n.bbclass
@@ -0,0 +1,21 @@
+# TODO:  Manually copy the U-Boot signing key and customer-key-block here:
+HPE_GXP_KEY_FILES_DIR = "${COREBASE}/meta-hpe/meta-gxp/recipes-bsp/image/files"
+
+inherit deploy
+
+do_deploy () {
+  install -d ${DEPLOYDIR}
+
+  # Copy in the bootblock
+  install -m 644 ${HPE_GXP_KEY_FILES_DIR}/gxp2-bootblock.bin ${DEPLOYDIR}/gxp-bootblock.bin
+
+  # Copy in files from the files subdirectory
+  install -m 644 ${HPE_GXP_KEY_FILES_DIR}/header.sig ${DEPLOYDIR}/hpe-uboot-header.section
+  install -m 644 ${HPE_GXP_KEY_FILES_DIR}/header-512.sig ${DEPLOYDIR}/hpe-uboot-header-512.section
+
+  # Copy in the U-Boot signing key
+  install -m 644 ${HPE_GXP_KEY_FILES_DIR}/customer_private_key.pem ${DEPLOYDIR}/hpe-uboot-signing-key.pem
+
+  # Copy in the customer keyblock
+  install -m 644 ${HPE_GXP_KEY_FILES_DIR}/customer-key-block ${DEPLOYDIR}/customer-key-block
+}
diff --git a/meta-hpe/meta-gxp/recipes-bsp/image/gxp-bootblock.bb b/meta-hpe/meta-gxp/recipes-bsp/image/gxp-bootblock.bb
index d8bcc54..4abe5c5 100644
--- a/meta-hpe/meta-gxp/recipes-bsp/image/gxp-bootblock.bb
+++ b/meta-hpe/meta-gxp/recipes-bsp/image/gxp-bootblock.bb
@@ -1 +1 @@
-inherit gxp-bootblock-n
+inherit gxp-bootblock